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

change makefile to use .so instead of .a on unix

db4
Doug Coleman 2009-03-28 14:41:48 -05:00
parent e5ffc202f2
commit 5460a5375e
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -162,11 +162,11 @@ factor-console: $(DLL_OBJS) $(EXE_OBJS)
$(CFLAGS) $(CFLAGS_CONSOLE) -o factor$(EXE_SUFFIX)$(CONSOLE_EXTENSION) $(EXE_OBJS) $(CFLAGS) $(CFLAGS_CONSOLE) -o factor$(EXE_SUFFIX)$(CONSOLE_EXTENSION) $(EXE_OBJS)
factor-ffi-test: vm/ffi_test.o factor-ffi-test: vm/ffi_test.o
$(CC) $(LIBPATH) $(CFLAGS) $(FFI_TEST_CFLAGS) $(SHARED_FLAG) -o libfactor-ffi-test$(DLL_EXTENSION) $(TEST_OBJS) $(CC) $(LIBPATH) $(CFLAGS) $(FFI_TEST_CFLAGS) $(SHARED_FLAG) -o libfactor-ffi-test$(SHARED_DLL_EXTENSION) $(TEST_OBJS)
clean: clean:
rm -f vm/*.o rm -f vm/*.o
rm -f factor*.dll libfactor.{a,so,dylib} rm -f factor*.dll libfactor.{a,so,dylib} libfactor-ffi-test.{a,so,dylib}
vm/resources.o: vm/resources.o:
$(WINDRES) vm/factor.rs vm/resources.o $(WINDRES) vm/factor.rs vm/resources.o

2
basis/compiler/tests/alien.factor
View File

@ -13,7 +13,7 @@ IN: compiler.tests
{ {
{ [ os winnt? ] [ "libfactor-ffi-test.dll" ] } { [ os winnt? ] [ "libfactor-ffi-test.dll" ] }
{ [ os macosx? ] [ "libfactor-ffi-test.dylib" ] } { [ os macosx? ] [ "libfactor-ffi-test.dylib" ] }
{ [ os unix? ] [ "libfactor-ffi-test.a" ] } { [ os unix? ] [ "libfactor-ffi-test.so" ] }
} cond append-path ; } cond append-path ;
"f-cdecl" libfactor-ffi-tests-path "cdecl" add-library "f-cdecl" libfactor-ffi-tests-path "cdecl" add-library

1
vm/Config.macosx
View File

@ -4,6 +4,7 @@ CFLAGS += -fPIC
PLAF_DLL_OBJS += vm/os-macosx.o vm/mach_signal.o PLAF_DLL_OBJS += vm/os-macosx.o vm/mach_signal.o
DLL_EXTENSION = .dylib DLL_EXTENSION = .dylib
SHARED_DLL_EXTENSION = .dylib
SHARED_FLAG = -dynamiclib SHARED_FLAG = -dynamiclib

2
vm/Config.unix
View File

@ -5,7 +5,7 @@ endif
EXE_SUFFIX = EXE_SUFFIX =
DLL_PREFIX = lib DLL_PREFIX = lib
DLL_EXTENSION = .a DLL_EXTENSION = .a
# DLL_EXTENSION = .so SHARED_DLL_EXTENSION = .so
SHARED_FLAG = -shared SHARED_FLAG = -shared
PLAF_DLL_OBJS = vm/os-unix.o PLAF_DLL_OBJS = vm/os-unix.o

1
vm/Config.windows
View File

@ -5,5 +5,6 @@ SHARED_FLAG = -shared
EXE_EXTENSION=.exe EXE_EXTENSION=.exe
CONSOLE_EXTENSION=.com CONSOLE_EXTENSION=.com
DLL_EXTENSION=.dll DLL_EXTENSION=.dll
SHARED_DLL_EXTENSION=.dll
LINKER = $(CC) -shared -mno-cygwin -o LINKER = $(CC) -shared -mno-cygwin -o
LINK_WITH_ENGINE = -l$(DLL_PREFIX)factor$(DLL_SUFFIX) LINK_WITH_ENGINE = -l$(DLL_PREFIX)factor$(DLL_SUFFIX)