From 923330030393bebee87cd1b5264c9db84110cbb5 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Mon, 18 Jan 2010 14:17:03 -0600 Subject: [PATCH] Better fix for building dll on WIndows --- GNUmakefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/GNUmakefile b/GNUmakefile index 279a32e185..426e9eeb22 100755 --- a/GNUmakefile +++ b/GNUmakefile @@ -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)