Build: never dynlink with gui libs

factor · Mar 11, 2016 · 2f1e963 · 2f1e963
1 parent 2713153
commit 2f1e963
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/vm/Config.linux b/vm/Config.linux
@@ -1,7 +1,7 @@
 include vm/Config.unix
 PLAF_DLL_OBJS += vm/os-genunix.o vm/os-linux.o vm/mvm-unix.o
 PLAF_MASTER_HEADERS += vm/os-genunix.hpp vm/os-linux.hpp
-LIBS = -ldl -lm -lrt -lpthread $(X11_UI_LIBS) -Wl,--export-dynamic
+LIBS = -ldl -lm -lrt -lpthread -Wl,--export-dynamic
 
 # clang spams warnings if we use -Wl,--no-as-needed with -c
 # -Wl,--no-as-needed is a gcc optimization, not required

diff --git a/vm/Config.macosx b/vm/Config.macosx
@@ -11,7 +11,7 @@ SHARED_DLL_EXTENSION = .dylib
 SHARED_FLAG = -dynamiclib
 
 ifdef X11
-	LIBS = -lm -framework Cocoa -L/opt/local/lib $(X11_UI_LIBS) -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+	LIBS = -lm -framework Cocoa -L/opt/local/lib -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
 else
 	LIBS = -lm -framework Cocoa -framework AppKit
 endif
@@ -36,4 +36,3 @@ ifeq ($(XCODE_4_P),0)
 	CC ?= clang
 	CXX ?= clang++
 endif
-
diff --git a/vm/Config.unix b/vm/Config.unix
@@ -12,12 +12,6 @@ PLAF_DLL_OBJS = vm/os-unix.o
 PLAF_EXE_OBJS += vm/main-unix.o
 PLAF_MASTER_HEADERS += vm/os-unix.hpp
 
-ifdef NO_UI
-	X11_UI_LIBS =
-else
-	X11_UI_LIBS = `pkg-config --libs gtk+-2.0 gtkglext-1.0`
-endif
-
 FFI_TEST_CFLAGS = -fPIC
 
 # LINKER = gcc -shared -o