diff options
author | Matúš Kukan <matus.kukan@collabora.com> | 2014-12-15 14:37:44 +0100 |
---|---|---|
committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-12-15 14:48:02 +0100 |
commit | 8cc1e7a7c3ec897129cc6318b254e8dafc682435 (patch) | |
tree | ee53cf8bf7cd5e38206c57199373089f93e6147a /Library_merged.mk | |
parent | b6be3d3db3ffbc4c1a4528a8dc17aa95084e12ca (diff) |
gbuild: More automagic for libmerged
Only gb_Library_use_libraries stays because I think it's a good idea to see
dependent libraries (potential candidates for merging) and hopefully the
list does not change often anyway.
This commit extends b6be3d3db3ffbc4c1a4528a8dc17aa95084e12ca
Change-Id: I2682456f53cb2e8d7ea63eae15f8979a3c828401
Diffstat (limited to 'Library_merged.mk')
-rw-r--r-- | Library_merged.mk | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 8431efc9f4ab..fa2f24d179ba 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -30,61 +30,7 @@ $(eval $(call gb_Library_use_libraries,merged,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_use_static_libraries,merged,\ - $(if $(filter LINUX,$(OS)),glxtest) \ - $(if $(filter unx,$(GUIBASE)),headless) \ -)) - -ifeq (ALL,$(MERGELIBS)) -$(eval $(call gb_Library_use_static_libraries,merged,\ - ulingu \ -)) -endif - -ifeq ($(GUIBASE),unx) -$(eval $(call gb_Library_add_libs,merged,\ - -lX11 \ - -lXext \ - -lSM \ - -lICE \ -)) -endif - -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_libs,merged,\ - -lm \ - -ldl \ - -lGL \ - -lGLU \ - -lpthread \ - -lrt \ - -lX11 \ -)) -endif - ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_system_win32_libs,merged,\ - advapi32 \ - gdi32 \ - gdiplus \ - glu32 \ - imm32 \ - mpr \ - msimg32 \ - oldnames \ - ole32 \ - oleaut32 \ - opengl32 \ - shell32 \ - shlwapi \ - setupapi \ - user32 \ - usp10 \ - uuid \ - version \ - winmm \ - winspool \ -)) # prevent warning spamming $(eval $(call gb_Library_add_ldflags,merged,\ /ignore:4049 \ @@ -96,17 +42,6 @@ ifeq ($(OS),MACOSX) $(eval $(call gb_Library_use_libraries,merged,\ AppleRemote \ )) -$(eval $(call gb_Library_add_libs,merged,\ - -lobjc \ -)) -$(eval $(call gb_Library_use_system_darwin_frameworks,merged,\ - Carbon \ - Cocoa \ - CoreFoundation \ - CoreServices \ - OpenGL \ - QuickTime \ -)) endif # vim: set noet sw=4 ts=4: |