diff options
| -rw-r--r-- | build/build-MinGW32-debug.bat | 4 | ||||
| -rw-r--r-- | build/build-MinGW32-release-trace.bat | 6 | ||||
| -rw-r--r-- | build/build-MinGW32-release.bat | 4 | ||||
| -rw-r--r-- | build/buildremote.expect | 1 | ||||
| -rw-r--r-- | build/generate-MSVC-2005.bat | 4 | ||||
| -rw-r--r-- | build/generate-MSVC-2008.bat | 4 | ||||
| -rw-r--r-- | build/generate-MSVC-2010.bat | 4 | ||||
| -rwxr-xr-x | build/linux-MSVC-2008.sh | 2 | ||||
| -rwxr-xr-x | build/linux-remote-MSVC-2008.sh | 6 |
9 files changed, 17 insertions, 18 deletions
diff --git a/build/build-MinGW32-debug.bat b/build/build-MinGW32-debug.bat index ee622d5f..63f6fffb 100644 --- a/build/build-MinGW32-debug.bat +++ b/build/build-MinGW32-debug.bat @@ -1,5 +1,5 @@ -mkdir build-real -cd build-real +mkdir MINGW32-debug +cd MINGW32-debug cmake ..\.. -G"MinGW Makefiles" -DCMAKE_BUILD_TYPE:string=Debug mingw32-make pause
\ No newline at end of file diff --git a/build/build-MinGW32-release-trace.bat b/build/build-MinGW32-release-trace.bat deleted file mode 100644 index f75da5ff..00000000 --- a/build/build-MinGW32-release-trace.bat +++ /dev/null @@ -1,6 +0,0 @@ -mkdir build-real -cd build-real -cmake ..\.. -G"MinGW Makefiles" -DCMAKE_BUILD_TYPE:string=Release --trace > trace-stdout.txt 2> trace-stderr.txt -mingw32-make 2> log.txt -pause -dir file.xxx
\ No newline at end of file diff --git a/build/build-MinGW32-release.bat b/build/build-MinGW32-release.bat index dd0dc6b8..2617002d 100644 --- a/build/build-MinGW32-release.bat +++ b/build/build-MinGW32-release.bat @@ -1,5 +1,5 @@ -mkdir build-real -cd build-real +mkdir MINGW32-release +cd MINGW32-release cmake ..\.. -G"MinGW Makefiles" -DCMAKE_BUILD_TYPE:string=Release mingw32-make 2> log.txt pause
\ No newline at end of file diff --git a/build/buildremote.expect b/build/buildremote.expect index 4b5b6425..50e56aee 100644 --- a/build/buildremote.expect +++ b/build/buildremote.expect @@ -30,6 +30,7 @@ if { $rez == 0 } { expect "build" set timeout -1 send "auto.bat\r\n" + # can detect build errors here, pass them out using 'exit' expect "FINISHED_BUILD" send "exit\r" expect eof diff --git a/build/generate-MSVC-2005.bat b/build/generate-MSVC-2005.bat index 35451e36..080cb61a 100644 --- a/build/generate-MSVC-2005.bat +++ b/build/generate-MSVC-2005.bat @@ -1,4 +1,4 @@ -mkdir build-real -cd build-real +mkdir VC2005 +cd VC2005 cmake ..\.. -G"Visual Studio 8 2005" pause
\ No newline at end of file diff --git a/build/generate-MSVC-2008.bat b/build/generate-MSVC-2008.bat index 8d39368b..8a6722c2 100644 --- a/build/generate-MSVC-2008.bat +++ b/build/generate-MSVC-2008.bat @@ -1,4 +1,4 @@ -mkdir build-real -cd build-real +mkdir VC2008 +cd VC2008 cmake ..\.. -G"Visual Studio 9 2008" pause
\ No newline at end of file diff --git a/build/generate-MSVC-2010.bat b/build/generate-MSVC-2010.bat index 588051bc..3257c68e 100644 --- a/build/generate-MSVC-2010.bat +++ b/build/generate-MSVC-2010.bat @@ -1,4 +1,4 @@ -mkdir build-real -cd build-real +mkdir VC2010 +cd VC2010 cmake ..\.. -G"Visual Studio 10" pause
\ No newline at end of file diff --git a/build/linux-MSVC-2008.sh b/build/linux-MSVC-2008.sh index d953de5f..a3000cb0 100755 --- a/build/linux-MSVC-2008.sh +++ b/build/linux-MSVC-2008.sh @@ -1,5 +1,7 @@ #/bin/sh +#build with MSVC2008 under wine. VERY EXPERIMENTAL. + # VARS export WINEARCH=win32 export WINEPREFIX=$HOME/.wine-mscv/ diff --git a/build/linux-remote-MSVC-2008.sh b/build/linux-remote-MSVC-2008.sh index 8edc7248..033bab16 100755 --- a/build/linux-remote-MSVC-2008.sh +++ b/build/linux-remote-MSVC-2008.sh @@ -1,13 +1,15 @@ #/bin/sh +# Remote into a virtualbox VM to build with MSVC. +# Very specific to my own local setup. ~px -# VARS +# VARS. TODO: parametrize export DFHACK_VER=0.5.7 export PKG=dfhack-bin-$DFHACK_VER export TARGET=Release # let's build it all VBoxManage startvm "7 Prof" -sleep 5 +sleep 20 expect buildremote.expect $TARGET echo "Creating package..." |
