diff --git a/projects/libs/libs.vcxproj b/libs.vcxproj similarity index 71% rename from projects/libs/libs.vcxproj rename to libs.vcxproj index 013a74598e..0148b48b6e 100644 --- a/projects/libs/libs.vcxproj +++ b/libs.vcxproj @@ -67,28 +67,28 @@ - $(SolutionDir)..\build\$(Configuration)\ - $(SolutionDir)..\obj\$(ProjectName)\$(Configuration)\ - ..\..\lib\libcurl\include;..\..\lib\jansson;..\..\lib\cutest\CuTest.h;..\..\lib\SDL2_ttf\include;$(IncludePath) - ..\..\lib\libcurl\lib;..\..\lib\SDL2_ttf\lib\x86;$(LibraryPath) + $(SolutionDir)bin\ + $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + lib\libcurl\include;lib\jansson;lib\cutest\CuTest.h;lib\SDL2_ttf\include;$(IncludePath) + lib\libcurl\lib;lib\SDL2_ttf\lib\x86;$(LibraryPath) - $(SolutionDir)..\build\$(Configuration)\ - $(SolutionDir)..\obj\$(ProjectName)\$(Configuration)\ - ..\..\lib\libcurl\include;..\..\lib\jansson;..\..\lib\cutest\CuTest.h;..\..\lib\SDL2_ttf\include;$(IncludePath) - ..\..\lib\libcurl\lib;..\..\lib\SDL2_ttf\lib\x86;$(LibraryPath) + $(SolutionDir)bin\ + $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + lib\libcurl\include;lib\jansson;lib\cutest\CuTest.h;lib\SDL2_ttf\include;$(IncludePath) + lib\libcurl\lib;lib\SDL2_ttf\lib\x86;$(LibraryPath) - $(SolutionDir)..\build\$(Configuration)\ - $(SolutionDir)..\obj\$(ProjectName)\$(Configuration)\ - ..\..\lib\libcurl\include;..\..\lib\jansson;..\..\lib\cutest\CuTest.h;..\..\lib\SDL2_ttf\include;$(IncludePath) - ..\..\lib\libcurl\lib;..\..\lib\SDL2_ttf\lib\x86;$(LibraryPath) + $(SolutionDir)bin\ + $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + lib\libcurl\include;lib\jansson;lib\cutest\CuTest.h;lib\SDL2_ttf\include;$(IncludePath) + lib\libcurl\lib;lib\SDL2_ttf\lib\x86;$(LibraryPath) - $(SolutionDir)..\build\Release\ - $(SolutionDir)..\obj\$(ProjectName)\Release\ - ..\..\lib\libcurl\include;..\..\lib\jansson;..\..\lib\cutest\CuTest.h;..\..\lib\SDL2_ttf\include;$(IncludePath) - ..\..\lib\libcurl\lib;..\..\lib\SDL2_ttf\lib\x86;$(LibraryPath) + $(SolutionDir)bin\ + $(SolutionDir)obj\$(ProjectName)\Release\ + lib\libcurl\include;lib\jansson;lib\cutest\CuTest.h;lib\SDL2_ttf\include;$(IncludePath) + lib\libcurl\lib;lib\SDL2_ttf\lib\x86;$(LibraryPath) @@ -174,44 +174,44 @@ - + TurnOffAllWarnings - - - - - - - - - - - - - + + + + + + + + + + + + + TurnOffAllWarnings - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/projects/libs/libs.vcxproj.filters b/libs.vcxproj.filters similarity index 57% rename from projects/libs/libs.vcxproj.filters rename to libs.vcxproj.filters index feaf95a9ee..cfa41aa854 100644 --- a/projects/libs/libs.vcxproj.filters +++ b/libs.vcxproj.filters @@ -24,101 +24,101 @@ - + argparse - + libspeex - + lodepng - + jansson - + jansson - + jansson - + jansson - + jansson - + jansson - + jansson - + jansson - + jansson - + jansson - + jansson - + cutest - + argparse - + libspeex - + libspeex - + libspeex - + libspeex - + libspeex\speex - + libspeex\speex - + lodepng - + jansson - + jansson - + jansson - + jansson - + jansson - + jansson - + jansson - + jansson - + \ No newline at end of file diff --git a/libs.vcxproj.user b/libs.vcxproj.user new file mode 100644 index 0000000000..a11cd7f915 --- /dev/null +++ b/libs.vcxproj.user @@ -0,0 +1,6 @@ + + + + true + + \ No newline at end of file diff --git a/projects/openrct2.sln b/openrct2.sln similarity index 97% rename from projects/openrct2.sln rename to openrct2.sln index b4083ffb27..b3adc8b5f0 100644 --- a/projects/openrct2.sln +++ b/openrct2.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openrct2", "openrct2.vcxproj", "{D24D94F6-2A74-480C-B512-629C306CE92F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libs", "libs\libs.vcxproj", "{074DC930-05C6-4B7F-B5DD-DD237E6E44DB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libs", "libs.vcxproj", "{074DC930-05C6-4B7F-B5DD-DD237E6E44DB}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/openrct2.vcxproj b/openrct2.vcxproj new file mode 100644 index 0000000000..251e80cd70 --- /dev/null +++ b/openrct2.vcxproj @@ -0,0 +1,470 @@ + + + + + + + + + + Debug + Win32 + + + Release + Win32 + + + Release XP + Win32 + + + Release with Tests + Win32 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {074dc930-05c6-4b7f-b5dd-dd237e6e44db} + + + + {D24D94F6-2A74-480C-B512-629C306CE92F} + openrct2 + openrct2 + 10.0.10240.0 + + + + DynamicLibrary + true + v140 + MultiByte + + + DynamicLibrary + false + v140 + true + MultiByte + + + DynamicLibrary + false + v140_xp + true + MultiByte + + + DynamicLibrary + false + v140 + true + MultiByte + + + + + + + + + + + + + + + + + + + $(SolutionDir)lib;$(SolutionDir)lib\libspeex;$(SolutionDir)lib\sdl\include;$(SolutionDir)lib\libcurl\include;$(SolutionDir)lib\jansson;$(SolutionDir)lib\cutest;$(SolutionDir)lib\SDL2_ttf\include;$(IncludePath) + $(SolutionDir)lib\sdl\lib\x86;$(SolutionDir)lib\libcurl\lib;$(LibraryPath) + $(SolutionDir)bin\ + $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + + + $(SolutionDir)lib;$(SolutionDir)lib\libspeex;$(SolutionDir)lib\sdl\include;$(SolutionDir)lib\libcurl\include;$(SolutionDir)lib\jansson;$(SolutionDir)lib\cutest;$(SolutionDir)lib\SDL2_ttf\include;$(IncludePath) + $(SolutionDir)lib\sdl\lib\x86;$(SolutionDir)lib\libcurl\lib;$(LibraryPath) + $(SolutionDir)bin\ + $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + + + $(SolutionDir)lib;$(SolutionDir)lib\libspeex;$(SolutionDir)lib\sdl\include;$(SolutionDir)lib\libcurl\include;$(SolutionDir)lib\jansson;$(SolutionDir)lib\cutest;$(SolutionDir)lib\SDL2_ttf\include;$(IncludePath) + $(SolutionDir)lib\sdl\lib\x86;$(SolutionDir)lib\libcurl\lib;$(LibraryPath) + $(SolutionDir)bin\ + $(SolutionDir)obj\$(ProjectName)\$(Configuration)\ + + + $(SolutionDir)lib;$(SolutionDir)lib\libspeex;$(SolutionDir)lib\sdl\include;$(SolutionDir)lib\libcurl\include;$(SolutionDir)lib\jansson;$(SolutionDir)lib\cutest;$(SolutionDir)lib\SDL2_ttf\include;$(IncludePath) + $(SolutionDir)lib\sdl\lib\x86;$(SolutionDir)lib\libcurl\lib;$(LibraryPath) + $(SolutionDir)bin\ + $(SolutionDir)obj\$(ProjectName)\Release\ + + + + Level3 + Disabled + true + 1Byte + $(OpenRCT2_DEFINES);DEBUG;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;_USE_MATH_DEFINES;CURL_STATICLIB;SDL_MAIN_HANDLED;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + true + $(IntDir)fake\%(RelativeDir) + 4013 + false + + + true + winmm.lib;sdl2.lib;%(AdditionalDependencies) + + + + + Level3 + Full + true + true + + + MultiThreaded + 1Byte + 4013 + + + false + $(OpenRCT2_DEFINES);_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;_USE_MATH_DEFINES;CURL_STATICLIB;SDL_MAIN_HANDLED;%(PreprocessorDefinitions) + $(IntDir)fake\%(RelativeDir) + true + Speed + + + true + true + true + winmm.lib;sdl2.lib;%(AdditionalDependencies) + /ignore:4099 %(AdditionalOptions) + + + + + Level3 + Full + true + true + + + MultiThreaded + 1Byte + 4013 + + + false + $(OpenRCT2_DEFINES);DISABLE_NETWORK;DISABLE_HTTP;DISABLE_TWITCH;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;_USE_MATH_DEFINES;CURL_STATICLIB;SDL_MAIN_HANDLED;%(PreprocessorDefinitions) + $(IntDir)fake\%(RelativeDir) + true + Speed + + + true + true + true + winmm.lib;sdl2.lib;%(AdditionalDependencies) + /ignore:4099 %(AdditionalOptions) + Windows + + + + + Level3 + Disabled + true + true + + + MultiThreaded + 1Byte + 4013 + + + false + $(OpenRCT2_DEFINES);_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;_USE_MATH_DEFINES;CURL_STATICLIB;SDL_MAIN_HANDLED;ENABLE_TESTS;%(PreprocessorDefinitions) + $(IntDir)fake\%(RelativeDir) + true + + + true + true + true + winmm.lib;sdl2.lib;%(AdditionalDependencies) + /ignore:4099 %(AdditionalOptions) + + + + + + \ No newline at end of file diff --git a/projects/openrct2.vcxproj.filters b/openrct2.vcxproj.filters similarity index 56% rename from projects/openrct2.vcxproj.filters rename to openrct2.vcxproj.filters index fd168a2fad..9e4fb16a0d 100644 --- a/projects/openrct2.vcxproj.filters +++ b/openrct2.vcxproj.filters @@ -58,498 +58,498 @@ - + Resource Files - + Resource Files - + Source\Management - + Source\Management - + Source\Management - + Source\Management - + Source\Audio - + Source\Audio - + Source\Interface - + Source\Interface - + Source\Interface - + Source\Interface - + Source\Interface - + Source\World - + Source\World - + Source\World - + Source\World - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Localisation - + Source\Ride - + Source\Ride - + Source\Ride - + Source\Ride - + Source\Ride - + Source\Util - + Source\Util - + Source - + Source - + Source - + Source - + Source - + Source - + Source - + Source - + Source - + Source - + Source - + Source - + Source\Localisation - + Source\Drawing - + Source\Drawing - + Source\Drawing - + Source\Drawing - + Source\Drawing - + Source\Localisation - + Source\Platform - + Source\Platform - + Source\Platform - + Source\Localisation - + Source\Peep - + Source\Peep - + Source\Management - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Drawing - + Source - + Source - + Source\World - + Source\World - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Ride - + Source\Windows - + Source\Interface - + Source\Interface - + Source\World - + Source - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Localisation - + Source\Windows - + Source\Windows - + Source\Windows - + Source\World - + Source\World - + Source\Windows - + Source\Windows - + Source\Ride - + Source - + Source\Windows - + Source - + Source\Windows - + Source\World - + Source\World - + Source - + Source\Windows - + Source - + Source\Windows - + Source\Interface - + Source\Network - + Source\Network - + Source\Interface - + Source\Windows - + Test - + Test\Management - + Test\Ride - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Interface - + Source\Windows - + Source\Windows - + Source - + Source\Localisation - + Source\Drawing - + Source\Drawing - + Source\Localisation - + Source\Network - + Source\Windows - + Source\Windows - + Source\Interface - + Source\Windows - + Source\World - + Source\World - + Source\World - + Source\World - + Source\Localisation - + Source\Localisation - + Source\Ride - + Source\Platform - + Source\Windows - + Source\Interface - + Source @@ -557,283 +557,283 @@ - + Source\Management - + Source\Management - + Source\Management - + Source\Management - + Source\Audio - + Source\Audio - + Source\Interface - + Source\Interface - + Source\Interface - + Source\Interface - + Source\Interface - + Source\World - + Source\World - + Source\World - + Source\World - + Source\World - + Source\Windows - + Source\Windows - + Source\Windows - + Source\Localisation - + Source\Localisation - + Source\Localisation - + Source\Ride - + Source\Ride - + Source\Ride - + Source\Ride - + Source\Ride - + Source\Util - + Source\Util - + Source - + Source - + Source - + Source - + Source - + Source - + Source - + Source - + Source - + Source - + Source - + Source - + Source - + Source - + Source\Localisation - + Source\Drawing - + Source - + Source\Localisation - + Source\Platform - + Source\Localisation - + Source\Peep - + Source\Peep - + Source\Management - + Source - + Source - + Source\World - + Source\Ride - + Source\Interface - + Source\World - + Source - + Source - + Source\World - + Source\World - + Source\Ride - + Source\World - + Source\World - + Source\World - + Source\World - + Source\Interface - + Source\Network - + Source\Network - + Source\Interface - + Test - + Test\Management - + Test\Ride - + Source\Interface - + Source - + Source\Drawing - + Source\Network - + Source\Interface - + Source\Core - + Source\Core - + Source\Core - + Source\Core - + Source\Localisation - + Source\Core - + Source\Core - + Source\Core - + Source\Core - + Source\Ride - + Source\Interface - + Source\Core - + Source\Drawing - + Source diff --git a/projects/openrct2.vcxproj.user b/openrct2.vcxproj.user similarity index 88% rename from projects/openrct2.vcxproj.user rename to openrct2.vcxproj.user index e977faccec..fb13b2fbe1 100644 --- a/projects/openrct2.vcxproj.user +++ b/openrct2.vcxproj.user @@ -1,7 +1,7 @@  - false + true $(TargetDir)\openrct2.exe @@ -12,13 +12,15 @@ $(TargetDir) WindowsLocalDebugger $(TargetDir)\openrct2.exe - + + $(TargetDir) WindowsLocalDebugger $(TargetDir)\openrct2.exe - + + $(TargetDir) diff --git a/projects/openrct2.vcxproj b/projects/openrct2.vcxproj deleted file mode 100644 index 074e69bca3..0000000000 --- a/projects/openrct2.vcxproj +++ /dev/null @@ -1,471 +0,0 @@ - - - - - - - - - - Debug - Win32 - - - Release - Win32 - - - Release XP - Win32 - - - Release with Tests - Win32 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {074dc930-05c6-4b7f-b5dd-dd237e6e44db} - - - - {D24D94F6-2A74-480C-B512-629C306CE92F} - openrct2 - openrct2 - 10.0.10240.0 - - - - DynamicLibrary - true - v140 - MultiByte - - - DynamicLibrary - false - v140 - true - MultiByte - - - DynamicLibrary - false - v140_xp - true - MultiByte - - - DynamicLibrary - false - v140 - true - MultiByte - - - - - - - - - - - - - - - - - - - $(SolutionDir)..\lib;$(SolutionDir)..\lib\libspeex;$(SolutionDir)..\lib\sdl\include;$(SolutionDir)..\lib\libcurl\include;$(SolutionDir)..\lib\jansson;$(SolutionDir)..\lib\cutest;$(SolutionDir)..\lib\SDL2_ttf\include;$(IncludePath) - $(SolutionDir)..\lib\sdl\lib\x86;$(SolutionDir)..\lib\libcurl\lib;$(LibraryPath) - $(SolutionDir)..\bin\ - $(SolutionDir)..\obj\$(ProjectName)\$(Configuration)\ - - - $(SolutionDir)..\lib;$(SolutionDir)..\lib\libspeex;$(SolutionDir)..\lib\sdl\include;$(SolutionDir)..\lib\libcurl\include;$(SolutionDir)..\lib\jansson;$(SolutionDir)..\lib\cutest;$(SolutionDir)..\lib\SDL2_ttf\include;$(IncludePath) - $(SolutionDir)..\lib\sdl\lib\x86;$(SolutionDir)..\lib\libcurl\lib;$(LibraryPath) - $(SolutionDir)..\bin\ - $(SolutionDir)..\obj\$(ProjectName)\$(Configuration)\ - - - $(SolutionDir)..\lib;$(SolutionDir)..\lib\libspeex;$(SolutionDir)..\lib\sdl\include;$(SolutionDir)..\lib\libcurl\include;$(SolutionDir)..\lib\jansson;$(SolutionDir)..\lib\cutest;$(SolutionDir)..\lib\SDL2_ttf\include;$(IncludePath) - $(SolutionDir)..\lib\sdl\lib\x86;$(SolutionDir)..\lib\libcurl\lib;$(LibraryPath) - $(SolutionDir)..\bin\ - $(SolutionDir)..\obj\$(ProjectName)\$(Configuration)\ - - - $(SolutionDir)..\lib;$(SolutionDir)..\lib\libspeex;$(SolutionDir)..\lib\sdl\include;$(SolutionDir)..\lib\libcurl\include;$(SolutionDir)..\lib\jansson;$(SolutionDir)..\lib\cutest;$(SolutionDir)..\lib\SDL2_ttf\include;$(IncludePath) - $(SolutionDir)..\lib\sdl\lib\x86;$(SolutionDir)..\lib\libcurl\lib;$(LibraryPath) - $(SolutionDir)..\bin\ - $(SolutionDir)..\obj\$(ProjectName)\Release\ - - - - Level3 - Disabled - true - 1Byte - $(OpenRCT2_DEFINES);DEBUG;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;_USE_MATH_DEFINES;CURL_STATICLIB;SDL_MAIN_HANDLED;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - true - $(IntDir)fake\%(RelativeDir) - 4013 - false - - - true - winmm.lib;sdl2.lib;%(AdditionalDependencies) - - - - - Level3 - Full - true - true - - - MultiThreaded - 1Byte - 4013 - - - false - $(OpenRCT2_DEFINES);_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;_USE_MATH_DEFINES;CURL_STATICLIB;SDL_MAIN_HANDLED;%(PreprocessorDefinitions) - $(IntDir)fake\%(RelativeDir) - true - Speed - - - true - true - true - winmm.lib;sdl2.lib;%(AdditionalDependencies) - /ignore:4099 %(AdditionalOptions) - - - - - Level3 - Full - true - true - - - MultiThreaded - 1Byte - 4013 - - - false - $(OpenRCT2_DEFINES);DISABLE_NETWORK;DISABLE_HTTP;DISABLE_TWITCH;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;_USE_MATH_DEFINES;CURL_STATICLIB;SDL_MAIN_HANDLED;%(PreprocessorDefinitions) - $(IntDir)fake\%(RelativeDir) - true - Speed - - - true - true - true - winmm.lib;sdl2.lib;%(AdditionalDependencies) - /ignore:4099 %(AdditionalOptions) - Windows - - - - - Level3 - Disabled - true - true - - - MultiThreaded - 1Byte - 4013 - - - false - $(OpenRCT2_DEFINES);_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;_USE_MATH_DEFINES;CURL_STATICLIB;SDL_MAIN_HANDLED;ENABLE_TESTS;%(PreprocessorDefinitions) - $(IntDir)fake\%(RelativeDir) - true - - - true - true - true - winmm.lib;sdl2.lib;%(AdditionalDependencies) - /ignore:4099 %(AdditionalOptions) - - - - - - \ No newline at end of file diff --git a/projects/resource.h b/projects/resource.h deleted file mode 100644 index 545b58f6b5..0000000000 --- a/projects/resource.h +++ /dev/null @@ -1,14 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by openrct2.rc - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 101 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/run.bat b/run.bat deleted file mode 100644 index b67d2f5d95..0000000000 --- a/run.bat +++ /dev/null @@ -1 +0,0 @@ -.\build\Release\openrct2.exe %* diff --git a/scripts/build.ps1 b/scripts/build.ps1 index 922e4ccd41..085ebbf7c1 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -37,7 +37,7 @@ function Build-OpenRCT2() { $target = "/t:rebuild" } - msbuild ..\projects\openrct2.sln /p:Configuration=$Configuration /p:Platform=Win32 $target /v:minimal | Write-Host + msbuild $rootPath\openrct2.sln /p:Configuration=$Configuration /p:Platform=Win32 $target /v:minimal | Write-Host return $LASTEXITCODE } diff --git a/scripts/install.ps1 b/scripts/install.ps1 index 4c0f60437a..c992070e6c 100644 --- a/scripts/install.ps1 +++ b/scripts/install.ps1 @@ -5,7 +5,6 @@ param ( [switch]$Force ) Write-Host "Installing OpenRCT2 development environment for Windows" -ForegroundColor Cyan -Import-Module ".\common.psm1" -DisableNameChecking # Settings $libsUrl = "https://openrct2.website/files/orctlibs-vs.zip" @@ -21,6 +20,8 @@ $libsPath = Join-Path $rootPath "lib" $zipPath = Join-Path $libsPath "orctlibs.zip" $libsVersionPath = Join-Path $libsPath "libversion" +Import-Module "$scriptsPath\common.psm1" -DisableNameChecking + # Check if we need to update the dependencies $currentLibsVersion = 0 $updateLibs = $true diff --git a/scripts/run.ps1 b/scripts/run.ps1 new file mode 100644 index 0000000000..577c611e60 --- /dev/null +++ b/scripts/run.ps1 @@ -0,0 +1 @@ +&("..\bin\openrct2.exe") $args diff --git a/setenv.ps1 b/setenv.ps1 new file mode 100644 index 0000000000..190e5ed457 --- /dev/null +++ b/setenv.ps1 @@ -0,0 +1,36 @@ +# Setups a PowerShell environment for OpenRCT2 development + +function AppExists($app) +{ + $result = (Get-Command $app -CommandType Application -ErrorAction SilentlyContinue) + return ($result -ne $null -and $result.Count -gt 0) +} + +function AddPath($path) +{ + $env:path = "$path;$env:path" +} + +$rootPath = Split-Path $Script:MyInvocation.MyCommand.Path +$scriptsPath = "$rootPath\scripts" +Write-Host "Setting up OpenRCT2 development environment for Windows" -ForegroundColor Cyan + +$appExists = @{} +$appExists["msbuild"] = AppExists("msbuild"); +$appExists["7za"] = AppExists("7za"); +$appExists["7z"] = AppExists("7z"); + +if (-not $appExists["msbuild"]) +{ + $lookPath = Join-Path ${env:ProgramFiles(x86)} "MSBuild\14.0\Bin\amd64\MSBuild.exe" + if (Test-Path $lookPath) + { + AddPath($lookPath) + } + else + { + Write-Host "Warning: msbuild not found, please include it in your PATH" -ForegroundColor Yellow + } +} + +AddPath($scriptsPath) diff --git a/test.bat b/test.bat deleted file mode 100644 index acd4c92e5a..0000000000 --- a/test.bat +++ /dev/null @@ -1,2 +0,0 @@ -msbuild .\projects\openrct2.sln "/p:Configuration=Release with Tests" /p:Platform=Win32 -.\build\Release\openrct2.exe test