]> gitweb.factorcode.org Git - factor.git/commitdiff
Better fix for building dll on WIndows
authorDoug Coleman <doug.coleman@gmail.com>
Mon, 18 Jan 2010 20:17:03 +0000 (14:17 -0600)
committerDoug Coleman <doug.coleman@gmail.com>
Mon, 18 Jan 2010 20:17:03 +0000 (14:17 -0600)
GNUmakefile

index 279a32e18520c548efe5535ac631cc2cec8d25c5..426e9eeb2249a20508ea2cafd941ff8d9450aacc 100755 (executable)
@@ -177,15 +177,20 @@ macosx.app: factor
                @executable_path/../Frameworks/libfactor.dylib \
                Factor.app/Contents/MacOS/factor
 
-$(EXECUTABLE): $(DLL_OBJS) $(EXE_OBJS)
+factor.dll:
        $(TOOLCHAIN_PREFIX)$(LINKER) $(ENGINE) $(DLL_OBJS)
+
+$(EXECUTABLE): $(DLL_OBJS) $(EXE_OBJS)
+       $(MAKE) factor.dll
        $(TOOLCHAIN_PREFIX)$(CPP) $(LIBS) $(LIBPATH) -L. $(LINK_WITH_ENGINE) \
                $(CFLAGS) -o $@$(EXE_SUFFIX)$(EXE_EXTENSION) $(EXE_OBJS)
 
 $(CONSOLE_EXECUTABLE): $(DLL_OBJS) $(EXE_OBJS)
+       $(MAKE) factor.dll
        $(TOOLCHAIN_PREFIX)$(CPP) $(LIBS) $(LIBPATH) -L. $(LINK_WITH_ENGINE) \
                $(CFLAGS) $(CFLAGS_CONSOLE) -o factor$(EXE_SUFFIX)$(CONSOLE_EXTENSION) $(EXE_OBJS)
 
+
 $(TEST_LIBRARY): vm/ffi_test.o
        $(TOOLCHAIN_PREFIX)$(CC) $(LIBPATH) $(CFLAGS) $(FFI_TEST_CFLAGS) $(SHARED_FLAG) -o libfactor-ffi-test$(SHARED_DLL_EXTENSION) $(TEST_OBJS)