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

GNUmakefile: Remove LIBPATH from the build system since nothing needs it. Fixes #1192.

db4
Doug Coleman 2014-11-11 00:05:52 -08:00
parent f32131698a
commit 11be8734cb
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
GNUmakefile
View File

@ -3,7 +3,6 @@ ifdef CONFIG
GIT_LABEL = $(shell git describe --all --long) GIT_LABEL = $(shell git describe --all --long)
BUNDLE = Factor.app BUNDLE = Factor.app
LIBPATH = -L/usr/X11R6/lib
include $(CONFIG) include $(CONFIG)
@ -211,17 +210,17 @@ $(ENGINE): $(DLL_OBJS)
factor-lib: $(ENGINE) factor-lib: $(ENGINE)
factor: $(EXE_OBJS) $(DLL_OBJS) factor: $(EXE_OBJS) $(DLL_OBJS)
$(TOOLCHAIN_PREFIX)$(CXX) $(LIBPATH) -L. $(DLL_OBJS) \ $(TOOLCHAIN_PREFIX)$(CXX) -L. $(DLL_OBJS) \
$(CFLAGS) -o $(EXECUTABLE) $(LIBS) $(EXE_OBJS) $(CFLAGS) -o $(EXECUTABLE) $(LIBS) $(EXE_OBJS)
factor-console: $(EXE_OBJS) $(DLL_OBJS) factor-console: $(EXE_OBJS) $(DLL_OBJS)
$(TOOLCHAIN_PREFIX)$(CXX) $(LIBPATH) -L. $(DLL_OBJS) \ $(TOOLCHAIN_PREFIX)$(CXX) -L. $(DLL_OBJS) \
$(CFLAGS) $(CFLAGS_CONSOLE) -o $(CONSOLE_EXECUTABLE) $(LIBS) $(EXE_OBJS) $(CFLAGS) $(CFLAGS_CONSOLE) -o $(CONSOLE_EXECUTABLE) $(LIBS) $(EXE_OBJS)
factor-ffi-test: $(FFI_TEST_LIBRARY) factor-ffi-test: $(FFI_TEST_LIBRARY)
$(FFI_TEST_LIBRARY): vm/ffi_test.o $(FFI_TEST_LIBRARY): vm/ffi_test.o
$(TOOLCHAIN_PREFIX)$(CC) $(LIBPATH) $(CFLAGS) $(FFI_TEST_CFLAGS) $(SHARED_FLAG) -o $(FFI_TEST_LIBRARY) $(TEST_OBJS) $(TOOLCHAIN_PREFIX)$(CC) $(CFLAGS) $(FFI_TEST_CFLAGS) $(SHARED_FLAG) -o $(FFI_TEST_LIBRARY) $(TEST_OBJS)
vm/resources.o: vm/resources.o:
$(TOOLCHAIN_PREFIX)$(WINDRES) vm/factor.rs vm/resources.o $(TOOLCHAIN_PREFIX)$(WINDRES) vm/factor.rs vm/resources.o

1
vm/Config.linux.x86.64
View File

@ -1,3 +1,2 @@
include vm/Config.linux include vm/Config.linux
include vm/Config.x86.64 include vm/Config.x86.64
LIBPATH = -L/usr/X11R6/lib64 -L/usr/X11R6/lib

2
vm/Config.macosx
View File

@ -20,7 +20,7 @@ LINKER = $(CXX) $(CFLAGS) -dynamiclib -single_module \
-current_version $(VERSION) \ -current_version $(VERSION) \
-compatibility_version $(VERSION) \ -compatibility_version $(VERSION) \
-fvisibility=hidden \ -fvisibility=hidden \
$(LIBS) $(LIBPATH) -o $(LIBS) -o
LINK_WITH_ENGINE = -lfactor LINK_WITH_ENGINE = -lfactor