diff options
Diffstat (limited to 'scripts/windows')
-rw-r--r-- | scripts/windows/copy-to-steam32.bat | 8 | ||||
-rw-r--r-- | scripts/windows/copy-to-steam64.bat | 8 | ||||
-rw-r--r-- | scripts/windows/setup.bat (renamed from scripts/windows/setup64.bat) | 10 | ||||
-rw-r--r-- | scripts/windows/setup32.bat | 44 |
4 files changed, 5 insertions, 65 deletions
diff --git a/scripts/windows/copy-to-steam32.bat b/scripts/windows/copy-to-steam32.bat deleted file mode 100644 index 5e8c414..0000000 --- a/scripts/windows/copy-to-steam32.bat +++ /dev/null @@ -1,8 +0,0 @@ -cd /d %~dp0 -cd ..\..\dist - -set STEAM_STARBOUND_DIR=c:\Program Files (x86)\Steam\steamapps\common\Starbound - Unstable - -.\asset_packer.exe -c ..\assets\packing.config "custom assets" ..\assets\packed .\packed.pak -move packed.pak "%STEAM_STARBOUND_DIR%\assets\packed.pak" -copy starbound.exe "%STEAM_STARBOUND_DIR%\win32\" diff --git a/scripts/windows/copy-to-steam64.bat b/scripts/windows/copy-to-steam64.bat deleted file mode 100644 index 319ff33..0000000 --- a/scripts/windows/copy-to-steam64.bat +++ /dev/null @@ -1,8 +0,0 @@ -cd /d %~dp0 -cd ..\..\dist - -set STEAM_STARBOUND_DIR=c:\Program Files (x86)\Steam\steamapps\common\Starbound - Unstable - -.\asset_packer.exe -c ..\assets\packing.config "custom assets" ..\assets\packed .\packed.pak -move packed.pak "%STEAM_STARBOUND_DIR%\assets\packed.pak" -copy starbound.exe "%STEAM_STARBOUND_DIR%\win64\" diff --git a/scripts/windows/setup64.bat b/scripts/windows/setup.bat index 9f24a1e..50f2869 100644 --- a/scripts/windows/setup64.bat +++ b/scripts/windows/setup.bat @@ -3,7 +3,7 @@ cd ..\.. mkdir dist del dist\*.dll -copy lib\windows64\*.dll dist\ +copy lib\windows\*.dll dist\ copy scripts\windows\sbinit.config dist\ mkdir build @@ -29,8 +29,8 @@ if exist %QT_PREFIX_PATH% ( -DSTAR_ENABLE_STEAM_INTEGRATION=ON ^ -DSTAR_ENABLE_DISCORD_INTEGRATION=ON ^ -DSTAR_BUILD_QT_TOOLS=ON ^ - -DCMAKE_INCLUDE_PATH="..\lib\windows64\include" ^ - -DCMAKE_LIBRARY_PATH="..\lib\windows64" ^ + -DCMAKE_INCLUDE_PATH="..\lib\windows\include" ^ + -DCMAKE_LIBRARY_PATH="..\lib\windows" ^ ..\source ) else ( @@ -41,8 +41,8 @@ if exist %QT_PREFIX_PATH% ( -DSTAR_USE_JEMALLOC=OFF ^ -DSTAR_ENABLE_STEAM_INTEGRATION=ON ^ -DSTAR_ENABLE_DISCORD_INTEGRATION=ON ^ - -DCMAKE_INCLUDE_PATH="..\lib\windows64\include" ^ - -DCMAKE_LIBRARY_PATH="..\lib\windows64" ^ + -DCMAKE_INCLUDE_PATH="..\lib\windows\include" ^ + -DCMAKE_LIBRARY_PATH="..\lib\windows" ^ ..\source ) diff --git a/scripts/windows/setup32.bat b/scripts/windows/setup32.bat deleted file mode 100644 index 2934e01..0000000 --- a/scripts/windows/setup32.bat +++ /dev/null @@ -1,44 +0,0 @@ -cd /d %~dp0 -cd ..\.. - -mkdir dist -del dist\*.dll -copy lib\windows32\*.dll dist\ -copy scripts\windows\sbinit.config dist\ - -mkdir build -cd build - -if exist "C:\Program Files (x86)\CMake\bin" ( - set CMAKE_EXE_PATH="C:\Program Files (x86)\CMake\bin" -) else ( - set CMAKE_EXE_PATH="C:\Program Files\CMake\bin" -) - -set QT_PREFIX_PATH=C:\Qt\5.6\msvc2015 - -if exist %QT_PREFIX_PATH% ( - -%CMAKE_EXE_PATH%\cmake.exe ^ - ..\source ^ - -G"Visual Studio 14" ^ - -T"v140_xp" ^ - -DSTAR_USE_JEMALLOC=OFF ^ - -DCMAKE_PREFIX_PATH=%QT_PREFIX_PATH% ^ - -DSTAR_BUILD_QT_TOOLS=ON ^ - -DCMAKE_INCLUDE_PATH="..\lib\windows32\include" ^ - -DCMAKE_LIBRARY_PATH="..\lib\windows32" - -) else ( - -%CMAKE_EXE_PATH%\cmake.exe ^ - ..\source ^ - -G "Visual Studio 14" ^ - -T"v140_xp" ^ - -DSTAR_USE_JEMALLOC=OFF ^ - -DCMAKE_INCLUDE_PATH="..\lib\windows32\include" ^ - -DCMAKE_LIBRARY_PATH="..\lib\windows32" - -) - -pause |