Kaydet (Commit) e67f8ecf authored tarafından Matúš Kukan's avatar Matúš Kukan

vclopengl needs to be in libmerged

Change-Id: I7265aa6f79bcee99bf5c60dc21b61ea95ae85864
üst 07e1f3c1
...@@ -31,8 +31,10 @@ $(eval $(call gb_Library_use_libraries,merged,\ ...@@ -31,8 +31,10 @@ $(eval $(call gb_Library_use_libraries,merged,\
)) ))
$(eval $(call gb_Library_use_externals,merged,\ $(eval $(call gb_Library_use_externals,merged,\
icu_headers \
icui18n \ icui18n \
icuuc \ icuuc \
boost_headers \
boostdatetime \ boostdatetime \
$(call gb_Helper_optional,DESKTOP,clucene) \ $(call gb_Helper_optional,DESKTOP,clucene) \
cups \ cups \
...@@ -41,6 +43,7 @@ $(eval $(call gb_Library_use_externals,merged,\ ...@@ -41,6 +43,7 @@ $(eval $(call gb_Library_use_externals,merged,\
expat \ expat \
gconf \ gconf \
gio \ gio \
glew \
graphite \ graphite \
$(if $(ENABLE_GTK),gtk) \ $(if $(ENABLE_GTK),gtk) \
harfbuzz \ harfbuzz \
...@@ -52,6 +55,7 @@ $(eval $(call gb_Library_use_externals,merged,\ ...@@ -52,6 +55,7 @@ $(eval $(call gb_Library_use_externals,merged,\
liblangtag \ liblangtag \
libxml2 \ libxml2 \
libxslt \ libxslt \
mesa_headers \
mythes \ mythes \
nss3 \ nss3 \
telepathy \ telepathy \
...@@ -89,8 +93,11 @@ ifeq ($(OS),LINUX) ...@@ -89,8 +93,11 @@ ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_libs,merged,\ $(eval $(call gb_Library_add_libs,merged,\
-lm \ -lm \
-ldl \ -ldl \
-lGL \
-lGLU \
-lpthread \ -lpthread \
-lrt \ -lrt \
-lX11 \
)) ))
endif endif
...@@ -99,12 +106,14 @@ $(eval $(call gb_Library_use_system_win32_libs,merged,\ ...@@ -99,12 +106,14 @@ $(eval $(call gb_Library_use_system_win32_libs,merged,\
advapi32 \ advapi32 \
gdi32 \ gdi32 \
gdiplus \ gdiplus \
glu32 \
imm32 \ imm32 \
mpr \ mpr \
msimg32 \ msimg32 \
oldnames \ oldnames \
ole32 \ ole32 \
oleaut32 \ oleaut32 \
opengl32 \
shell32 \ shell32 \
shlwapi \ shlwapi \
user32 \ user32 \
...@@ -133,6 +142,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,merged,\ ...@@ -133,6 +142,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,merged,\
Cocoa \ Cocoa \
CoreFoundation \ CoreFoundation \
CoreServices \ CoreServices \
OpenGL \
QuickTime \ QuickTime \
)) ))
endif endif
......
...@@ -150,6 +150,7 @@ gb_MERGEDLIBS := \ ...@@ -150,6 +150,7 @@ gb_MERGEDLIBS := \
utl \ utl \
uui \ uui \
vcl \ vcl \
$(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)),vclopengl) \
xmlscript \ xmlscript \
xo \ xo \
xstor \ xstor \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment