From 4b02cbc702d61249edd711ed16828bdb8a142170 Mon Sep 17 00:00:00 2001 From: Joni Orponen Date: Sat, 14 Dec 2024 19:03:57 +0100 Subject: [PATCH] Port Windows build to CMake. --- .../pr-unit-tests-static-windows.yaml | 33 + buildsystem/windows-static/CMakeLists.txt | 138 + windows/README.md | 10 - windows/anura.sln | 30 - windows/anura.vcxproj | 865 ------- windows/anura.vcxproj.filters | 2218 ----------------- windows/build_copy_files.bat | 36 - windows/excluded_from_build_files.txt | 4 - 8 files changed, 171 insertions(+), 3163 deletions(-) create mode 100644 .github/workflows/pr-unit-tests-static-windows.yaml create mode 100644 buildsystem/windows-static/CMakeLists.txt delete mode 100644 windows/README.md delete mode 100644 windows/anura.sln delete mode 100644 windows/anura.vcxproj delete mode 100644 windows/anura.vcxproj.filters delete mode 100644 windows/build_copy_files.bat delete mode 100644 windows/excluded_from_build_files.txt diff --git a/.github/workflows/pr-unit-tests-static-windows.yaml b/.github/workflows/pr-unit-tests-static-windows.yaml new file mode 100644 index 000000000..a61540653 --- /dev/null +++ b/.github/workflows/pr-unit-tests-static-windows.yaml @@ -0,0 +1,33 @@ +name: Unit Tests / Required / Static / Windows +on: + pull_request: + merge_group: + +jobs: + build: + name: Build and Test on Windows + runs-on: windows-2022 + strategy: + fail-fast: false + matrix: + build-type: + - Release + - Debug + steps: + - name: Checkout Anura + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + submodules: true + fetch-depth: 0 + + - name: Set MSBuild Up + uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2.0.0 + + - name: Set ccache Up + uses: hendrikmuhs/ccache-action@ed74d11c0b343532753ecead8a951bb09bb34bc9 # v1.2.14 + with: + key: unit-tests-windows-${{ matrix.build-type }} + + - name: Build Prep Anura + run: | + cmake buildsystem\windows-static -D CMAKE_BUILD_TYPE="${{ matrix.build-type }}" diff --git a/buildsystem/windows-static/CMakeLists.txt b/buildsystem/windows-static/CMakeLists.txt new file mode 100644 index 000000000..482d714f8 --- /dev/null +++ b/buildsystem/windows-static/CMakeLists.txt @@ -0,0 +1,138 @@ +# BEGIN CMake setup + +# 3.12 added add_compile_definitions +cmake_minimum_required(VERSION 3.12) + +# Default to debug builds +if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Debug) +endif() + +# Use vcpkg for dependencies +set(VCPKG_MANIFEST_DIR "${CMAKE_BINARY_DIR}") +set(CMAKE_TOOLCHAIN_FILE "${CMAKE_BINARY_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake") + +# Default to using LTO for Release builds +if (CMAKE_BUILD_TYPE MATCHES Release) + set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE) +endif() + +# END CMake setup + +# BEGIN Project config + +# Build target for CXX project "anura" +project(anura LANGUAGES CXX) + +# Use ccache to accelerate iterating on CXX files, if available +find_program(CCACHE "ccache") +if(CCACHE) + set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE}") +endif(CCACHE) + +# Add the source code +file( + GLOB + anura_SRC + "${CMAKE_BINARY_DIR}/src/*.cpp" + "${CMAKE_BINARY_DIR}/src/hex/*.cpp" + "${CMAKE_BINARY_DIR}/src/imgui/imgui_draw.cpp" + "${CMAKE_BINARY_DIR}/src/imgui/imgui_tables.cpp" + "${CMAKE_BINARY_DIR}/src/imgui/imgui_widgets.cpp" + "${CMAKE_BINARY_DIR}/src/imgui/imgui.cpp" + "${CMAKE_BINARY_DIR}/src/imgui_additions/*.cpp" + "${CMAKE_BINARY_DIR}/src/kre/*.cpp" + "${CMAKE_BINARY_DIR}/src/svg/*.cpp" + "${CMAKE_BINARY_DIR}/src/tiled/*.cpp" + "${CMAKE_BINARY_DIR}/src/treetree/*.cpp" + "${CMAKE_BINARY_DIR}/src/xhtml/*.cpp" +) + +# Configure compiling against vcpkg provided libraries +# XXX - At the moment (2023-08) we have no idea of the upper and lower bounds +# XXX - At the moment (2023-08) we have no idea of the full minimal set +find_package(Threads REQUIRED) +find_package(Boost REQUIRED COMPONENTS filesystem locale regex system) +find_package(ZLIB REQUIRED) +find_package(OpenGL REQUIRED) +find_package(GLEW REQUIRED) +find_package(Freetype REQUIRED) +find_package(GLM REQUIRED) +find_package(SDL2 REQUIRED) +find_package(SDL2_image REQUIRED) +find_package(SDL2_mixer REQUIRED) +find_package(SDL2_ttf REQUIRED) +find_package(Ogg REQUIRED) +find_package(Vorbis REQUIRED) +find_package(harfbuzz CONFIG REQUIRED) +find_package(WebP CONFIG REQUIRED) +find_package(unofficial-lerc CONFIG REQUIRED) +find_package(zstd CONFIG REQUIRED) + +# Add the headers +include_directories( + "${CMAKE_BINARY_DIR}/src" + "${CMAKE_BINARY_DIR}/src/hex" + "${CMAKE_BINARY_DIR}/src/imgui" + "${CMAKE_BINARY_DIR}/src/imgui_additions" + "${CMAKE_BINARY_DIR}/src/kre" + "${CMAKE_BINARY_DIR}/src/svg" + "${CMAKE_BINARY_DIR}/src/tiled" + "${CMAKE_BINARY_DIR}/src/treetree" + "${CMAKE_BINARY_DIR}/src/xhtml" + "${CMAKE_BINARY_DIR}/vcpkg_installed/x64-windows-static/include" +) + +# END Project config + +# BEGIN Compiler config + +# Good things, to keep + +# Set C++ standard to C++17 +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +# Turn off (GNU) extensions (-std=c++17 vs. -std=gnu++17) +set(CMAKE_CXX_EXTENSIONS OFF) + +if (CMAKE_BUILD_TYPE MATCHES Debug) + # Debug builds need to be debuggable + set(VCPKG_TARGET_TRIPLET x64-windows-static-dbg) + set(VCPKG_BUILD_TYPE debug) + link_directories("${CMAKE_BINARY_DIR}/vcpkg_installed/x64-windows-static-dbg/debug/lib") +endif() + +if (CMAKE_BUILD_TYPE MATCHES Release) + # Optimize release builds + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3") + set(VCPKG_TARGET_TRIPLET x64-windows-static-rel) + set(VCPKG_BUILD_TYPE release) + link_directories("${CMAKE_BINARY_DIR}/vcpkg_installed/x64-windows-static/release/lib") +endif() + +# Inject our own imgui config for our own vector operations +add_compile_definitions(IMGUI_USER_CONFIG="${CMAKE_BINARY_DIR}/src/imgui_additions/imconfig_anura.h") + +if (CMAKE_BUILD_TYPE MATCHES Release) + # Turn all things debug, like assertions, off for a release build + add_compile_definitions(NDEBUG) +endif() + +# Bad things, to get rid of + +# Use imgui provided vector math +# XXX - imgui_custom.cpp relies on these +add_compile_definitions(IMGUI_DEFINE_MATH_OPERATORS) + +# END Compiler config + +# BEGIN Linker config + +# Staticly link dependencies in +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) + +# Output an executable from the anura sources for anura +add_executable(anura "${anura_SRC}") + +# END Linker config diff --git a/windows/README.md b/windows/README.md deleted file mode 100644 index 370571437..000000000 --- a/windows/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# Building on Windows - -In order build Anura, you will need Visual Studio 2022 and [vcpkg](https://github.com/microsoft/vcpkg) installed. - -If you do not have vcpkg set up: -- Clone the [vcpkg repo](https://github.com/microsoft/vcpkg) somewhere outside the anura folder. -- Inside the vcpkg folder, run `bootstrap-vcpkg.bat`, then `vcpkg integrate install`. - -Once vcpkg is integrated with Visual Studio: -- Open `anura.sln` and build. The executable will be in `./$(Target)-$(Configuration)/` (`./x64-Release`, for example). diff --git a/windows/anura.sln b/windows/anura.sln deleted file mode 100644 index b76c89e8a..000000000 --- a/windows/anura.sln +++ /dev/null @@ -1,30 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.1.32210.238 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "anura", "anura.vcxproj", "{716CE053-6375-400F-BEB5-0AC23E709C55}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{16BF6D37-7231-4B24-90EE-98D18B282296}" - ProjectSection(SolutionItems) = preProject - Performance1.psess = Performance1.psess - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Release|Win32 = Release|Win32 - Release|Win64 = Release|Win64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {716CE053-6375-400F-BEB5-0AC23E709C55}.Release|Win32.ActiveCfg = Release|Win32 - {716CE053-6375-400F-BEB5-0AC23E709C55}.Release|Win32.Build.0 = Release|Win32 - {716CE053-6375-400F-BEB5-0AC23E709C55}.Release|Win64.ActiveCfg = Release|x64 - {716CE053-6375-400F-BEB5-0AC23E709C55}.Release|Win64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {68A353E5-6EE0-404F-B996-80DD41919DE9} - EndGlobalSection -EndGlobal diff --git a/windows/anura.vcxproj b/windows/anura.vcxproj deleted file mode 100644 index 3b0ed5000..000000000 --- a/windows/anura.vcxproj +++ /dev/null @@ -1,865 +0,0 @@ - - - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IMGUI_INCLUDE_IMGUI_USER_INL;%(PreprocessorDefinitions) - IMGUI_INCLUDE_IMGUI_USER_INL;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {716CE053-6375-400F-BEB5-0AC23E709C55} - Win32Proj - anura - 10.0 - - - - Application - false - v143 - false - Unicode - - - Application - false - v143 - true - Unicode - - - - - - - - - - - - - $(SolutionDir)$(Platform)-$(Configuration)\ - $(SolutionDir)build\$(Platform)-$(Configuration)\ - Link - $(VC_IncludePath);$(WindowsSDK_IncludePath) - $(LibraryPath) - $(VC_IncludePath);$(WindowsSDK_IncludePath); - false - - - false - $(SolutionDir)$(Platform)-$(Configuration)\ - Link - $(SolutionDir)build\$(Platform)-$(Configuration)\ - - - true - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;NOMINMAX;USE_SVG;USE_IMGUI;_WIN32_WINNT=_WIN32_WINNT_WIN10;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_LIB;_USE_MATH_DEFINES;%(PreprocessorDefinitions) - ..\src;..\src\hex;..\src\kre;..\src\svg;..\src\tiled;..\src\xhtml;..\imgui;%(AdditionalIncludeDirectories) - true - Speed - true - stdc17 - stdcpp17 - - - Windows - true - true - true - - - psapi.lib;SDL2main.lib;%(AdditionalDependencies) - UseLinkTimeCodeGeneration - - - build_copy_files.bat $(OutputPath) $(SolutionDir) $(Platform) - $(OutputPath)$(TargetFileName) - $(OutputPath) - true - Copy data to build directory - - - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;NOMINMAX;USE_SVG;USE_IMGUI;_WIN32_WINNT=_WIN32_WINNT_WIN10;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_LIB;_USE_MATH_DEFINES;%(PreprocessorDefinitions) - ..\src;..\src\hex;..\src\kre;..\src\svg;..\src\tiled;..\src\xhtml;..\imgui;%(AdditionalIncludeDirectories) - Speed - stdc17 - true - stdcpp17 - - - Windows - true - true - true - - - SDL2main.lib;%(AdditionalDependencies) - - - build_copy_files.bat $(OutputPath) $(SolutionDir) $(Platform) - $(OutputPath)$(TargetFileName) - $(OutputPath) - true - Copy data to build directory - - - - - - \ No newline at end of file diff --git a/windows/anura.vcxproj.filters b/windows/anura.vcxproj.filters deleted file mode 100644 index 76a9f0547..000000000 --- a/windows/anura.vcxproj.filters +++ /dev/null @@ -1,2218 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {56401d5e-3806-4274-b3dc-3963fd9b0adb} - - - {1fdba8ef-4108-44ac-813e-c7759f245999} - - - {a1e2d246-ccc0-4888-bddf-502c7f8aeff3} - - - {661cf2de-cf6b-496b-822c-ee6b0b0273ab} - - - {4c77de95-4c9c-432b-ac10-409d80f11790} - - - {d4f15d9e-20e2-42ea-b59d-21bd41826c6a} - - - {6a3b1c26-f105-4d81-bb0a-e07aefff005a} - - - {390def7e-d97f-42ec-9da8-6356c2b69cb8} - - - {687d6b8c-369e-4be0-9b5b-4b00c8d73147} - - - {d2b79313-1931-4f32-b109-a9e9b16dfa4d} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\svg - - - Header Files\svg - - - Header Files\svg - - - Header Files\svg - - - Header Files\svg - - - Header Files\svg - - - Header Files\svg - - - Header Files\svg - - - Header Files\svg - - - Header Files\svg - - - Header Files\svg - - - Header Files\svg - - - Header Files\svg - - - Header Files\svg - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files - - - Header Files\kre - - - Header Files\tiled - - - Header Files\tiled - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\svg - - - Header Files\xhtml - - - Header Files\kre - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\hex - - - Header Files - - - Header Files - - - Header Files - - - Header Files\kre - - - Header Files\xhtml - - - Header Files\kre - - - Header Files\kre - - - Header Files\kre - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\xhtml - - - Header Files\hex - - - Header Files\hex - - - Header Files\hex - - - Header Files\hex - - - Header Files\hex - - - Header Files\hex - - - Header Files\hex - - - Header Files\hex - - - Header Files\hex - - - Header Files - - - Header Files - - - Header Files\kre - - - Header Files\kre - - - Header Files - - - Header Files - - - Source Files - - - - - Header Files\kre - - - Header Files - - - - - Source Files\svg - - - Source Files\svg - - - Source Files\svg - - - Source Files\svg - - - Source Files\svg - - - Source Files\svg - - - Source Files\svg - - - Source Files\svg - - - Source Files\svg - - - Source Files\svg - - - Source Files\svg - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\kre - - - Source Files\tiled - - - Source Files\tiled - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\svg - - - Source Files\xhtml - - - Source Files\kre - - - Source Files\kre - - - Source Files\xhtml - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files - - - Source Files\hex - - - Source Files - - - Source Files - - - Source Files - - - Source Files\kre - - - Source Files\xhtml - - - Source Files\kre - - - Source Files\kre - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\xhtml - - - Source Files\hex - - - Source Files\hex - - - Source Files\hex - - - Source Files\hex - - - Source Files\hex - - - Source Files\hex - - - Source Files - - - Source Files - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files\kre - - - Source Files - - - Source Files - - - Source Files\kre - - - - - Resource Files - - - \ No newline at end of file diff --git a/windows/build_copy_files.bat b/windows/build_copy_files.bat deleted file mode 100644 index 77326efbd..000000000 --- a/windows/build_copy_files.bat +++ /dev/null @@ -1,36 +0,0 @@ -rem %1 - the output path -rem %2 - the solution directory -rem %3 - the platform - -:: To avoid having to copy all of Frogatto, first run: -:: New-Item -ItemType Junction -Path "$HOME\Documents\anura\windows\x64-Release\modules\frogatto4" -Target "$HOME\Documents\anura\modules\frogatto4" - -set "build_dir=%1" -set "base_dir=%2..\" - -:: Copy over module stuff. -xcopy /y/s/d "%base_dir%data" "%build_dir%\data\" -if ERRORLEVEL 1 goto return_error -xcopy /y/s/d "%base_dir%images" "%build_dir%\images\" -if ERRORLEVEL 1 goto return_error -xcopy /y/s/d "%base_dir%modules" "%build_dir%\modules\" /EXCLUDE:%2excluded_from_build_files.txt -if ERRORLEVEL 1 goto return_error -xcopy /y/s/d "%base_dir%update" "%build_dir%\update\" -if ERRORLEVEL 1 goto return_error -xcopy /y/s/d "%base_dir%music" "%build_dir%\music\" -if ERRORLEVEL 1 goto return_error - -:: Copy two missing .dlls FrostC reported on his machine. I think we should distribute the proper redistributiable.exe for these? -xcopy /y "C:\Windows\System32\MSVCP140.dll" "%build_dir%\" -if ERRORLEVEL 1 goto return_error -xcopy /y "C:\Windows\System32\vcruntime140.dll" "%build_dir%\" -if ERRORLEVEL 1 goto return_error - -goto end - -:return_error -echo "File Copy error, aborting" -EXIT 1 - -:end -EXIT 0 \ No newline at end of file diff --git a/windows/excluded_from_build_files.txt b/windows/excluded_from_build_files.txt deleted file mode 100644 index 08a6268cb..000000000 --- a/windows/excluded_from_build_files.txt +++ /dev/null @@ -1,4 +0,0 @@ -.git\ -\modules\tbs -\modules\citadel -\modules\frogatto4 \ No newline at end of file