steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Build: never dynlink with gui libs

db4
Björn Lindqvist 2016-03-11 05:17:04 +01:00
parent 2713153273
commit 2f1e963587
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vm/Config.linux
View File

@ -1,7 +1,7 @@
include vm/Config.unix include vm/Config.unix
PLAF_DLL_OBJS += vm/os-genunix.o vm/os-linux.o vm/mvm-unix.o 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 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 # clang spams warnings if we use -Wl,--no-as-needed with -c
# -Wl,--no-as-needed is a gcc optimization, not required # -Wl,--no-as-needed is a gcc optimization, not required

3
vm/Config.macosx
View File

@ -11,7 +11,7 @@ SHARED_DLL_EXTENSION = .dylib
SHARED_FLAG = -dynamiclib SHARED_FLAG = -dynamiclib
ifdef X11 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 else
LIBS = -lm -framework Cocoa -framework AppKit LIBS = -lm -framework Cocoa -framework AppKit
endif endif
@ -36,4 +36,3 @@ ifeq ($(XCODE_4_P),0)
CC ?= clang CC ?= clang
CXX ?= clang++ CXX ?= clang++
endif endif

6
vm/Config.unix
View File

@ -12,12 +12,6 @@ PLAF_DLL_OBJS = vm/os-unix.o
PLAF_EXE_OBJS += vm/main-unix.o PLAF_EXE_OBJS += vm/main-unix.o
PLAF_MASTER_HEADERS += vm/os-unix.hpp 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 FFI_TEST_CFLAGS = -fPIC
# LINKER = gcc -shared -o # LINKER = gcc -shared -o