From 8460afd2f1244c785d56c14ee2e576d8f76aa8b1 Mon Sep 17 00:00:00 2001 From: Joni Orponen Date: Wed, 2 Aug 2023 22:18:06 +0200 Subject: [PATCH] known broken: Integrate vcpkg to the .vcxproj. --- .../push-unit-tests-static-windows.yaml | 41 + README.md | 25 +- windows/README.md | 15 +- windows/anura.sln | 6 +- windows/anura.vcxproj | 303 +-- windows/anura.vcxproj.filters | 2218 ----------------- windows/build_copy_files.bat | 36 - windows/excluded_from_build_files.txt | 4 - 8 files changed, 207 insertions(+), 2441 deletions(-) create mode 100644 .github/workflows/push-unit-tests-static-windows.yaml 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/push-unit-tests-static-windows.yaml b/.github/workflows/push-unit-tests-static-windows.yaml new file mode 100644 index 000000000..5881ca8e2 --- /dev/null +++ b/.github/workflows/push-unit-tests-static-windows.yaml @@ -0,0 +1,41 @@ +name: Unit Tests / Required / Static / Windows +on: push + +env: + VCPKG_DISABLE_METRICS: 1 + +jobs: + build: + name: 'Server 2022' + runs-on: windows-2022 + strategy: + fail-fast: false + matrix: + build-type: + - Release + - Debug + steps: + - name: Checkout Anura + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + with: + # We need the full history for the vcpkg integration to work + fetch-depth: 0 + submodules: true + + # Sets a cache up for vcpkg + - name: Install vcpkg + uses: lukka/run-vcpkg@abed23940f9d7bc267b0e1a21ee7b699a3794baa # v11.1 + + - name: Install MSBuild + uses: microsoft/setup-msbuild@1ff57057b5cfdc39105cd07a01d78e9b0ea0c14c # v1.3.1 + with: + msbuild-architecture: x64 + # Visual Studio 2022 + vs-version: '17' + + # This also runs vcpkg as we have everything defined in the .vcxproj + - name: Build Anura + run: msbuild -m -p:Configuration="${{ matrix.build-type }}" windows/anura.sln + + - name: Run Unit Tests + run: .\windows\x64\"${{ matrix.build-type }}"\anura.exe --tests diff --git a/README.md b/README.md index 45f8c6275..b162bea25 100644 --- a/README.md +++ b/README.md @@ -182,7 +182,24 @@ way of the land. #### Windows -Undocumented as of 2023-08. +The build is known broken as of 2023-08. It has been manually edited on Linux +and it's spitting errors out when opened with a Visual Studio proper. It mostly +builds fine with msbuild on the command line. + +Known problems 2023-08: + +* Visual Studio does not like the current solution and project files + +The .sln and .vcxproj are intending for the following set of constraints: + +* Wrap vcpkg + * Install correct dependencies + * Debug + * Release +* Default set of warnings + * Don't treat warnings as errors +* "Press play to run" +* "Press play to debug" #### macOS @@ -275,8 +292,10 @@ On every push: * NOT IMPLEMENTED [JSON Formatter](https://github.com/callumlocke/json-formatter) * Unit Tests - * NOT IMPLEMENTED Windows / msbuild / Release / static - * NOT IMPLEMENTED Windows / msbuild / Debug / static + * KNOWN BROKEN [Windows / msbuild / Release / + static](https://github.com/anura-engine/anura/blob/trunk/.github/workflows/push-unit-tests-static-windows.yaml) + * KNOWN BROKEN [Windows / msbuild / Debug / + static](https://github.com/anura-engine/anura/blob/trunk/.github/workflows/push-unit-tests-static-windows.yaml) * NOT IMPLEMENTED macOS / xcodebuild / Release / static * NOT IMPLEMENTED macOS / xcodebuild / Debug / static * Ubuntu 22.04 / clang++ / Release / dynamic diff --git a/windows/README.md b/windows/README.md index 370571437..d2ed3a0ad 100644 --- a/windows/README.md +++ b/windows/README.md @@ -1,10 +1,13 @@ # Building on Windows -In order build Anura, you will need Visual Studio 2022 and [vcpkg](https://github.com/microsoft/vcpkg) installed. +In order build Anura, you will need [Visual +Studio](https://visualstudio.microsoft.com/downloads/) 2022. -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`. +The solution and project wrap vcpkg for you and you should be simply able to +"press play". -Once vcpkg is integrated with Visual Studio: -- Open `anura.sln` and build. The executable will be in `./$(Target)-$(Configuration)/` (`./x64-Release`, for example). +An alternate route is to only grab the [build +tools](https://visualstudio.microsoft.com/downloads/?q=build+tools#build-tools-for-visual-studio-2022) +and to build on the command line with `msbuild`. See the +[CI](https://github.com/anura-engine/anura/blob/trunk/.github/workflows/push-unit-tests-static-windows.yaml) +definition for the current details. diff --git a/windows/anura.sln b/windows/anura.sln index b76c89e8a..b2a8b618f 100644 --- a/windows/anura.sln +++ b/windows/anura.sln @@ -12,14 +12,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Release|Win32 = Release|Win32 Release|Win64 = Release|Win64 + Debug|Win64 = Debug|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 + {716CE053-6375-400F-BEB5-0AC23E709C55}.Debug|Win64.ActiveCfg = Debug|x64 + {716CE053-6375-400F-BEB5-0AC23E709C55}.Debug|Win64.Build.0 = Debug|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/windows/anura.vcxproj b/windows/anura.vcxproj index 3b0ed5000..2989fb19e 100644 --- a/windows/anura.vcxproj +++ b/windows/anura.vcxproj @@ -1,17 +1,16 @@  - + - - Release - Win32 - Release x64 + + Debug + x64 + - @@ -21,13 +20,12 @@ - + - @@ -37,18 +35,18 @@ - + - + - + @@ -56,12 +54,11 @@ - + - @@ -69,25 +66,25 @@ + - + - + - + - - - + + - + @@ -97,35 +94,41 @@ + - - + + - - + + - + + + + + + @@ -223,28 +226,28 @@ - - + + - + - - + + - - + + @@ -259,8 +262,8 @@ - + @@ -277,17 +280,17 @@ - + - + @@ -316,45 +319,45 @@ - + - + + - - + - + - - + + - + @@ -368,14 +371,13 @@ - - + @@ -390,6 +392,7 @@ + @@ -397,12 +400,6 @@ - - IMGUI_INCLUDE_IMGUI_USER_INL;%(PreprocessorDefinitions) - IMGUI_INCLUDE_IMGUI_USER_INL;%(PreprocessorDefinitions) - - - @@ -410,13 +407,12 @@ - + - @@ -426,17 +422,17 @@ - + - + - + @@ -448,7 +444,6 @@ - @@ -456,21 +451,21 @@ + + - - - + - + @@ -481,14 +476,15 @@ + - + @@ -503,6 +499,11 @@ + + + + + @@ -581,29 +582,29 @@ - + - - + + - - - + + + - - + + @@ -616,8 +617,8 @@ - + @@ -634,10 +635,10 @@ - - + + @@ -664,17 +665,17 @@ - + - + + - @@ -685,26 +686,26 @@ - - + + - - + + - + @@ -748,118 +749,78 @@ 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 + false true + true + x64-windows-static - + + + + - 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) + IMGUI_USER_CONFIG="..\src\imgui_additions\imconfig_anura.h";%(PreprocessorDefinitions) + IMGUI_DEFINE_MATH_OPERATORS;%(PreprocessorDefinitions) + NDEBUG;%(PreprocessorDefinitions) + NOMINMAX;%(PreprocessorDefinitions) + _USE_MATH_DEFINES;%(PreprocessorDefinitions) + ..\src;%(AdditionalIncludeDirectories) + ..\src\hex;%(AdditionalIncludeDirectories) + ..\src\kre;%(AdditionalIncludeDirectories) + ..\src\svg;%(AdditionalIncludeDirectories) + ..\src\tiled;%(AdditionalIncludeDirectories) + ..\src\xhtml;%(AdditionalIncludeDirectories) + ..\src\imgui;%(AdditionalIncludeDirectories) + ..\src\imgui_additions;%(AdditionalIncludeDirectories) + + Speed - stdc17 - true - stdcpp17 + MaxSpeed + MultiThreaded + NDEBUG;%(PreprocessorDefinitions) + + + Size + Disabled + MultiThreadedDebug + /bigobj %(AdditionalOptions) Windows - true + winmm.lib;%(AdditionalDependencies) + Setupapi.lib;%(AdditionalDependencies) + Msimg32.lib;%(AdditionalDependencies) + + + false true true - - - SDL2main.lib;%(AdditionalDependencies) + SDL2Main.lib;%(AdditionalDependencies) + + + true + false + false + SDL2Maind.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