Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update prebuild files. Should compile under linux again.

  • Loading branch information...
commit 18a12cff8a188033f88fd9df87203426cd252fe2 1 parent 5b1fb7b
@RevolutionSmythe RevolutionSmythe authored
View
46 runprebuild.bat
@@ -5,12 +5,6 @@ echo ==== AURORA BUILDING ==============
echo ====================================
echo.
-rem ## Default Visual Studio choice (2008, 2010)
-set vstudio=2010
-
-rem ## Default .NET Framework (3_5, 4_0 (Unsupported on VS2008))
-set framework=4_0
-
rem ## Default architecture (86 (for 32bit), 64, AnyCPU)
set bits=AnyCPU
@@ -25,39 +19,15 @@ set compile_at_end=y
echo I will now ask you three questions regarding your build.
echo However, if you wish to build for:
-echo Visual Studio %vstudio%
-echo .NET Framework %framework%
-echo %bits%x Architecture
+echo %bits% Architecture
if %compile_at_end%==y echo And you would like to compile straight after prebuild...
echo.
-echo Simply tap [ENTER] four times.
+echo Simply tap [ENTER] twice.
echo.
echo Note that you can change these defaults by opening this
echo batch file in a text editor.
echo.
-:vstudio
-set /p vstudio="Choose your Visual Studio version (2008, 2010) [%vstudio%]: "
-if %vstudio%==2008 goto framework
-if %vstudio%==2010 goto framework
-echo "%vstudio%" isn't a valid choice!
-goto vstudio
-
-:framework
-set /p framework="Choose your .NET framework (3_5, 4_0 (Unsupported on VS2008)) [%framework%]: "
-if %framework%==3_5 goto bits
-if %framework%==4_0 goto frameworkcheck
-echo "%framework%" isn't a valid choice!
-goto framework
-
- :frameworkcheck
- if %vstudio%==2008 goto frameworkerror
- goto bits
-
- :frameworkerror
- echo Sorry! Visual Studio 2008 only supports 3_5.
- goto framework
-
:bits
set /p bits="Choose your architecture (AnyCPU, x86, x64) [%bits%]: "
if %bits%==86 goto configuration
@@ -87,16 +57,12 @@ if exist Compile.*.bat (
del Compile.*.bat
)
-if %framework%==3_5 set conditionals=NET_3_5
-if %framework%==4_0 set conditionals=NET_4_0
-
echo Calling Prebuild for target %vstudio% with framework %framework%...
-bin\Prebuild.exe /target vs%vstudio% /targetframework v%framework% /conditionals ISWIN;%conditionals%
+bin\Prebuild.exe /target vs2010 /targetframework v4_0 /conditionals ISWIN;NET_4_0
echo.
echo Creating compile batch file for your convinence...
-if %framework%==3_5 set fpath=C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild
-if %framework%==4_0 set fpath=C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\msbuild
+set fpath=C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\msbuild
if %bits%==x64 set args=/p:Platform=x64
if %bits%==x86 set args=/p:Platform=x86
if %configuration%==r (
@@ -109,9 +75,9 @@ set configuration=debug
)
if %configuration%==release set cfg=/p:Configuration=Release
if %configuration%==debug set cfg=/p:Configuration=Debug
-set filename=Compile.VS%vstudio%.net%framework%.%bits%.%configuration%.bat
+set filename=Compile.VS2010.net4_0.%bits%.%configuration%.bat
-echo %fpath% Aurora.sln %args% %cfg% > %filename% /p:DefineConstants="ISWIN;%conditionals%"
+echo %fpath% Aurora.sln %args% %cfg% > %filename% /p:DefineConstants="ISWIN;NET_4_0"
echo.
set /p compile_at_end="Done, %filename% created. Compile now? (y,n) [%compile_at_end%]"
View
2  runprebuild.command
@@ -1,4 +1,4 @@
#!/bin/sh
cd `dirname $0`
-mono bin/Prebuild.exe /target vs2008 /targetframework v3_5
+mono bin/Prebuild.exe /target vs2010 /targetframework v4_0 /conditionals NET_4_0
if [ -d ".git" ]; then git log --pretty=format:"Aurora (%cd.%h)" --date=short -n 1 > bin/.version; fi
View
60 runprebuild_net3.bat
@@ -1,60 +0,0 @@
-@ECHO OFF
-
-echo ====================================
-echo ==== AURORA BUILDING .NET 3.5 ======
-echo ====================================
-echo.
-
-rem ## Default Visual Studio choice (2008, 2010)
-set vstudio=2008
-
-rem ## Default .NET Framework (3_5, 4_0 (Unsupported on VS2008))
-set framework=3_5
-
-rem ## Default architecture (86 (for 32bit), 64, AnyCPU)
-set bits=AnyCPU
-
-rem ## Whether or not to add the .net3.5 flag
-set conditionals=
-
-rem ## Default "configuration" choice ((r)elease, (d)ebug)
-set configuration=d
-
-rem ## Default "run compile batch" choice (y(es),n(o))
-set compile_at_end=n
-
-:final
-echo.
-echo.
-
-if exist Compile.*.bat (
- echo Deleting previous compile batch file...
- echo.
- del Compile.*.bat
-)
-
-if %framework%==3_5 set conditionals=NET_3_5
-if %framework%==4_0 set conditionals=NET_4_0
-
-echo Calling Prebuild for target %vstudio% with framework %framework%...
-bin\Prebuild.exe /target vs%vstudio% /targetframework v%framework% /conditionals ISWIN;%conditionals%
-
-echo.
-echo Creating compile batch file for your convinence...
-if %framework%==3_5 set fpath=C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild
-if %framework%==4_0 set fpath=C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\msbuild
-if %bits%==x64 set args=/p:Platform=x64
-if %bits%==x86 set args=/p:Platform=x86
-if %configuration%==r (
- set cfg=/p:Configuration=Release
- set configuration=release
-)
-if %configuration%==d (
-set cfg=/p:Configuration=Debug
-set configuration=debug
-)
-if %configuration%==release set cfg=/p:Configuration=Release
-if %configuration%==debug set cfg=/p:Configuration=Debug
-set filename=Compile.VS%vstudio%.net%framework%.%bits%.%configuration%.bat
-
-echo %fpath% Aurora.sln %args% %cfg% > %filename% /p:DefineConstants="ISWIN;%conditionals%"
View
3  runprebuild_net4.sh
@@ -1,3 +0,0 @@
-#!/bin/sh
-mono bin/Prebuild.exe /target vs2010 /targetframework v4_0 /conditionals NET_4_0
-if [ -d ".git" ]; then git log --pretty=format:"Aurora (%cd.%h)" --date=short -n 1 > bin/.version; fi
View
4 tc-autobuild.bat
@@ -13,10 +13,10 @@ GOTO ParamLoop
:ParamContinue
rem use .NET 3.5 to build
-bin\Prebuild.exe /target vs2008 /targetframework v3_5 /conditionals NET_3_5
+bin\Prebuild.exe /target vs2010 /targetframework v4_0 /conditionals NET_4_0
IF ERRORLEVEL 1 GOTO FAIL
-%WINDIR%\Microsoft.NET\Framework\v3.5\msbuild /t:Rebuild Aurora.sln /p:DefineConstants="ISWIN;NET_3_5"
+%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild /t:Rebuild Aurora.sln /p:DefineConstants="ISWIN;NET_4_0"
IF ERRORLEVEL 1 GOTO FAIL
IF NOT "%makearch%"=="yes" GOTO SkipArch
View
2  tc-autobuild.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-mono bin/Prebuild.exe /target vs2008 /targetframework v3_5 /conditionals NET_3_5
+mono bin/Prebuild.exe /target vs2010 /targetframework v4_0 /conditionals NET_4_0
if [ -d ".git" ]; then git log --pretty=format:"Aurora (%cd.%h)" --date=short -n 1 > bin/.version; fi
Please sign in to comment.
Something went wrong with that request. Please try again.