Fix the build support for windows again, have the makefile load Config.* files in...

diff --git a/Makefile b/Makefile
index 68c2c97426c3c62829bac63d5c5368d4fc174f4d..e84a5f9c5ad3f09302d65ea4413ed4e78c07e8ca 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,9 +17,8 @@ else
        CFLAGS += -O3 $(SITE_CFLAGS)
 endif
 
-ifdef CONFIG
-       include $(CONFIG)
-endif
+CONFIG = $(shell ./build-support/factor.sh config-target)
+include $(CONFIG)
 
 ENGINE = $(DLL_PREFIX)factor$(DLL_SUFFIX)$(DLL_EXTENSION)
 

diff --git a/build-support/factor.sh b/build-support/factor.sh
index 44c047155d78a5c5bc9fa4b6714929e1bdf77a7e..e70ef40e5cab313a7aee3cca291322b8bd073186 100755 (executable)
--- a/build-support/factor.sh
+++ b/build-support/factor.sh
@@ -236,7 +236,7 @@ find_word_size() {
 
 set_factor_binary() {
     case $OS in
-        winnt) FACTOR_BINARY=factor-console.exe;;
+        winnt) FACTOR_BINARY=factor.com;;
         *) FACTOR_BINARY=factor;;
     esac
 }
@@ -260,6 +260,7 @@ echo_build_info() {
     $ECHO FACTOR_BINARY=$FACTOR_BINARY
     $ECHO FACTOR_LIBRARY=$FACTOR_LIBRARY
     $ECHO FACTOR_IMAGE=$FACTOR_IMAGE
+    $ECHO CONFIG_TARGET=$CONFIG_TARGET
     $ECHO MAKE_TARGET=$MAKE_TARGET
     $ECHO BOOT_IMAGE=$BOOT_IMAGE
     $ECHO MAKE_IMAGE_TARGET=$MAKE_IMAGE_TARGET
@@ -289,20 +290,30 @@ set_build_info() {
     if [[ $OS == macosx && $ARCH == ppc ]] ; then
         MAKE_IMAGE_TARGET=macosx-ppc
         MAKE_TARGET=macosx-ppc
+       CONFIG_TARGET=macosx.ppc
     elif [[ $OS == linux && $ARCH == ppc ]] ; then
         MAKE_IMAGE_TARGET=linux-ppc
         MAKE_TARGET=linux-ppc
+       CONFIG_TARGET=linux.ppc
     elif [[ $OS == winnt && $ARCH == x86 && $WORD == 64 ]] ; then
         MAKE_IMAGE_TARGET=winnt-x86.64
         MAKE_TARGET=winnt-x86-64
+       CONFIG_TARGET=windows.nt.x86.64
+    elif [[ $OS == winnt && $ARCH == x86 && $WORD == 32 ]] ; then
+        MAKE_IMAGE_TARGET=winnt-x86.32
+        MAKE_TARGET=winnt-x86-32
+       CONFIG_TARGET=windows.nt.x86.32
     elif [[ $ARCH == x86 && $WORD == 64 ]] ; then
         MAKE_IMAGE_TARGET=unix-x86.64
         MAKE_TARGET=$OS-x86-64
+       CONFIG_TARGET=$OS.x86.64
     else
         MAKE_IMAGE_TARGET=$ARCH.$WORD
         MAKE_TARGET=$OS-$ARCH-$WORD
+        CONFIG_TARGET=$OS.$ARCH.$WORD
     fi
     BOOT_IMAGE=boot.$MAKE_IMAGE_TARGET.image
+    CONFIG_TARGET=vm/Config.$CONFIG_TARGET
 }
 
 parse_build_info() {
@@ -570,5 +581,6 @@ case "$1" in
     dlls) get_config_info; maybe_download_dlls;;
     net-bootstrap) get_config_info; update_boot_images; bootstrap ;;
     make-target) ECHO=false; find_build_info; echo $MAKE_TARGET ;;
+    config-target) ECHO=false; find_build_info; echo $CONFIG_TARGET ;;
     *) usage ;;
 esac

diff --git a/vm/Config.windows.nt.x86.64 b/vm/Config.windows.nt.x86.64
index ddb61480e5cf8c340bf8a1708b0cda2fa259d5a4..13ef665b1953a40a275fa4009cb6604ad0cd2f27 100644 (file)
--- a/vm/Config.windows.nt.x86.64
+++ b/vm/Config.windows.nt.x86.64
@@ -1,3 +1,4 @@
+#error "lol"
 DLL_PATH=http://factorcode.org/dlls/64
 CC=$(WIN64_PATH)-gcc.exe
 WINDRES=$(WIN64_PATH)-windres.exe