diff options
author | Kae <80987908+Novaenia@users.noreply.github.com> | 2023-07-01 08:39:38 +1000 |
---|---|---|
committer | Kae <80987908+Novaenia@users.noreply.github.com> | 2023-07-01 08:39:38 +1000 |
commit | 68d1c19455f596a09d9dcf40279ae9cf5a9c71de (patch) | |
tree | 58a2b3d7d212527bf740c14e56c88bb6e6b80f2d /scripts | |
parent | ce68aad07890796f9498d2d216da7cd779329e3a (diff) |
Throw away 32-bit support
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/gitlab-ci/assemble.sh | 40 | ||||
-rw-r--r-- | scripts/gitlab-ci/windows/build.bat (renamed from scripts/gitlab-ci/windows64/build.bat) | 12 | ||||
-rw-r--r-- | scripts/gitlab-ci/windows/sbinit.config (renamed from scripts/gitlab-ci/windows32/sbinit.config) | 0 | ||||
-rw-r--r-- | scripts/gitlab-ci/windows/test.bat (renamed from scripts/gitlab-ci/windows64/test.bat) | 0 | ||||
-rw-r--r-- | scripts/gitlab-ci/windows32/build.bat | 25 | ||||
-rw-r--r-- | scripts/gitlab-ci/windows32/test.bat | 8 | ||||
-rw-r--r-- | scripts/gitlab-ci/windows64/sbinit.config | 14 | ||||
-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 |
11 files changed, 24 insertions, 145 deletions
diff --git a/scripts/gitlab-ci/assemble.sh b/scripts/gitlab-ci/assemble.sh index 95d18cd..ebfa130 100644 --- a/scripts/gitlab-ci/assemble.sh +++ b/scripts/gitlab-ci/assemble.sh @@ -16,32 +16,18 @@ touch client_distribution/mods/mods_go_here mkdir client_distribution/win64 cp -r \ - windows64_binaries/starbound.exe \ - windows64_binaries/starbound.pdb \ - windows64_binaries/starbound_server.exe \ - windows64_binaries/mod_uploader.exe \ - windows64_binaries/*.dll \ - windows64_binaries/iconengines \ - windows64_binaries/imageformats \ - windows64_binaries/platforms \ - windows64_binaries/translations \ - scripts/gitlab-ci/windows64/sbinit.config \ + windows_binaries/starbound.exe \ + windows_binaries/starbound.pdb \ + windows_binaries/starbound_server.exe \ + windows_binaries/mod_uploader.exe \ + windows_binaries/*.dll \ + windows_binaries/iconengines \ + windows_binaries/imageformats \ + windows_binaries/platforms \ + windows_binaries/translations \ + scripts/gitlab-ci/windows/sbinit.config \ client_distribution/win64/ -mkdir client_distribution/win32 -cp \ - windows32_binaries/starbound.exe \ - windows32_binaries/starbound.pdb \ - windows32_binaries/starbound_server.exe \ - windows32_binaries/asset_packer.exe \ - windows32_binaries/asset_unpacker.exe \ - windows32_binaries/dump_versioned_json.exe \ - windows32_binaries/make_versioned_json.exe \ - windows32_binaries/planet_mapgen.exe \ - windows32_binaries/*.dll \ - scripts/gitlab-ci/windows32/sbinit.config \ - client_distribution/win32/ - mkdir client_distribution/osx cp -LR scripts/gitlab-ci/macos/Starbound.app client_distribution/osx/ mkdir client_distribution/osx/Starbound.app/Contents/MacOS @@ -92,7 +78,7 @@ cp \ server_distribution/linux/ cp \ - windows64_binaries/starbound_server.exe \ - windows64_binaries/*.dll \ - scripts/gitlab-ci/windows64/sbinit.config \ + windows_binaries/starbound_server.exe \ + windows_binaries/*.dll \ + scripts/gitlab-ci/windows/sbinit.config \ server_distribution/win64/ diff --git a/scripts/gitlab-ci/windows64/build.bat b/scripts/gitlab-ci/windows/build.bat index bcd1158..cfd209a 100644 --- a/scripts/gitlab-ci/windows64/build.bat +++ b/scripts/gitlab-ci/windows/build.bat @@ -15,18 +15,18 @@ cmake.exe ^ -DSTAR_ENABLE_STEAM_INTEGRATION=ON ^ -DSTAR_ENABLE_DISCORD_INTEGRATION=ON ^ -DSTAR_BUILD_QT_TOOLS=OFF ^ - -DCMAKE_INCLUDE_PATH="..\lib\windows64\include" ^ - -DCMAKE_LIBRARY_PATH="..\lib\windows64" ^ + -DCMAKE_INCLUDE_PATH="..\lib\windows\include" ^ + -DCMAKE_LIBRARY_PATH="..\lib\windows" ^ ..\source || exit /b 1 cmake.exe --build . --config RelWithDebInfo || exit /b 1 cd .. -move dist windows64_binaries || exit /b 1 +move dist windows_binaries || exit /b 1 -if exist windows64_binaries\mod_uploader.exe ( - windeployqt.exe windows64_binaries\mod_uploader.exe || exit /b 1 +if exist windows_binaries\mod_uploader.exe ( + windeployqt.exe windows_binaries\mod_uploader.exe || exit /b 1 ) -copy lib\windows64\*.dll windows64_binaries\ || exit /b 1 +copy lib\windows\*.dll windows_binaries\ || exit /b 1 diff --git a/scripts/gitlab-ci/windows32/sbinit.config b/scripts/gitlab-ci/windows/sbinit.config index b200df4..b200df4 100644 --- a/scripts/gitlab-ci/windows32/sbinit.config +++ b/scripts/gitlab-ci/windows/sbinit.config diff --git a/scripts/gitlab-ci/windows64/test.bat b/scripts/gitlab-ci/windows/test.bat index d6cb450..d6cb450 100644 --- a/scripts/gitlab-ci/windows64/test.bat +++ b/scripts/gitlab-ci/windows/test.bat diff --git a/scripts/gitlab-ci/windows32/build.bat b/scripts/gitlab-ci/windows32/build.bat deleted file mode 100644 index f353d8b..0000000 --- a/scripts/gitlab-ci/windows32/build.bat +++ /dev/null @@ -1,25 +0,0 @@ -set CMAKE_PREFIX_PATH="C:\Program Files\CMake" -set PATH=%PATH%;%CMAKE_PREFIX_PATH%\bin;%QT_PREFIX_PATH%\bin - -mkdir build -cd build || exit /b 1 - -del /f CMakeCache.txt - -cmake.exe ^ - -G"Visual Studio 14" ^ - -T"v140_xp" ^ - -DSTAR_ENABLE_STATIC_MSVC_RUNTIME=ON ^ - -DSTAR_ENABLE_STEAM_INTEGRATION=ON ^ - -DSTAR_ENABLE_DISCORD_INTEGRATION=ON ^ - -DCMAKE_INCLUDE_PATH="..\lib\windows32\include" ^ - -DCMAKE_LIBRARY_PATH="..\lib\windows32" ^ - ..\source || exit /b 1 - -cmake.exe --build . --config RelWithDebInfo || exit /b 1 - -cd .. - -move dist windows32_binaries || exit /b 1 - -copy lib\windows32\*.dll windows32_binaries\ || exit /b 1 diff --git a/scripts/gitlab-ci/windows32/test.bat b/scripts/gitlab-ci/windows32/test.bat deleted file mode 100644 index 6887309..0000000 --- a/scripts/gitlab-ci/windows32/test.bat +++ /dev/null @@ -1,8 +0,0 @@ -cd windows32_binaries - -set PATH="%PATH%;..\lib\windows32" - -copy ..\scripts\windows\sbinit.config . - -.\core_tests || exit /b 1 -.\game_tests || exit /b 1 diff --git a/scripts/gitlab-ci/windows64/sbinit.config b/scripts/gitlab-ci/windows64/sbinit.config deleted file mode 100644 index b200df4..0000000 --- a/scripts/gitlab-ci/windows64/sbinit.config +++ /dev/null @@ -1,14 +0,0 @@ -{ - "assetDirectories" : [ - "..\\assets\\", - "..\\mods\\" - ], - - "storageDirectory" : "..\\storage\\", - - "defaultConfiguration" : { - "gameServerBind" : "*", - "queryServerBind" : "*", - "rconServerBind" : "*" - } -} 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 |