From a8ca1edaef42fab492d37f533563ea356b29c08f Mon Sep 17 00:00:00 2001 From: literallyMilk Date: Wed, 8 Jul 2026 13:01:49 +0300 Subject: [PATCH] Added compiling for Windows --- .gitignore | 4 +++- README | 29 +++++++++++++++++++++++++++++ compile.ps1 | 15 +++++++++++++++ compile.sh | 4 ++++ compile_linux.sh | 4 +--- compile_windows.sh | 4 +--- compile_windows_64.sh | 4 +--- makeheaders/makeheaders | Bin 48696 -> 0 bytes src/helpers/common.hpp | 2 +- src/helpers/menu.cpp | 4 ++-- src/helpers/networking.cpp | 5 +++-- src/helpers/recipes.cpp | 2 +- toolchains/mingw-w64-native.cmake | 14 ++++++++++++++ 13 files changed, 75 insertions(+), 16 deletions(-) create mode 100644 README create mode 100644 compile.ps1 delete mode 100755 makeheaders/makeheaders create mode 100644 toolchains/mingw-w64-native.cmake diff --git a/.gitignore b/.gitignore index 65d3a72..e678b90 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,6 @@ __UTILS__ snapshots OUTPUT-Linux OUTPUT-w64 -OUTPUT-w32 \ No newline at end of file +OUTPUT-w32 +makeheaders/makeheaders.exe +makeheaders/makeheaders \ No newline at end of file diff --git a/README b/README new file mode 100644 index 0000000..05021ce --- /dev/null +++ b/README @@ -0,0 +1,29 @@ +# Compiling +! NOTICE: Compile with `-recursive`, e.g `git clone ... -recursive` +## Compiling on Linux +1) Install tools. +**Debian-based distros:** +Essential: +```sh +sudo apt install build-essential cmake zip unzip make libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libgl-dev +``` +If you also want to compile for Windows: +```sh +sudo apt install g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64 g++-mingw-w64-i686 gcc-mingw-w64-i686 +``` + +**Arch-based distros:** +Essential: +`TODO` +If you also want to compile for Windows: +`TODO` + +2) Run `compile.sh` to compile for Linux, 64-bit Windows & 32-bit Windows. +Run `compile_linux.sh` to compile for Linux only. + +## Compiling on Windows +1) Install [CMake](https://cmake.org/download/), [Ninja](https://ninja-build.org/) and [MinGW](https://www.mingw-w64.org/). +Try them out in the terminal: `cmake -version`, `ninja --version`, `gcc -version`, `g++ -version`. +If some are missing, add them to PATH. + +2) From the terminal, run `compile.ps1`. \ No newline at end of file diff --git a/compile.ps1 b/compile.ps1 new file mode 100644 index 0000000..f147796 --- /dev/null +++ b/compile.ps1 @@ -0,0 +1,15 @@ +cd makeheaders +make +cd .. + +./makeheaders/makeheaders.exe -h src/helpers/vars.hpp src/helpers/chunks.cpp src/helpers/debug.cpp src/helpers/entities.cpp src/helpers/input.cpp src/helpers/menu.cpp src/helpers/mesher.cpp src/helpers/networking.cpp src/helpers/utils.cpp src/helpers/inlines.hpp src/helpers/inventory.cpp src/helpers/locale.cpp src/helpers/recipes.cpp src/helpers/particles.cpp src/helpers/player.cpp src/helpers/multisound.cpp -v > tmp.hpp +Get-Content .\additions.hpp, .\tmp.hpp | Out-File .\src\helpers\common.hpp -Encoding UTF8 +rm tmp.hpp + +echo Building x86-64 Windows... +rm build +cmake -DCMAKE_TOOLCHAIN_FILE='toolchains/mingw-w64-native.cmake' . -DWIN32=ON -DWIN32=true -B build -G "Ninja" +cmake --build build +mkdir OUTPUT-w64 +cp build/src/RCRAFT.exe OUTPUT-w64/CubeGame.exe +cp -r data/resources OUTPUT-w64 \ No newline at end of file diff --git a/compile.sh b/compile.sh index c89989f..82f276e 100644 --- a/compile.sh +++ b/compile.sh @@ -1,5 +1,9 @@ #/usr/bin/bash +cd makeheaders +make +cd .. + sh compile_linux.sh sh compile_windows_64.sh sh compile_windows.sh \ No newline at end of file diff --git a/compile_linux.sh b/compile_linux.sh index 21231e4..eaabb36 100644 --- a/compile_linux.sh +++ b/compile_linux.sh @@ -7,9 +7,7 @@ rm tmp.hpp echo Building x86-64 Linux... rm -rf build cmake -B build -DUNIX=ON -DUNIX=true -DCMAKE_BUILD_TYPE=Debug -cd build -make -j12 -cd .. +cmake --build build mkdir OUTPUT-Linux cp build/src/RCRAFT OUTPUT-Linux/CubeGame cp -r data/resources OUTPUT-Linux \ No newline at end of file diff --git a/compile_windows.sh b/compile_windows.sh index 3d058ac..36f600d 100644 --- a/compile_windows.sh +++ b/compile_windows.sh @@ -7,9 +7,7 @@ rm tmp.hpp echo Building i686 Windows... rm -rf build cmake -DCMAKE_TOOLCHAIN_FILE=toolchains/mingw-w32.cmake -DWIN32=ON -DWIN32=true -B build -cd build -make -j12 -cd .. +cmake --build build mkdir OUTPUT-w32 cp build/src/RCRAFT.exe OUTPUT-w32/CubeGame.exe cp -r data/resources OUTPUT-w32 \ No newline at end of file diff --git a/compile_windows_64.sh b/compile_windows_64.sh index a38b01f..ac589b9 100644 --- a/compile_windows_64.sh +++ b/compile_windows_64.sh @@ -7,9 +7,7 @@ rm tmp.hpp echo Building x86-64 Windows... rm -rf build cmake -DCMAKE_TOOLCHAIN_FILE=toolchains/mingw-w64.cmake -DWIN32=ON -DWIN32=true -B build -cd build -make -j12 -cd .. +cmake --build build mkdir OUTPUT-w64 cp build/src/RCRAFT.exe OUTPUT-w64/CubeGame.exe cp -r data/resources OUTPUT-w64 \ No newline at end of file diff --git a/makeheaders/makeheaders b/makeheaders/makeheaders deleted file mode 100755 index 8ae85bb767cef3e502da2cf174aa1bd166bc918d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48696 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 diff --git a/src/helpers/common.hpp b/src/helpers/common.hpp index 49d4fd2..ef652f5 100644 --- a/src/helpers/common.hpp +++ b/src/helpers/common.hpp @@ -1,4 +1,4 @@ -#ifdef WIN32 // FUCK WINDOWS +#ifdef WIN32 // FUCK WINDOWS #include "external/fix_win32_compatibility.h" #undef PlaySound #endif diff --git a/src/helpers/menu.cpp b/src/helpers/menu.cpp index 0e875eb..c99aa63 100644 --- a/src/helpers/menu.cpp +++ b/src/helpers/menu.cpp @@ -488,10 +488,10 @@ void DrawWorldSelect() { DrawBackground(); int i = 0; for(std::filesystem::path path : worldList) { - if(Button(reinterpret_cast(path.filename().u8string().c_str()), GetScreenWidth()/2-64, i*48+8, 128, 0)) { + if(Button(reinterpret_cast(path.filename().string().c_str()), GetScreenWidth()/2-64, i*48+8, 128, 0)) { online = false; SetTargetFPS(-1); - _LoadWorld(reinterpret_cast(path.u8string().c_str())); + _LoadWorld(reinterpret_cast(path.string().c_str())); return; } i++; diff --git a/src/helpers/networking.cpp b/src/helpers/networking.cpp index d09f06a..1dc646e 100644 --- a/src/helpers/networking.cpp +++ b/src/helpers/networking.cpp @@ -25,7 +25,7 @@ ENetHost* StartServer() { /* Bind the server to port 1234. */ address.port = PORT; - server = enet_host_create(&address, 32, 1, 0); + server = enet_host_create(&address, 32, 1, 0, 0); if (server == NULL) { fprintf (stderr, @@ -41,7 +41,8 @@ ENetHost* StartClient() { client = enet_host_create (NULL /* create a client host */, 1 /* 1 channel*/, 1 /* only allow 1 outgoing connection */, - 0 /* assume any amount of incoming bandwidth */); + 0 /* assume any amount of incoming bandwidth */, + 0); if (client == NULL) { diff --git a/src/helpers/recipes.cpp b/src/helpers/recipes.cpp index b9ca033..d88a0f9 100644 --- a/src/helpers/recipes.cpp +++ b/src/helpers/recipes.cpp @@ -49,7 +49,7 @@ void LoadRecipes() { try { Recipe _recipe; - const std::string path = dir_entry.path().u8string(); + const std::string path = dir_entry.path().string(); std::cout << "loading " << path << std::endl; YAML::Node recipe = YAML::LoadFile(path); _recipe.requiredStation = recipe["station"].as(); diff --git a/toolchains/mingw-w64-native.cmake b/toolchains/mingw-w64-native.cmake new file mode 100644 index 0000000..a2c68b7 --- /dev/null +++ b/toolchains/mingw-w64-native.cmake @@ -0,0 +1,14 @@ +set(CMAKE_SYSTEM_NAME Windows) +set(CMAKE_SYSTEM_VERSION 1) + +set(CMAKE_C_COMPILER gcc) +set(CMAKE_CXX_COMPILER g++) +set(CMAKE_RC_COMPILER windres) + +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) + +set(CMAKE_C_FLAGS "-static-libgcc -static-libstdc++ ${CMAKE_C_FLAGS}") +set(CMAKE_CXX_FLAGS "-static-libgcc -static-libstdc++ ${CMAKE_CXX_FLAGS}")