diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml index a768ca4634d..35748d95a21 100644 --- a/.github/workflows/build-ci.yml +++ b/.github/workflows/build-ci.yml @@ -31,26 +31,6 @@ env: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - build-vs-solution: - runs-on: windows-2019 - - steps: - - uses: actions/checkout@v3 - with: - path: pioneer - - - name: Checkout pioneer-thirdparty - uses: actions/checkout@v3 - with: - repository: pioneerspacesim/pioneer-thirdparty - path: pioneer-thirdparty - - - name: Build VS Solution - shell: cmd - run: | - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - cd pioneer - msbuild win32\vs2019\pioneer.sln /property:Configuration=Release build-msvc: runs-on: windows-2019 @@ -117,29 +97,36 @@ jobs: sudo apt-fast update sudo apt-fast install -y ${{ env.packages }} + - name: Setup CMake + run: | + cp scripts/CMakeBuildPresetsCI.json CMakeUserPresets.json + cmake --preset linux-x64-release + - name: Build GCC - run: ./bootstrap cmake && make -C build + run: cmake --build ./build --target all - name: Build Pioneer Data - run: make -C build build-data + run: cmake --build ./build --target build-data - name: Run Tests run: ./build/unittest - name: Build Release - run: ./scripts/build-travis.sh + run: | + cmake --build ./build --target install + ./scripts/package-release.sh - name: Upload Artifact uses: actions/upload-artifact@v3 with: name: Linux-Artifacts - path: release/zip/*.tar.gz + path: release/pioneer-linux-x64-release-*.tar.gz - name: Upload Release Files uses: softprops/action-gh-release@v1 if: ${{ github.event_name == 'release' }} with: - files: release/zip/pioneer-*.tar.gz + files: release/pioneer-linux-x64-release-*.tar.gz env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -157,16 +144,17 @@ jobs: sudo apt-fast update sudo apt-fast install -y clang-8 ${{ env.packages }} - - name: Build Clang + - name: Setup CMake run: | + cp scripts/CMakeBuildPresetsCI.json CMakeUserPresets.json export CC=clang CXX=clang++ - ./bootstrap cmake && make -C build + cmake --preset linux-x64-release + + - name: Build Clang + run: cmake --build ./build --target all - name: Build Pioneer Data - run: make -C build build-data + run: cmake --build ./build --target build-data - name: Run Tests run: ./build/unittest - - - name: Build Release - run: ./scripts/build-travis.sh diff --git a/.gitignore b/.gitignore index 7951d0855a8..47844fe26ec 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,8 @@ codedoc/ nd/Data/ doxygen/html doxygen/latex +/release +/out .deps *.swp @@ -80,21 +82,22 @@ pioneer-*.tar.* # meta-build tooling products etc. shouldn't be tracked Makefile Makefile.in -/release Debug/ PreRelease/ Profile/ Release/ cmake-* +CMakeUserPresets.json compile # IDEs make their local configurations shouldn't be tracked -.vscode/ +.vscode/* .vs/ .project .cproject *.VC.db *.code-workspace +!pioneer-default.code-workspace .idea # Core dumps shouldn't be tracked by git. diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a2cee73e4f6..00000000000 --- a/.travis.yml +++ /dev/null @@ -1,59 +0,0 @@ -dist: xenial -language: minimal -compiler: gcc -os: linux -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - mesa-common-dev - - libfreeimage-dev - - libglew-dev - - libsigc++-2.0-dev - - libvorbis-dev - - libassimp-dev - - libsdl2-dev - - libsdl2-image-dev - homebrew: - packages: - - gcc - - freetype - - freeimage - - glew - - libsigc++@2 - - libvorbis - - libpng - - assimp - - sdl2 - - sdl2_image - - libogg - update: true - -matrix: - include: - - name: Build GCC - - - name: Build Clang - env: CC=clang CXX=clang++ - - - name: Build OSX - os: osx - -script: - - ./bootstrap cmake && make -C build - -before_deploy: - - env SDL_VIDEODRIVER=dummy ./build/modelcompiler -b inplace - - ./scripts/build-travis.sh - -deploy: - provider: releases - api_key: - secure: "Ajn9CykEp1CHKvIFmqYhP617A6cvZbsgHLw4VeDXeYob1aatUCAQXrjF9gUhbo4jwi2vtGFQyuK5TPHHHjSvk9EksW6c++qADqviAGvid6EAcG6AKuV76Nhx/IkCW0nUHk4ET2Zms3S2MON+rxUzihi4uCzuOlHUfG+5XntvL5Y=" - skip_cleanup: true - file_glob: true - file: release/zip/* - on: - repo: pioneerspacesim/pioneer - tags: true diff --git a/CI/appveyor/mingw/build.cmd b/CI/appveyor/mingw/build.cmd deleted file mode 100644 index b706eb156f8..00000000000 --- a/CI/appveyor/mingw/build.cmd +++ /dev/null @@ -1 +0,0 @@ -C:\msys64\usr\bin\bash -l /c/projects/pioneer/CI/appveyor/mingw/build.sh diff --git a/CI/appveyor/mingw/build.sh b/CI/appveyor/mingw/build.sh deleted file mode 100644 index 7f45625cbfd..00000000000 --- a/CI/appveyor/mingw/build.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/c/msys64/usr/bin/bash -l - -export PATH=/mingw64/bin:/c/Program\ Files\ \(x86\)/Inno\ Setup\ 5:$PATH - -# Exit immediately upon error -set -e - -# Echo the commands -set +v - -mkdir -p /c/projects/pioneer/build -cd /c/projects/pioneer/build - -cmake -G 'Unix Makefiles' \ - -DCMAKE_INSTALL_PREFIX="/c/Program Files/Pioneer" \ - -DPIONEER_DATA_DIR="/c/Program Files/Pioneer/data" \ - -DCMAKE_BUILD_TYPE:STRING=Release \ - -DGIT_EXECUTABLE=/c/Program\\ Files/Git/cmd/git.exe \ - -DPKG_CONFIG_EXECUTABLE=/mingw64/bin/pkg-config.exe \ - -DCMAKE_C_COMPILER=/mingw64/bin/x86_64-w64-mingw32-gcc.exe \ - -DCMAKE_CXX_COMPILER=/mingw64/bin/x86_64-w64-mingw32-g++.exe \ - -DUSE_SYSTEM_LIBGLEW=ON \ - -DUSE_SYSTEM_LIBLUA=OFF \ - /c/projects/pioneer - -cmake --build . --target install - -# Create the installer and upload artifact -ISCC pioneer.iss -appveyor PushArtifact ../pioneer-setup.exe diff --git a/CI/appveyor/mingw/prepare.sh b/CI/appveyor/mingw/prepare.sh deleted file mode 100644 index 200523ef364..00000000000 --- a/CI/appveyor/mingw/prepare.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/c/msys64/usr/bin/bash -l - -# Exit immediately upon error -set -e - -export PATH=/mingw64/bin:$PATH - -# Install dependencies -/c/msys64/usr/bin/pacman --noconfirm -Sy \ - mingw-w64-x86_64-SDL2 \ - mingw-w64-x86_64-SDL2_image \ - mingw-w64-x86_64-assimp \ - mingw-w64-x86_64-freetype \ - mingw-w64-x86_64-glew \ - mingw-w64-x86_64-libvorbis \ - mingw-w64-x86_64-libpng \ - mingw-w64-x86_64-libsigc++ diff --git a/CI/appveyor/msvc/build.cmd b/CI/appveyor/msvc/build.cmd deleted file mode 100644 index 804cecbeeb9..00000000000 --- a/CI/appveyor/msvc/build.cmd +++ /dev/null @@ -1,29 +0,0 @@ -@echo on -call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" - -mkdir c:\projects\pioneer\build || goto error -cd c:\projects\pioneer\build || goto error - -cmake -G Ninja^ - -DCMAKE_INSTALL_PREFIX="C:/Program Files/Pioneer"^ - -DPIONEER_DATA_DIR="C:/Program Files/Pioneer/data"^ - -DCMAKE_BUILD_TYPE:STRING=Release^ - -DCMAKE_INSTALL_MESSAGE=NEVER^ - -DGIT_EXECUTABLE="c:/Program Files/Git/cmd/git.exe"^ - c:\projects\pioneer || goto error - -cmake --build . || goto error -cd .. -modelcompiler.exe -b inplace || goto error -cd build -cmake --build . --target install || goto error -cmake --build . --target win-installer || goto error - -if %APPVEYOR_REPO_TAG%==true call publish.cmd - -goto success - -:error -exit 1 - -:success diff --git a/CI/appveyor/msvc/prepare.sh b/CI/appveyor/msvc/prepare.sh deleted file mode 100644 index 53c24a8dd13..00000000000 --- a/CI/appveyor/msvc/prepare.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/c/msys64/usr/bin/bash -l - -# Exit immediately upon error -set -e - -cd /c/projects -git clone --depth 1 git://github.com/pioneerspacesim/pioneer-thirdparty -cd /c/projects/pioneer - -# Get some languages for Inno Setup that aren't officially supported/updated in version 6 -curl -o "/c/Program Files (x86)/Inno Setup 6/Languages/Greek.isl" https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/Greek.isl -curl -o "/c/Program Files (x86)/Inno Setup 6/Languages/Hungarian.isl" https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/Hungarian.isl -curl -o "/c/Program Files (x86)/Inno Setup 6/Languages/ScottishGaelic.isl" https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/ScottishGaelic.isl -curl -o "/c/Program Files (x86)/Inno Setup 6/Languages/SerbianCyrillic.isl" https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/SerbianCyrillic.isl -curl -o "/c/Program Files (x86)/Inno Setup 6/Languages/SerbianLatin.isl" https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/SerbianLatin.isl diff --git a/CI/appveyor/msvc/publish.cmd.cmakein b/CI/appveyor/msvc/publish.cmd.cmakein deleted file mode 100644 index 4e5550cf14c..00000000000 --- a/CI/appveyor/msvc/publish.cmd.cmakein +++ /dev/null @@ -1 +0,0 @@ -appveyor PushArtifact ..\pioneer-@PROJECT_VERSION@-win.exe diff --git a/CMakeLists.txt b/CMakeLists.txt index 450b2575fdb..977bdd20f50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,17 +12,13 @@ if(POLICY CMP0072) endif() include(GNUInstallDirs) +include(cmake/InstallPioneer.cmake) if (MINGW) # Fix build errors on AppVeyor with MinGW due to a broken GLEW config script list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules) endif (MINGW) -# We don't want a 'bin' folder on Windows -if (WIN32) - set(CMAKE_INSTALL_BINDIR ${CMAKE_INSTALL_PREFIX}) -endif (WIN32) - # Put the output into the root dir so it can be run from Visual Studio if (MSVC) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}) @@ -107,13 +103,6 @@ endif() string(TIMESTAMP PROJECT_VERSION "%Y%m%d") -if (NOT PIONEER_DATA_DIR) - set(PIONEER_DATA_DIR ${CMAKE_INSTALL_FULL_DATADIR}/pioneer/data CACHE PATH - "Path where game data will be installed" FORCE) -endif (NOT PIONEER_DATA_DIR) - -file(TO_NATIVE_PATH ${PIONEER_DATA_DIR} _PIONEER_DATA_DIR) - if (MINGW) # Enable PRIxYY macros on MinGW add_definitions(-D__STDC_FORMAT_MACROS) @@ -415,23 +404,34 @@ else (MODELCOMPILER) endif(MODELCOMPILER) install(TARGETS ${PROJECT_NAME} editor modelcompiler savegamedump - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + RUNTIME DESTINATION ${PIONEER_INSTALL_BINDIR} ) install(DIRECTORY data/ - DESTINATION ${PIONEER_DATA_DIR} + DESTINATION ${PIONEER_INSTALL_DATADIR}/data REGEX "/models" EXCLUDE PATTERN ".gitignore" EXCLUDE PATTERN "listdata.*" EXCLUDE PATTERN "Makefile.am" EXCLUDE ) install(DIRECTORY data/models/ - DESTINATION ${PIONEER_DATA_DIR}/models + DESTINATION ${PIONEER_INSTALL_DATADIR}/data/models FILES_MATCHING PATTERN "*.sgm" PATTERN "*.dds" PATTERN "*.png" ) +list(APPEND install_txt + "AUTHORS.txt" + "Changelog.txt" + "Modelviewer.txt" + "Quickstart.txt" + "README.md") + +install(FILES ${install_txt} DESTINATION ${PIONEER_INSTALL_DATADIR}) + +install(DIRECTORY ${CMAKE_SOURCE_DIR}/licenses + DESTINATION ${PIONEER_INSTALL_DATADIR}) + if (WIN32) configure_file(pioneer.iss.cmakein pioneer.iss @ONLY) - configure_file(CI/appveyor/msvc/publish.cmd.cmakein publish.cmd @ONLY) file(GLOB win_libs ../pioneer-thirdparty/win32/bin/${MSVC_ARCH}/vs2019/*.dll) install(FILES ${win_libs} DESTINATION ${CMAKE_INSTALL_PREFIX}) if(NOT ISCC) @@ -440,7 +440,7 @@ if (WIN32) add_custom_target(win-installer COMMAND ${ISCC} /Q pioneer.iss) endif (WIN32) -if (UNIX) +if (UNIX AND NOT PIONEER_INSTALL_INPLACE) set(PIONEER_DESKTOP_FILE ${CMAKE_BINARY_DIR}/metadata/net.pioneerspacesim.Pioneer.desktop) configure_file(metadata/net.pioneerspacesim.Pioneer.desktop.cmakein ${PIONEER_DESKTOP_FILE} @ONLY) install(FILES ${PIONEER_DESKTOP_FILE} @@ -456,4 +456,4 @@ if (UNIX) RENAME net.pioneerspacesim.Pioneer.png ) endforeach() -endif (UNIX) +endif (UNIX AND NOT PIONEER_INSTALL_INPLACE) diff --git a/CMakePresets.json b/CMakePresets.json index 721d0e7b80b..dfc0fd93b81 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -1,54 +1,190 @@ { - "version": 2, - "configurePresets": [ - { - "name": "x64-Debug", - "displayName": "Windows x64 Debug", - "description": "Target Windows with the Visual Studio development environment.", - "generator": "Ninja", - "binaryDir": "${sourceDir}/out/build/${presetName}", - "architecture": { - "value": "x64", - "strategy": "external" - }, - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}" - }, - "vendor": { "microsoft.com/VisualStudioSettings/CMake/1.0": { "hostOS": [ "Windows" ] } } - }, - { - "name": "x64-Release", - "displayName": "Windows x64 Release", - "description": "Target Windows with the Visual Studio development environment.", - "generator": "Ninja", - "binaryDir": "${sourceDir}/out/build/${presetName}", - "architecture": { - "value": "x64", - "strategy": "external" - }, - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}" - }, - "vendor": { "microsoft.com/VisualStudioSettings/CMake/1.0": { "hostOS": [ "Windows" ] } } - }, - { - "name": "x64-Profiling", - "displayName": "Windows x64 Profiling", - "description": "Target Windows with the Visual Studio development environment.", - "generator": "Ninja", - "binaryDir": "${sourceDir}/out/build/${presetName}", - "architecture": { - "value": "x64", - "strategy": "external" - }, - "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}", - "PROFILER_ENABLED": "1" - }, - "vendor": { "microsoft.com/VisualStudioSettings/CMake/1.0": { "hostOS": [ "Windows" ] } } - } - ] + "version": 2, + "configurePresets": [ + { + "name": "x64-Debug", + "displayName": "Windows x64 Debug", + "description": "Target Windows with the Visual Studio development environment.", + "generator": "Ninja", + "binaryDir": "${sourceDir}/out/build/${presetName}", + "architecture": { + "value": "x64", + "strategy": "external" + }, + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}" + }, + "vendor": { + "microsoft.com/VisualStudioSettings/CMake/1.0": { + "hostOS": [ + "Windows" + ] + } + } + }, + { + "name": "x64-Release", + "displayName": "Windows x64 Release", + "description": "Target Windows with the Visual Studio development environment.", + "generator": "Ninja", + "binaryDir": "${sourceDir}/out/build/${presetName}", + "architecture": { + "value": "x64", + "strategy": "external" + }, + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release", + "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}" + }, + "vendor": { + "microsoft.com/VisualStudioSettings/CMake/1.0": { + "hostOS": [ + "Windows" + ] + } + } + }, + { + "name": "x64-Profiling", + "displayName": "Windows x64 Profiling", + "description": "Target Windows with the Visual Studio development environment.", + "generator": "Ninja", + "binaryDir": "${sourceDir}/out/build/${presetName}", + "architecture": { + "value": "x64", + "strategy": "external" + }, + "cacheVariables": { + "CMAKE_BUILD_TYPE": "RelWithDebInfo", + "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}", + "PROFILER_ENABLED": "1" + }, + "vendor": { + "microsoft.com/VisualStudioSettings/CMake/1.0": { + "hostOS": [ + "Windows" + ] + } + } + }, + { + "name": "x64-Linux-Debug", + "displayName": "Linux x64 Debug", + "description": "Use system compiler; Profiler=yes", + "binaryDir": "${sourceDir}/build/", + "generator": "Unix Makefiles", + "cacheVariables": { + "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}", + "CMAKE_BUILD_TYPE": "Debug", + "PROFILER_ENABLED": "1" + }, + "vendor": { + "microsoft.com/VisualStudioSettings/CMake/1.0": { + "hostOS": [ + "Linux" + ] + } + } + }, + { + "name": "x64-Linux-Profiler", + "displayName": "Linux x64 Profiling", + "description": "Use system compiler; Profiler=yes", + "binaryDir": "${sourceDir}/build/", + "generator": "Unix Makefiles", + "cacheVariables": { + "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}", + "CMAKE_BUILD_TYPE": "RelWithDebInfo", + "PROFILER_ENABLED": "1" + }, + "vendor": { + "microsoft.com/VisualStudioSettings/CMake/1.0": { + "hostOS": [ + "Linux" + ] + } + } + }, + { + "name": "x64-Linux-RelWithDebInfo", + "displayName": "Linux x64 Release", + "description": "Use system compiler; Profiler=no", + "binaryDir": "${sourceDir}/build/", + "generator": "Unix Makefiles", + "cacheVariables": { + "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}", + "CMAKE_BUILD_TYPE": "RelWithDebInfo" + }, + "vendor": { + "microsoft.com/VisualStudioSettings/CMake/1.0": { + "hostOS": [ + "Linux" + ] + } + } + }, + { + "name": "x64-Linux-Debug-Clang", + "displayName": "Linux x64 Debug (Clang)", + "description": "CC=clang CXX=clang++; Profiler=yes", + "binaryDir": "${sourceDir}/build/", + "generator": "Unix Makefiles", + "cacheVariables": { + "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}", + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_C_COMPILER": "/usr/bin/clang", + "CMAKE_CXX_COMPILER": "/usr/bin/clang++", + "PROFILER_ENABLED": "1" + }, + "vendor": { + "microsoft.com/VisualStudioSettings/CMake/1.0": { + "hostOS": [ + "Linux" + ] + } + } + }, + { + "name": "x64-Linux-Profiler-Clang", + "displayName": "Linux x64 Profiling (Clang)", + "description": "CC=clang CXX=clang++; Profiler=yes", + "binaryDir": "${sourceDir}/build/", + "generator": "Unix Makefiles", + "cacheVariables": { + "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}", + "CMAKE_BUILD_TYPE": "RelWithDebInfo", + "CMAKE_C_COMPILER": "/usr/bin/clang", + "CMAKE_CXX_COMPILER": "/usr/bin/clang++", + "PROFILER_ENABLED": "1" + }, + "vendor": { + "microsoft.com/VisualStudioSettings/CMake/1.0": { + "hostOS": [ + "Linux" + ] + } + } + }, + { + "name": "x64-Linux-RelWithDebInfo-Clang", + "displayName": "Linux x64 Release (Clang)", + "description": "CC=clang CXX=clang++; Profiler=no", + "binaryDir": "${sourceDir}/build/", + "generator": "Unix Makefiles", + "cacheVariables": { + "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}", + "CMAKE_BUILD_TYPE": "RelWithDebInfo", + "CMAKE_C_COMPILER": "/usr/bin/clang", + "CMAKE_CXX_COMPILER": "/usr/bin/clang++" + }, + "vendor": { + "microsoft.com/VisualStudioSettings/CMake/1.0": { + "hostOS": [ + "Linux" + ] + } + } + } + ] } diff --git a/COMPILING.txt b/COMPILING.txt index 5737f33780e..bc3960d70d4 100644 --- a/COMPILING.txt +++ b/COMPILING.txt @@ -2,6 +2,7 @@ Table of Contents ================= 1 How to compile Pioneer 1.1 Linux - CMake + 1.1a Linux - VSCode + CMake 1.2 Windows - MSVC 1.3 Windows - CMake and MSYS2 (and MinGW-w64) 1.4 Windows - CMake and MSVC @@ -73,6 +74,40 @@ questions are welcome anytime. 4. Run `./pioneer` to start the game! +1.1a Linux - VSCode + CMake +--------- + +1. Install the required libraries as for '1.1 Linux - CMake'. + + You'll want to install several VSCode extensions for best results: + + CMake Tools (ms-vscode.cmake-tools) + C/C++ (ms-vscode.cpptools) + clangd (llvm-vs-code-extensions.vscode-clangd) + Code LLDB (vadimcn.vscode-lldb) + Lua (sumneko.lua) + Git Graph (mhutchie.git-graph) + + Of these extensions, only CMake Tools is required to compile the game from + within VSCode. All other extensions help to improve the development process + if you intend on making changes to the game's files. + +2. Copy ./pioneer-default.code-workspace to ./pioneer.code-workspace and + open it. This provides a quick-start workspace setup with useful workflow + defaults pre-configured. This file is ignored by Git and you can configure + the workspace to your liking from there. + +3. From the bottom bar, select a configure preset for your platform. 'Release' + is recommended unless you're in the process of debugging a specific issue. + This will generate CMake files in the 'build/' folder. + +4. Click the build button on the bottom toolbar, or execute the Run Build Task + command from the command pallette (Ctrl+Shift+P), selecting 'Build Pioneer'. + If all goes well, Pioneer should successfully compile. + +5. Click the triangle ("launch") button in the bottom toolbar and select + 'pioneer' as the active launch target. + 1.2 Windows - MSVC ------------------ diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 96c0d496c86..00000000000 --- a/appveyor.yml +++ /dev/null @@ -1,28 +0,0 @@ -clone_depth: 1 -image: Visual Studio 2019 - -environment: - matrix: - - TARGET: msvc - # mingw currently causes unnecessary compilation errors due to appveyor-internal problems - # - TARGET: mingw - -install: - - IF "%TARGET%"=="mingw" (choco install InnoSetup) - - C:\msys64\usr\bin\bash -l /c/projects/pioneer/CI/appveyor/%TARGET%/prepare.sh - -build_script: - # - C:\msys64\usr\bin\bash -l /c/projects/pioneer/CI/appveyor/%TARGET%/build.sh - - C:\projects\pioneer\CI\appveyor\%TARGET%\build.cmd - -# Create a draft release with the installer on new tags in master -deploy: - release: Pioneer $(APPVEYOR_REPO_TAG_NAME) - description: 'New Pioneer release' - provider: GitHub - auth_token: - secure: smikwozIgIcE3OfE/LMdzXnJY6CyX3i1k34OkPLk3/MF0mBeHyX4uQNbbb9Ucaip - artifact: /.*\.exe - draft: true - on: - APPVEYOR_REPO_TAG: true diff --git a/buildopts.h.cmakein b/buildopts.h.cmakein index 850b26f65b5..1a8eef2c49c 100644 --- a/buildopts.h.cmakein +++ b/buildopts.h.cmakein @@ -3,7 +3,7 @@ #define PIONEER_EXTRAVERSION "@PROJECT_VERSION_GIT@" #define PIONEER_VERSION "@PROJECT_VERSION@" -#define PIONEER_DATA_DIR "@_PIONEER_DATA_DIR@" +#define PIONEER_DATA_DIR "@PIONEER_DATA_RUNTIME_DIR@" #define REMOTE_LUA_REPL_PORT @REMOTE_LUA_REPL_PORT@ #cmakedefine01 WITH_OBJECTVIEWER diff --git a/cmake/InstallPioneer.cmake b/cmake/InstallPioneer.cmake new file mode 100644 index 00000000000..2722239a6c5 --- /dev/null +++ b/cmake/InstallPioneer.cmake @@ -0,0 +1,34 @@ +# Setup script for Pioneer installation paths + +option(PIONEER_INSTALL_INPLACE "Should an in-place install be generated" OFF) + +if (NOT PIONEER_INSTALL_DATADIR) + set(PIONEER_INSTALL_DATADIR ${CMAKE_INSTALL_DATADIR}/pioneer CACHE PATH + "Path where pioneer's data/ folder will be installed" FORCE) +endif (NOT PIONEER_INSTALL_DATADIR) + +if (NOT PIONEER_INSTALL_BINDIR) + set(PIONEER_INSTALL_BINDIR ${CMAKE_INSTALL_BINDIR} CACHE PATH + "Path where Pioneer's executables will be installed" FORCE) +endif (NOT PIONEER_INSTALL_BINDIR) + +# We don't want a 'bin' folder on Windows +if (WIN32) + set(CMAKE_INSTALL_BINDIR ${CMAKE_INSTALL_PREFIX}) +endif (WIN32) + +# If doing an in-place installation, everything is installed in the root of the prefix +if (PIONEER_INSTALL_INPLACE) + set(PIONEER_INSTALL_BINDIR ${CMAKE_INSTALL_PREFIX}) + set(PIONEER_INSTALL_DATADIR ${CMAKE_INSTALL_PREFIX}) + # don't load data from system-wide install + set(PIONEER_DATA_DIR "data") +endif (PIONEER_INSTALL_INPLACE) + +# Expected location of game data +if (NOT PIONEER_DATA_DIR) + set(PIONEER_DATA_DIR ${CMAKE_INSTALL_FULL_DATADIR}/pioneer/data CACHE PATH + "Runtime path to load game data from" FORCE) +endif (NOT PIONEER_DATA_DIR) + +file(TO_NATIVE_PATH ${PIONEER_DATA_DIR} PIONEER_DATA_RUNTIME_DIR) diff --git a/pioneer-default.code-workspace b/pioneer-default.code-workspace new file mode 100644 index 00000000000..3e4f44dcb20 --- /dev/null +++ b/pioneer-default.code-workspace @@ -0,0 +1,119 @@ +{ + "folders": [ + { + "path": "." + } + ], + "settings": { + "editor.insertSpaces": false, + "editor.detectIndentation": false, + "editor.tabSize": 4, + "files.exclude": {}, + "files.trimFinalNewlines": true, + "files.trimTrailingWhitespace": true, + "files.insertFinalNewline": true, + "Lua.diagnostics.disable": [ + "empty-block" + ], + "Lua.runtime.path": [ + "?.lua", + "?/init.lua", + "data/libs/?.lua", + "data/libs/?/init.lua", + "data/?.lua", + "data/?/init.lua" + ], + "Lua.runtime.plugin": "", + "Lua.workspace.library": [ + "data/meta" + ], + "Lua.runtime.special": { + "package.reimport": "require" + }, + "Lua.runtime.version": "Lua 5.2", + "Lua.diagnostics.globals": [ + "f", + "fixed", + "v", + "CustomSystem", + "CustomSystemBody", + "Faction", + "Color", + ], + "Lua.workspace.checkThirdParty": false, + "cmake.configureOnOpen": true, + "cmake.buildTask": false, + "cmake.debugConfig": { + "cwd": "${workspaceFolder}" + }, + "cmake.buildDirectory": "${workspaceFolder}/build", + "cmake.exportCompileCommandsFile": true + }, + "tasks": { + "version": "2.0.0", + "tasks": [ + { + "type": "cmake", + "label": "Build Pioneer", + "command": "build", + "targets": [ + "all" + ], + "preset": "${command:cmake.activeBuildPresetName}", + "group": { + "kind": "build", + "isDefault": true + }, + "problemMatcher": [], + "detail": "Build Pioneer with current CMake settings" + }, + { + "type": "cmake", + "label": "Build Data", + "command": "build", + "targets": [ + "build-data" + ], + "preset": "${command:cmake.activeBuildPresetName}", + "problemMatcher": [], + "detail": "Build SGM model cache" + }, + { + "label": "Run Unit Tests", + "type": "process", + "command": "${command:cmake.buildDirectory}/unittest", + "group": { + "kind": "test", + "isDefault": true + }, + "dependsOn": [ + "Build Pioneer" + ], + "problemMatcher": [] + }, + ] + }, + "launch": { + "version": "0.2.0", + "configurations": [ + { + "name": "Debug", + "type": "cppdbg", + "request": "launch", + "program": "${command:cmake.buildDirectory}/pioneer", + "args": [], + "environment": [], + "cwd": "${workspaceRoot}", + }, + { + "name": "Debug (Model Editor)", + "type": "cppdbg", + "request": "launch", + "program": "${command:cmake.buildDirectory}/editor", + "args": [ "--mv" ], + "environment": [], + "cwd": "${workspaceRoot}", + }, + ] + } +} diff --git a/scripts/CMakeBuildPresetsCI.json b/scripts/CMakeBuildPresetsCI.json new file mode 100644 index 00000000000..48a7e9b6741 --- /dev/null +++ b/scripts/CMakeBuildPresetsCI.json @@ -0,0 +1,42 @@ +{ + "version": 2, + "configurePresets": [ + { + "name": "linux-x64-release", + "displayName": "Linux x64 Release", + "description": "in-place installation target; Opt=yes; Profiler=no", + "binaryDir": "${sourceDir}/build/", + "generator": "Unix Makefiles", + "cacheVariables": { + "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}", + "PIONEER_INSTALL_INPLACE": "1", + "CMAKE_BUILD_TYPE": "RelWithDebInfo" + }, + "vendor": { + "microsoft.com/VisualStudioSettings/CMake/1.0": { + "hostOS": [ + "Linux" + ] + } + } + }, + { + "name": "linux-x64-release-global", + "displayName": "Linux x64 Release", + "description": "global installation target; Opt=yes; Profiler=no", + "binaryDir": "${sourceDir}/build/", + "generator": "Unix Makefiles", + "cacheVariables": { + "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}", + "CMAKE_BUILD_TYPE": "RelWithDebInfo" + }, + "vendor": { + "microsoft.com/VisualStudioSettings/CMake/1.0": { + "hostOS": [ + "Linux" + ] + } + } + } + ] +} diff --git a/scripts/build-travis.sh b/scripts/build-release.sh similarity index 96% rename from scripts/build-travis.sh rename to scripts/build-release.sh index 963aacb723b..d67a80e3368 100755 --- a/scripts/build-travis.sh +++ b/scripts/build-release.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Package a build and prepare it for upload via Travis. +# Package a build and prepare it for upload to Github. BINARIES=("build/pioneer" "build/modelcompiler" "build/savegamedump" "build/editor") COPY_DIR=release diff --git a/scripts/package-release.sh b/scripts/package-release.sh new file mode 100755 index 00000000000..cbb0a952ce7 --- /dev/null +++ b/scripts/package-release.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +# Package a build and prepare it for upload to Github. + +TAG_NAME=$(git describe HEAD) +if [ -z "$TAG_NAME" ]; then + TAG_NAME=$(date +%Y%m%d) +fi + +mkdir release + +mv out/install/linux-x64-release "release/pioneer-linux-x64-$TAG_NAME" +cd release + +tar -czf "pioneer-linux-x64-$TAG_NAME.tar.gz" "pioneer-linux-x64-$TAG_NAME" + +if [ $? -ne 0 ]; then + echo "Release failed!" + exit 1 +fi + +echo "Release finished successfully!" + +exit 0 diff --git a/src/core/StringUtils.h b/src/core/StringUtils.h index 8fa9e53ac58..90ee6c7dfe0 100644 --- a/src/core/StringUtils.h +++ b/src/core/StringUtils.h @@ -128,7 +128,7 @@ struct SplitString { using reference = std::string_view; // "end" iterator - iter() : m_str(), m_parent(nullptr) {}; + iter() : m_parent(nullptr), m_str() {}; // "live" iterator iter(SplitString *parent) : m_parent(parent), diff --git a/src/pigui/PerfInfo.cpp b/src/pigui/PerfInfo.cpp index b0c63b11f80..c8ab2da3407 100644 --- a/src/pigui/PerfInfo.cpp +++ b/src/pigui/PerfInfo.cpp @@ -114,6 +114,7 @@ PerfInfo::CounterInfo &PerfInfo::GetCounter(CounterType ct) case COUNTER_FPS: return m_fpsCounter; case COUNTER_PHYS: return m_physCounter; case COUNTER_PIGUI: return m_piguiCounter; + default: assert(0); } } diff --git a/src/pigui/PiGui.cpp b/src/pigui/PiGui.cpp index 40f7aea93a6..84963e5084c 100644 --- a/src/pigui/PiGui.cpp +++ b/src/pigui/PiGui.cpp @@ -584,7 +584,7 @@ void Instance::BakeFont(PiFont &font) // Set the ImGui font name for debugging purposes std::string name = fmt::format("{}:{}", font.name(), font.pixelsize()); - strncpy(config.Name, name.c_str(), 40); + strncpy(config.Name, name.c_str(), 39); // The main face of the font should go first in the list, because: // diff --git a/src/win32/buildopts.h b/src/win32/buildopts.h deleted file mode 100644 index 21a134d7126..00000000000 --- a/src/win32/buildopts.h +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright © 2008-2023 Pioneer Developers. See AUTHORS.txt for details -// Licensed under the terms of the GPL v3. See licenses/GPL-3.txt - -#if defined(_MSC_VER) - -#ifndef _BUILDOPTS_H -#define _BUILDOPTS_H - -// game version. usually defined by configure -#ifndef PIONEER_VERSION -#define PIONEER_VERSION "unknown" -#endif -#ifndef PIONEER_EXTRAVERSION -#define PIONEER_EXTRAVERSION "" -#endif - -// define to include the object viewer in the build -#ifndef WITH_OBJECTVIEWER -#define WITH_OBJECTVIEWER 1 -#endif - -// define to include various extra keybindings for dev functions -#ifndef WITH_DEVKEYS -#define WITH_DEVKEYS 1 -#endif - -#endif -#endif diff --git a/win32/vs2019/Debug.props b/win32/vs2019/Debug.props deleted file mode 100644 index 7874103db6e..00000000000 --- a/win32/vs2019/Debug.props +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - true - - - - Level3 - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - - - - - - true - - - - \ No newline at end of file diff --git a/win32/vs2019/PreRelease.props b/win32/vs2019/PreRelease.props deleted file mode 100644 index 7c1ec8e593b..00000000000 --- a/win32/vs2019/PreRelease.props +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - true - - - - ProgramDatabase - - - - - Level3 - MaxSpeed - - - Speed - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - Fast - StreamingSIMDExtensions2 - Default - - - true - - - - \ No newline at end of file diff --git a/win32/vs2019/Release.props b/win32/vs2019/Release.props deleted file mode 100644 index 2e05285e9ac..00000000000 --- a/win32/vs2019/Release.props +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - false - - - - - true - true - true - - - Level3 - true - Speed - WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions) - false - Fast - StreamingSIMDExtensions2 - true - - - - \ No newline at end of file diff --git a/win32/vs2019/collider/collider.vcxproj b/win32/vs2019/collider/collider.vcxproj deleted file mode 100644 index b78f2a2c8c5..00000000000 --- a/win32/vs2019/collider/collider.vcxproj +++ /dev/null @@ -1,171 +0,0 @@ - - - - - Debug - x64 - - - PreRelease - x64 - - - Profile - x64 - - - Release - x64 - - - - {A2082451-1B70-47C1-88E1-62A59EB13A44} - collider - 10.0 - - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - false - false - Unicode - v142 - - - StaticLibrary - false - false - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - ../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../../src/win32 - -Zm137 %(AdditionalOptions) - _ITERATOR_DEBUG_LEVEL=0;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - stdcpp17 - - - profiler.lib;%(AdditionalDependencies) - $(SolutionDir)$(Configuration);$(SolutionDir)\$(Platform)\$(Configuration); - - - - - - true - true - true - - - - ../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../../src/win32 - NotUsing - - - NotSet - _ITERATOR_DEBUG_LEVEL=0;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions) - stdcpp17 - - - profiler.lib;%(AdditionalDependencies) - $(SolutionDir)$(Configuration);$(SolutionDir)\$(Platform)\$(Configuration); - - - - - - true - true - true - - - - ../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../../src/win32 - _ITERATOR_DEBUG_LEVEL=0;PIONEER_PROFILER;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions) - NotSet - stdcpp17 - - - profiler.lib;%(AdditionalDependencies) - $(SolutionDir)$(Configuration);$(SolutionDir)\$(Platform)\$(Configuration); - - - - - - true - true - true - - - ../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../../src/win32 - NotSet - _ITERATOR_DEBUG_LEVEL=0;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - stdcpp17 - - - profiler.lib;%(AdditionalDependencies) - $(SolutionDir)$(Configuration);$(SolutionDir)\$(Platform)\$(Configuration); - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/win32/vs2019/collider/collider.vcxproj.filters b/win32/vs2019/collider/collider.vcxproj.filters deleted file mode 100644 index bedd7b97962..00000000000 --- a/win32/vs2019/collider/collider.vcxproj.filters +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/win32/vs2019/common.props b/win32/vs2019/common.props deleted file mode 100644 index 044808e53a5..00000000000 --- a/win32/vs2019/common.props +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - ../../../src;../../src;../../win32/include;../../include;../../../contrib;../../contrib - _USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4305 - - - - \ No newline at end of file diff --git a/win32/vs2019/fmt/fmt.vcxproj b/win32/vs2019/fmt/fmt.vcxproj deleted file mode 100644 index d42613d1b32..00000000000 --- a/win32/vs2019/fmt/fmt.vcxproj +++ /dev/null @@ -1,179 +0,0 @@ - - - - - PreRelease - x64 - - - Profile - x64 - - - Debug - x64 - - - Release - x64 - - - - 16.0 - Win32Proj - {f1547ba3-05cb-4166-93c8-9f161e1c75eb} - fmt - 10.0 - - - - StaticLibrary - true - v142 - Unicode - - - StaticLibrary - true - v142 - Unicode - - - StaticLibrary - false - v142 - true - Unicode - - - StaticLibrary - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - Level3 - true - _ITERATOR_DEBUG_LEVEL=0;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - ../../../contrib/fmt/include;%(AdditionalIncludeDirectories) - stdcpp17 - - - Console - true - - - false - - - - - Level3 - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - ../../../contrib/fmt/include;%(AdditionalIncludeDirectories) - ProgramDatabase - false - MaxSpeed - true - Default - MultiThreadedDLL - true - stdcpp17 - - - Console - true - - - false - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - ../../../contrib/fmt/include;%(AdditionalIncludeDirectories) - false - stdcpp17 - - - Console - true - true - true - - - false - - - - - Level3 - - - true - true - _ITERATOR_DEBUG_LEVEL=0;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - ../../../contrib/fmt/include;%(AdditionalIncludeDirectories) - false - MultiThreadedDebugDLL - stdcpp17 - - - Console - true - true - true - - - false - - - - - - - - - - \ No newline at end of file diff --git a/win32/vs2019/fmt/fmt.vcxproj.filters b/win32/vs2019/fmt/fmt.vcxproj.filters deleted file mode 100644 index 33142b9f94c..00000000000 --- a/win32/vs2019/fmt/fmt.vcxproj.filters +++ /dev/null @@ -1,25 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;c++;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;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 - - - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/win32/vs2019/galaxy/galaxy.vcxproj b/win32/vs2019/galaxy/galaxy.vcxproj deleted file mode 100644 index 526c5acb79f..00000000000 --- a/win32/vs2019/galaxy/galaxy.vcxproj +++ /dev/null @@ -1,169 +0,0 @@ - - - - - Debug - x64 - - - PreRelease - x64 - - - Profile - x64 - - - Release - x64 - - - - {82973C2C-FC40-4320-84AE-A47E36868C02} - galaxy - 10.0 - - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - false - false - Unicode - v142 - - - StaticLibrary - false - false - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - ../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../../contrib/lua - -Zm137 %(AdditionalOptions) - _ITERATOR_DEBUG_LEVEL=0;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - stdcpp17 - - - - - - true - true - true - - - - ../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../../contrib/lua - NotUsing - NotSet - _ITERATOR_DEBUG_LEVEL=0;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions) - stdcpp17 - - - - - - true - true - true - - - - ../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../../contrib/lua - _ITERATOR_DEBUG_LEVEL=0;PIONEER_PROFILER;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions) - NotSet - stdcpp17 - - - - - - true - true - true - - - ../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../../contrib/lua - NotSet - _ITERATOR_DEBUG_LEVEL=0;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - stdcpp17 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/win32/vs2019/galaxy/galaxy.vcxproj.filters b/win32/vs2019/galaxy/galaxy.vcxproj.filters deleted file mode 100644 index 189074eca6b..00000000000 --- a/win32/vs2019/galaxy/galaxy.vcxproj.filters +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/win32/vs2019/glew/glew.vcxproj b/win32/vs2019/glew/glew.vcxproj deleted file mode 100644 index 05d420021da..00000000000 --- a/win32/vs2019/glew/glew.vcxproj +++ /dev/null @@ -1,133 +0,0 @@ - - - - - Debug - x64 - - - PreRelease - x64 - - - Profile - x64 - - - Release - x64 - - - - - - - {03ACDDF1-56D2-49FF-8762-000EA6CB2C2F} - glew - 10.0 - - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - false - false - Unicode - v142 - - - StaticLibrary - false - false - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - - - - - - - - - - - - - - - - - - - - - - - Level2 - ../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../../contrib/glew/GL - _ITERATOR_DEBUG_LEVEL=0;GLEW_NO_GLU;GLEW_STATIC;_UNICODE;UNICODE;%(PreprocessorDefinitions) - stdcpp17 - - - true - - - - - Level2 - ../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../../contrib/glew/GL - _ITERATOR_DEBUG_LEVEL=0;GLEW_NO_GLU;GLEW_STATIC;_UNICODE;UNICODE;%(PreprocessorDefinitions) - stdcpp17 - - - true - true - true - - - - - Level2 - ../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../../contrib/glew/GL - _ITERATOR_DEBUG_LEVEL=0;GLEW_NO_GLU;GLEW_STATIC;_UNICODE;UNICODE;%(PreprocessorDefinitions) - stdcpp17 - - - true - true - true - - - - - Level2 - ../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../../contrib/glew/GL - NotUsing - - - MultiThreadedDLL - _ITERATOR_DEBUG_LEVEL=0;GLEW_NO_GLU;GLEW_STATIC;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - NotSet - stdcpp17 - - - true - true - true - - - - - - \ No newline at end of file diff --git a/win32/vs2019/glew/glew.vcxproj.filters b/win32/vs2019/glew/glew.vcxproj.filters deleted file mode 100644 index 1d3428b00bc..00000000000 --- a/win32/vs2019/glew/glew.vcxproj.filters +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/win32/vs2019/graphics/graphics.vcxproj b/win32/vs2019/graphics/graphics.vcxproj deleted file mode 100644 index 7839928fb3d..00000000000 --- a/win32/vs2019/graphics/graphics.vcxproj +++ /dev/null @@ -1,202 +0,0 @@ - - - - - Debug - x64 - - - PreRelease - x64 - - - Profile - x64 - - - Release - x64 - - - - {DED0A0AD-E7B8-42EF-83DB-EDAE7E2443EE} - graphics - 10.0 - - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - false - false - Unicode - v142 - - - StaticLibrary - false - false - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - ../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../../contrib/lua - _ITERATOR_DEBUG_LEVEL=0;GLEW_STATIC;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - -Zm137 %(AdditionalOptions) - stdcpp17 - - - - - - true - true - true - - - - ../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../../contrib/lua - _ITERATOR_DEBUG_LEVEL=0;GLEW_STATIC;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions) - NotUsing - NotSet - stdcpp17 - - - - - - true - true - true - - - - ../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../../contrib/lua - _ITERATOR_DEBUG_LEVEL=0;PIONEER_PROFILER;GLEW_STATIC;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions) - NotSet - stdcpp17 - - - - - - true - true - true - - - ../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../../contrib/lua - _ITERATOR_DEBUG_LEVEL=0;GLEW_STATIC;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - NotSet - stdcpp17 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/win32/vs2019/graphics/graphics.vcxproj.filters b/win32/vs2019/graphics/graphics.vcxproj.filters deleted file mode 100644 index 774cb90b50d..00000000000 --- a/win32/vs2019/graphics/graphics.vcxproj.filters +++ /dev/null @@ -1,144 +0,0 @@ - - - - - - - - - - - - win32 - - - - opengl - - - opengl - - - - opengl - - - opengl - - - opengl - - - opengl - - - opengl - - - dummy - - - - opengl - - - opengl - - - opengl - - - opengl - - - - - - - - - - - - - - - opengl - - - opengl - - - - - - opengl - - - opengl - - - opengl - - - opengl - - - opengl - - - opengl - - - dummy - - - dummy - - - dummy - - - dummy - - - dummy - - - dummy - - - - opengl - - - - opengl - - - opengl - - - opengl - - - opengl - - - - opengl - - - - - - {55c9590f-ea3e-46bd-9c15-b8304c3fbd2e} - - - {d326765b-28c9-46c3-bde7-60dcfd3a059f} - - - {613c7313-f10f-43ec-92f0-5f0c66d0cfc6} - - - \ No newline at end of file diff --git a/win32/vs2019/jenkins/jenkins.vcxproj b/win32/vs2019/jenkins/jenkins.vcxproj deleted file mode 100644 index 263b4738d98..00000000000 --- a/win32/vs2019/jenkins/jenkins.vcxproj +++ /dev/null @@ -1,137 +0,0 @@ - - - - - Debug - x64 - - - PreRelease - x64 - - - Profile - x64 - - - Release - x64 - - - - {38C0279B-EB3E-4113-8E3E-29AFC31C3C20} - jenkins - 10.0 - - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - false - false - Unicode - v142 - - - StaticLibrary - false - false - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - - - - - - - - - - - - - - - - - - - - - - - Level2 - ../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib - -Zm137 %(AdditionalOptions) - _ITERATOR_DEBUG_LEVEL=0;_UNICODE;UNICODE;%(PreprocessorDefinitions) - stdcpp17 - - - true - - - - - Level2 - ../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib - _ITERATOR_DEBUG_LEVEL=0;_UNICODE;UNICODE;%(PreprocessorDefinitions) - stdcpp17 - - - true - true - true - - - - - Level2 - ../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib - _ITERATOR_DEBUG_LEVEL=0;PIONEER_PROFILER;_UNICODE;UNICODE;%(PreprocessorDefinitions) - stdcpp17 - - - true - true - true - - - - - Level2 - ../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib - NotUsing - - - MultiThreadedDLL - NotSet - _ITERATOR_DEBUG_LEVEL=0;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - stdcpp17 - - - true - true - true - - - - - - - - - - - - \ No newline at end of file diff --git a/win32/vs2019/jenkins/jenkins.vcxproj.filters b/win32/vs2019/jenkins/jenkins.vcxproj.filters deleted file mode 100644 index 8ebdc923ae2..00000000000 --- a/win32/vs2019/jenkins/jenkins.vcxproj.filters +++ /dev/null @@ -1,18 +0,0 @@ - - - - - {f58bf6f3-812a-44e0-9170-c127cf2f1f90} - - - - - src - - - - - src - - - \ No newline at end of file diff --git a/win32/vs2019/lua.vcxproj b/win32/vs2019/lua.vcxproj deleted file mode 100644 index afafe6dede0..00000000000 --- a/win32/vs2019/lua.vcxproj +++ /dev/null @@ -1,225 +0,0 @@ - - - - - Debug - x64 - - - PreRelease - x64 - - - Profile - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {5085B12D-F9AC-4878-9672-1FD4EB0EFB67} - Win32Proj - lua - 10.0 - - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - false - false - Unicode - v142 - - - StaticLibrary - false - false - Unicode - v142 - - - - - - - - - - - - - - - - - - - - - - - - - - - $(Configuration)\$(ProjectName)\ - - - $(Configuration)\$(ProjectName)\ - - - $(Configuration)\$(ProjectName)\ - - - $(Configuration)\$(ProjectName)\ - - - - - - ../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib - - - _ITERATOR_DEBUG_LEVEL=0;_LIB;%(PreprocessorDefinitions) - 4146 - -Zm137 %(AdditionalOptions) - stdcpp17 - - - Windows - true - - - - - - - ../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib - - - 4146 - NotSet - _ITERATOR_DEBUG_LEVEL=0;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - stdcpp17 - - - Windows - true - - - - - NotUsing - ../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib - _ITERATOR_DEBUG_LEVEL=0;_LIB;%(PreprocessorDefinitions) - - - 4146 - NotSet - stdcpp17 - - - Windows - true - true - true - - - - - - - ../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib - _ITERATOR_DEBUG_LEVEL=0;PIONEER_PROFILER;_LIB;%(PreprocessorDefinitions) - - - 4146 - NotSet - stdcpp17 - - - Windows - true - true - true - - - - - - \ No newline at end of file diff --git a/win32/vs2019/lua.vcxproj.filters b/win32/vs2019/lua.vcxproj.filters deleted file mode 100644 index b9b101b099e..00000000000 --- a/win32/vs2019/lua.vcxproj.filters +++ /dev/null @@ -1,183 +0,0 @@ - - - - - {f7508fa4-ff23-48f9-a74c-e0ce2a8a8580} - - - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - \ No newline at end of file diff --git a/win32/vs2019/modelcompiler.vcxproj b/win32/vs2019/modelcompiler.vcxproj deleted file mode 100644 index 621aec389cf..00000000000 --- a/win32/vs2019/modelcompiler.vcxproj +++ /dev/null @@ -1,255 +0,0 @@ - - - - - Debug - x64 - - - PreRelease - x64 - - - Profile - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {8006A44D-1877-42EE-99A6-214E8B328AEE} - Win32Proj - modelcompiler - 10.0 - - - - Application - true - v142 - Unicode - - - Application - true - v142 - Unicode - - - Application - false - v142 - false - Unicode - - - Application - false - v142 - false - Unicode - - - - - - - - - - - - - - - - - - - $(ProjectName)-debug - true - $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)..\..\ - - - $(ProjectName)-prerelease - true - $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)..\..\ - - - false - $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)..\..\ - - - $(ProjectName)-profile - false - $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)..\..\ - - - - - - Level3 - Disabled - _ITERATOR_DEBUG_LEVEL=0;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - ../../contrib/fmt/include;../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../contrib/lua;../../src/win32 - ProgramDatabase - -Zm137 %(AdditionalOptions) - stdcpp17 - - - Console - true - ../../win32/lib;../../../pioneer-thirdparty/win32/lib/x64/vs2019;$(SolutionDir)\$(Platform)\$(Configuration) - fmt.lib;assimp-vc142-mt.lib;lua.lib;jenkins.lib;shlwapi.lib;ogg.lib;vorbis.lib;vorbisfile.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype.lib;sigc-vc140-d-2_0.lib;text.lib;galaxy.lib;collider.lib;graphics.lib;terrain.lib;scenegraph.lib;%(AdditionalDependencies) - - - - - - - Level3 - Disabled - _ITERATOR_DEBUG_LEVEL=0;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - ../../contrib/fmt/include;../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../contrib/lua;../../src/win32 - AnySuitable - true - Speed - true - ProgramDatabase - stdcpp17 - - - Console - true - ../../win32/lib;../../../pioneer-thirdparty/win32/lib/x64/vs2019;$(SolutionDir)\$(Platform)\$(Configuration) - fmt.lib;assimp-vc142-mt.lib;lua.lib;jenkins.lib;shlwapi.lib;ogg.lib;vorbis.lib;vorbisfile.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype.lib;sigc-vc140-d-2_0.lib;text.lib;galaxy.lib;collider.lib;graphics.lib;terrain.lib;scenegraph.lib;%(AdditionalDependencies) - true - true - - - - - Level3 - NotUsing - MaxSpeed - true - true - _ITERATOR_DEBUG_LEVEL=0;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - ../../contrib/fmt/include;../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../contrib/lua;../../src/win32 - AnySuitable - Speed - true - stdcpp17 - - - Console - true - true - true - ../../win32/lib;../../../pioneer-thirdparty/win32/lib/x64/vs2019;$(SolutionDir)\$(Platform)\$(Configuration) - fmt.lib;assimp-vc142-mt.lib;lua.lib;jenkins.lib;shlwapi.lib;ogg.lib;vorbis.lib;vorbisfile.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype.lib;sigc-vc140-2_0.lib;text.lib;galaxy.lib;collider.lib;graphics.lib;terrain.lib;scenegraph.lib;%(AdditionalDependencies) - - - - - Level3 - - - MaxSpeed - true - true - _ITERATOR_DEBUG_LEVEL=0;_CRT_SECURE_NO_WARNINGS;PIONEER_PROFILER;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - ../../contrib/fmt/include;../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../contrib/lua;../../src/win32 - AnySuitable - Speed - true - stdcpp17 - - - Console - true - true - true - ../../win32/lib;../../../pioneer-thirdparty/win32/lib/x64/vs2019;$(SolutionDir)\$(Platform)\$(Configuration) - fmt.lib;assimp-vc142-mt.lib;lua.lib;jenkins.lib;shlwapi.lib;ogg.lib;vorbis.lib;vorbisfile.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype.lib;sigc-vc140-2_0.lib;text.lib;galaxy.lib;collider.lib;graphics.lib;terrain.lib;scenegraph.lib;profiler.lib;%(AdditionalDependencies) - - - - - - \ No newline at end of file diff --git a/win32/vs2019/modelcompiler.vcxproj.filters b/win32/vs2019/modelcompiler.vcxproj.filters deleted file mode 100644 index f87ac3ce85c..00000000000 --- a/win32/vs2019/modelcompiler.vcxproj.filters +++ /dev/null @@ -1,225 +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 - - - {1d302f47-f764-4c47-a347-368ea89b5822} - - - {2f1a4c06-480d-443b-84ca-e2f7a74efd36} - - - {1fe8dda3-2330-4d28-a4cd-a52a055ee86d} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Win32 - - - Win32 - - - Win32 - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Win32 - - - Source Files - - - Source Files - - - Source Files\lz4 - - - Source Files\lz4 - - - Source Files\lz4 - - - Source Files\lz4 - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Win32 - - - Win32 - - - Win32 - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\json - - - Header Files\json - - - Header Files\json - - - Source Files\lz4 - - - Source Files\lz4 - - - Source Files\lz4 - - - Source Files\lz4 - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/win32/vs2019/newmodel/newmodel.vcxproj b/win32/vs2019/newmodel/newmodel.vcxproj deleted file mode 100644 index 1b52a48b534..00000000000 --- a/win32/vs2019/newmodel/newmodel.vcxproj +++ /dev/null @@ -1,206 +0,0 @@ - - - - - Debug - x64 - - - PreRelease - x64 - - - Profile - x64 - - - Release - x64 - - - - {E34F7DBC-F23D-481A-B920-E53F56C53EE8} - newmodel - scenegraph - 10.0 - - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - false - Unicode - false - v142 - - - StaticLibrary - false - Unicode - false - v142 - - - StaticLibrary - false - Unicode - v142 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - ../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../../contrib/lua - -Zm137 %(AdditionalOptions) - _ITERATOR_DEBUG_LEVEL=0;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - stdcpp17 - - - - - - true - true - true - - - ../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../../contrib/lua - NotUsing - NotSet - _ITERATOR_DEBUG_LEVEL=0;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions) - stdcpp17 - - - - - - true - true - true - - - ../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../../contrib/lua - _ITERATOR_DEBUG_LEVEL=0;PIONEER_PROFILER;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions) - NotSet - stdcpp17 - - - - - - true - true - true - - - ../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../../contrib/lua - NotSet - _ITERATOR_DEBUG_LEVEL=0;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - stdcpp17 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/win32/vs2019/newmodel/newmodel.vcxproj.filters b/win32/vs2019/newmodel/newmodel.vcxproj.filters deleted file mode 100644 index 845d60f31e0..00000000000 --- a/win32/vs2019/newmodel/newmodel.vcxproj.filters +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - lz4 - - - lz4 - - - lz4 - - - lz4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - lz4 - - - lz4 - - - lz4 - - - lz4 - - - - - {5e6f213d-b0bc-4356-a451-7c3b5ee3a120} - - - \ No newline at end of file diff --git a/win32/vs2019/perlintest.vcxproj b/win32/vs2019/perlintest.vcxproj deleted file mode 100644 index ff5c73cf2bb..00000000000 --- a/win32/vs2019/perlintest.vcxproj +++ /dev/null @@ -1,112 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {C4EC7578-4861-4985-B5AA-452964EA9D74} - Win32Proj - perlintest - - - - Application - true - Unicode - v110 - - - Application - false - false - Unicode - v110 - - - - - - - - - - - - - true - $(Configuration)\$(ProjectName)\ - $(ProjectName)-debug - $(SolutionDir)..\..\ - - - false - $(Configuration)\$(ProjectName)\ - $(SolutionDir)..\..\ - $(ProjectName)-prerelease - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - Fast - Default - ../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../win32/include;../../include;../../../contrib;../../contrib - true - StreamingSIMDExtensions2 - true - - - Console - true - ../../win32/lib;../../../pioneer-thirdparty/win32/lib;$(SolutionDir)$(Configuration) - sigc-vc2012-d-2_2_8.lib;%(AdditionalDependencies) - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - Fast - Default - ../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../win32/include;../../include;../../../contrib;../../contrib - false - MultiThreadedDebug - StreamingSIMDExtensions2 - - - Console - true - true - true - ../../win32/lib;../../../pioneer-thirdparty/win32/lib;$(SolutionDir)$(Configuration) - sigc-vc2012-2_2_8.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/win32/vs2019/perlintest.vcxproj.filters b/win32/vs2019/perlintest.vcxproj.filters deleted file mode 100644 index 769f5e1c563..00000000000 --- a/win32/vs2019/perlintest.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - {e9b1a990-6efe-42cf-9f6e-f2e616237bcd} - - - {aeabf531-2de2-4c8d-a8f0-9eac5ef02742} - - - {1cb2597d-dc02-4d1a-8b7b-ca44fd755348} - - - - - src - - - src - - - src - - - - - src - - - win32\src - - - \ No newline at end of file diff --git a/win32/vs2019/pioneer.sln b/win32/vs2019/pioneer.sln deleted file mode 100644 index ad9a017fd5f..00000000000 --- a/win32/vs2019/pioneer.sln +++ /dev/null @@ -1,215 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30204.135 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pioneer", "pioneer.vcxproj", "{65A1BBFB-7A42-497C-BF65-A0A06664A204}" - ProjectSection(ProjectDependencies) = postProject - {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E} = {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E} - {82973C2C-FC40-4320-84AE-A47E36868C02} = {82973C2C-FC40-4320-84AE-A47E36868C02} - {5085B12D-F9AC-4878-9672-1FD4EB0EFB67} = {5085B12D-F9AC-4878-9672-1FD4EB0EFB67} - {06E6CE3D-9163-453B-BF8D-3B9DECB5AB78} = {06E6CE3D-9163-453B-BF8D-3B9DECB5AB78} - {A2082451-1B70-47C1-88E1-62A59EB13A44} = {A2082451-1B70-47C1-88E1-62A59EB13A44} - {38C0279B-EB3E-4113-8E3E-29AFC31C3C20} = {38C0279B-EB3E-4113-8E3E-29AFC31C3C20} - {64F034A3-B40E-4D42-ADDD-E2EE42ED517F} = {64F034A3-B40E-4D42-ADDD-E2EE42ED517F} - {F1547BA3-05CB-4166-93C8-9F161E1C75EB} = {F1547BA3-05CB-4166-93C8-9F161E1C75EB} - {DED0A0AD-E7B8-42EF-83DB-EDAE7E2443EE} = {DED0A0AD-E7B8-42EF-83DB-EDAE7E2443EE} - {E34F7DBC-F23D-481A-B920-E53F56C53EE8} = {E34F7DBC-F23D-481A-B920-E53F56C53EE8} - {03ACDDF1-56D2-49FF-8762-000EA6CB2C2F} = {03ACDDF1-56D2-49FF-8762-000EA6CB2C2F} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "text", "text\text.vcxproj", "{06E6CE3D-9163-453B-BF8D-3B9DECB5AB78}" - ProjectSection(ProjectDependencies) = postProject - {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E} = {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jenkins", "jenkins\jenkins.vcxproj", "{38C0279B-EB3E-4113-8E3E-29AFC31C3C20}" - ProjectSection(ProjectDependencies) = postProject - {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E} = {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "galaxy", "galaxy\galaxy.vcxproj", "{82973C2C-FC40-4320-84AE-A47E36868C02}" - ProjectSection(ProjectDependencies) = postProject - {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E} = {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "collider", "collider\collider.vcxproj", "{A2082451-1B70-47C1-88E1-62A59EB13A44}" - ProjectSection(ProjectDependencies) = postProject - {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E} = {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "graphics\graphics.vcxproj", "{DED0A0AD-E7B8-42EF-83DB-EDAE7E2443EE}" - ProjectSection(ProjectDependencies) = postProject - {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E} = {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "terrain", "terrain\terrain.vcxproj", "{64F034A3-B40E-4D42-ADDD-E2EE42ED517F}" - ProjectSection(ProjectDependencies) = postProject - {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E} = {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "lua.vcxproj", "{5085B12D-F9AC-4878-9672-1FD4EB0EFB67}" - ProjectSection(ProjectDependencies) = postProject - {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E} = {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scenegraph", "newmodel\newmodel.vcxproj", "{E34F7DBC-F23D-481A-B920-E53F56C53EE8}" - ProjectSection(ProjectDependencies) = postProject - {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E} = {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E} - {DED0A0AD-E7B8-42EF-83DB-EDAE7E2443EE} = {DED0A0AD-E7B8-42EF-83DB-EDAE7E2443EE} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "profiler", "profiler\profiler.vcxproj", "{FFDC1809-F67B-4933-B4E0-5298EA5DDB7E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modelcompiler", "modelcompiler.vcxproj", "{8006A44D-1877-42EE-99A6-214E8B328AEE}" - ProjectSection(ProjectDependencies) = postProject - {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E} = {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E} - {82973C2C-FC40-4320-84AE-A47E36868C02} = {82973C2C-FC40-4320-84AE-A47E36868C02} - {5085B12D-F9AC-4878-9672-1FD4EB0EFB67} = {5085B12D-F9AC-4878-9672-1FD4EB0EFB67} - {06E6CE3D-9163-453B-BF8D-3B9DECB5AB78} = {06E6CE3D-9163-453B-BF8D-3B9DECB5AB78} - {A2082451-1B70-47C1-88E1-62A59EB13A44} = {A2082451-1B70-47C1-88E1-62A59EB13A44} - {38C0279B-EB3E-4113-8E3E-29AFC31C3C20} = {38C0279B-EB3E-4113-8E3E-29AFC31C3C20} - {64F034A3-B40E-4D42-ADDD-E2EE42ED517F} = {64F034A3-B40E-4D42-ADDD-E2EE42ED517F} - {F1547BA3-05CB-4166-93C8-9F161E1C75EB} = {F1547BA3-05CB-4166-93C8-9F161E1C75EB} - {DED0A0AD-E7B8-42EF-83DB-EDAE7E2443EE} = {DED0A0AD-E7B8-42EF-83DB-EDAE7E2443EE} - {E34F7DBC-F23D-481A-B920-E53F56C53EE8} = {E34F7DBC-F23D-481A-B920-E53F56C53EE8} - {03ACDDF1-56D2-49FF-8762-000EA6CB2C2F} = {03ACDDF1-56D2-49FF-8762-000EA6CB2C2F} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glew", "glew\glew.vcxproj", "{03ACDDF1-56D2-49FF-8762-000EA6CB2C2F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "savedump", "savedump\savedump.vcxproj", "{457B1FC5-D180-4E45-848E-26E1C3743ADC}" - ProjectSection(ProjectDependencies) = postProject - {F1547BA3-05CB-4166-93C8-9F161E1C75EB} = {F1547BA3-05CB-4166-93C8-9F161E1C75EB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "fmt\fmt.vcxproj", "{F1547BA3-05CB-4166-93C8-9F161E1C75EB}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - PreRelease|x64 = PreRelease|x64 - Profile|x64 = Profile|x64 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {65A1BBFB-7A42-497C-BF65-A0A06664A204}.Debug|x64.ActiveCfg = Debug|x64 - {65A1BBFB-7A42-497C-BF65-A0A06664A204}.Debug|x64.Build.0 = Debug|x64 - {65A1BBFB-7A42-497C-BF65-A0A06664A204}.PreRelease|x64.ActiveCfg = PreRelease|x64 - {65A1BBFB-7A42-497C-BF65-A0A06664A204}.PreRelease|x64.Build.0 = PreRelease|x64 - {65A1BBFB-7A42-497C-BF65-A0A06664A204}.Profile|x64.ActiveCfg = Profile|x64 - {65A1BBFB-7A42-497C-BF65-A0A06664A204}.Profile|x64.Build.0 = Profile|x64 - {65A1BBFB-7A42-497C-BF65-A0A06664A204}.Release|x64.ActiveCfg = Release|x64 - {65A1BBFB-7A42-497C-BF65-A0A06664A204}.Release|x64.Build.0 = Release|x64 - {06E6CE3D-9163-453B-BF8D-3B9DECB5AB78}.Debug|x64.ActiveCfg = Debug|x64 - {06E6CE3D-9163-453B-BF8D-3B9DECB5AB78}.Debug|x64.Build.0 = Debug|x64 - {06E6CE3D-9163-453B-BF8D-3B9DECB5AB78}.PreRelease|x64.ActiveCfg = PreRelease|x64 - {06E6CE3D-9163-453B-BF8D-3B9DECB5AB78}.PreRelease|x64.Build.0 = PreRelease|x64 - {06E6CE3D-9163-453B-BF8D-3B9DECB5AB78}.Profile|x64.ActiveCfg = Profile|x64 - {06E6CE3D-9163-453B-BF8D-3B9DECB5AB78}.Profile|x64.Build.0 = Profile|x64 - {06E6CE3D-9163-453B-BF8D-3B9DECB5AB78}.Release|x64.ActiveCfg = Release|x64 - {06E6CE3D-9163-453B-BF8D-3B9DECB5AB78}.Release|x64.Build.0 = Release|x64 - {38C0279B-EB3E-4113-8E3E-29AFC31C3C20}.Debug|x64.ActiveCfg = Debug|x64 - {38C0279B-EB3E-4113-8E3E-29AFC31C3C20}.Debug|x64.Build.0 = Debug|x64 - {38C0279B-EB3E-4113-8E3E-29AFC31C3C20}.PreRelease|x64.ActiveCfg = PreRelease|x64 - {38C0279B-EB3E-4113-8E3E-29AFC31C3C20}.PreRelease|x64.Build.0 = PreRelease|x64 - {38C0279B-EB3E-4113-8E3E-29AFC31C3C20}.Profile|x64.ActiveCfg = Profile|x64 - {38C0279B-EB3E-4113-8E3E-29AFC31C3C20}.Profile|x64.Build.0 = Profile|x64 - {38C0279B-EB3E-4113-8E3E-29AFC31C3C20}.Release|x64.ActiveCfg = Release|x64 - {38C0279B-EB3E-4113-8E3E-29AFC31C3C20}.Release|x64.Build.0 = Release|x64 - {82973C2C-FC40-4320-84AE-A47E36868C02}.Debug|x64.ActiveCfg = Debug|x64 - {82973C2C-FC40-4320-84AE-A47E36868C02}.Debug|x64.Build.0 = Debug|x64 - {82973C2C-FC40-4320-84AE-A47E36868C02}.PreRelease|x64.ActiveCfg = PreRelease|x64 - {82973C2C-FC40-4320-84AE-A47E36868C02}.PreRelease|x64.Build.0 = PreRelease|x64 - {82973C2C-FC40-4320-84AE-A47E36868C02}.Profile|x64.ActiveCfg = Profile|x64 - {82973C2C-FC40-4320-84AE-A47E36868C02}.Profile|x64.Build.0 = Profile|x64 - {82973C2C-FC40-4320-84AE-A47E36868C02}.Release|x64.ActiveCfg = Release|x64 - {82973C2C-FC40-4320-84AE-A47E36868C02}.Release|x64.Build.0 = Release|x64 - {A2082451-1B70-47C1-88E1-62A59EB13A44}.Debug|x64.ActiveCfg = Debug|x64 - {A2082451-1B70-47C1-88E1-62A59EB13A44}.Debug|x64.Build.0 = Debug|x64 - {A2082451-1B70-47C1-88E1-62A59EB13A44}.PreRelease|x64.ActiveCfg = PreRelease|x64 - {A2082451-1B70-47C1-88E1-62A59EB13A44}.PreRelease|x64.Build.0 = PreRelease|x64 - {A2082451-1B70-47C1-88E1-62A59EB13A44}.Profile|x64.ActiveCfg = Profile|x64 - {A2082451-1B70-47C1-88E1-62A59EB13A44}.Profile|x64.Build.0 = Profile|x64 - {A2082451-1B70-47C1-88E1-62A59EB13A44}.Release|x64.ActiveCfg = Release|x64 - {A2082451-1B70-47C1-88E1-62A59EB13A44}.Release|x64.Build.0 = Release|x64 - {DED0A0AD-E7B8-42EF-83DB-EDAE7E2443EE}.Debug|x64.ActiveCfg = Debug|x64 - {DED0A0AD-E7B8-42EF-83DB-EDAE7E2443EE}.Debug|x64.Build.0 = Debug|x64 - {DED0A0AD-E7B8-42EF-83DB-EDAE7E2443EE}.PreRelease|x64.ActiveCfg = PreRelease|x64 - {DED0A0AD-E7B8-42EF-83DB-EDAE7E2443EE}.PreRelease|x64.Build.0 = PreRelease|x64 - {DED0A0AD-E7B8-42EF-83DB-EDAE7E2443EE}.Profile|x64.ActiveCfg = Profile|x64 - {DED0A0AD-E7B8-42EF-83DB-EDAE7E2443EE}.Profile|x64.Build.0 = Profile|x64 - {DED0A0AD-E7B8-42EF-83DB-EDAE7E2443EE}.Release|x64.ActiveCfg = Release|x64 - {DED0A0AD-E7B8-42EF-83DB-EDAE7E2443EE}.Release|x64.Build.0 = Release|x64 - {64F034A3-B40E-4D42-ADDD-E2EE42ED517F}.Debug|x64.ActiveCfg = Debug|x64 - {64F034A3-B40E-4D42-ADDD-E2EE42ED517F}.Debug|x64.Build.0 = Debug|x64 - {64F034A3-B40E-4D42-ADDD-E2EE42ED517F}.PreRelease|x64.ActiveCfg = PreRelease|x64 - {64F034A3-B40E-4D42-ADDD-E2EE42ED517F}.PreRelease|x64.Build.0 = PreRelease|x64 - {64F034A3-B40E-4D42-ADDD-E2EE42ED517F}.Profile|x64.ActiveCfg = Profile|x64 - {64F034A3-B40E-4D42-ADDD-E2EE42ED517F}.Profile|x64.Build.0 = Profile|x64 - {64F034A3-B40E-4D42-ADDD-E2EE42ED517F}.Release|x64.ActiveCfg = Release|x64 - {64F034A3-B40E-4D42-ADDD-E2EE42ED517F}.Release|x64.Build.0 = Release|x64 - {5085B12D-F9AC-4878-9672-1FD4EB0EFB67}.Debug|x64.ActiveCfg = Debug|x64 - {5085B12D-F9AC-4878-9672-1FD4EB0EFB67}.Debug|x64.Build.0 = Debug|x64 - {5085B12D-F9AC-4878-9672-1FD4EB0EFB67}.PreRelease|x64.ActiveCfg = PreRelease|x64 - {5085B12D-F9AC-4878-9672-1FD4EB0EFB67}.PreRelease|x64.Build.0 = PreRelease|x64 - {5085B12D-F9AC-4878-9672-1FD4EB0EFB67}.Profile|x64.ActiveCfg = Profile|x64 - {5085B12D-F9AC-4878-9672-1FD4EB0EFB67}.Profile|x64.Build.0 = Profile|x64 - {5085B12D-F9AC-4878-9672-1FD4EB0EFB67}.Release|x64.ActiveCfg = Release|x64 - {5085B12D-F9AC-4878-9672-1FD4EB0EFB67}.Release|x64.Build.0 = Release|x64 - {E34F7DBC-F23D-481A-B920-E53F56C53EE8}.Debug|x64.ActiveCfg = Debug|x64 - {E34F7DBC-F23D-481A-B920-E53F56C53EE8}.Debug|x64.Build.0 = Debug|x64 - {E34F7DBC-F23D-481A-B920-E53F56C53EE8}.PreRelease|x64.ActiveCfg = PreRelease|x64 - {E34F7DBC-F23D-481A-B920-E53F56C53EE8}.PreRelease|x64.Build.0 = PreRelease|x64 - {E34F7DBC-F23D-481A-B920-E53F56C53EE8}.Profile|x64.ActiveCfg = Profile|x64 - {E34F7DBC-F23D-481A-B920-E53F56C53EE8}.Profile|x64.Build.0 = Profile|x64 - {E34F7DBC-F23D-481A-B920-E53F56C53EE8}.Release|x64.ActiveCfg = Release|x64 - {E34F7DBC-F23D-481A-B920-E53F56C53EE8}.Release|x64.Build.0 = Release|x64 - {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E}.Debug|x64.ActiveCfg = Debug|x64 - {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E}.Debug|x64.Build.0 = Debug|x64 - {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E}.PreRelease|x64.ActiveCfg = PreRelease|x64 - {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E}.PreRelease|x64.Build.0 = PreRelease|x64 - {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E}.Profile|x64.ActiveCfg = Profile|x64 - {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E}.Profile|x64.Build.0 = Profile|x64 - {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E}.Release|x64.ActiveCfg = Release|x64 - {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E}.Release|x64.Build.0 = Release|x64 - {8006A44D-1877-42EE-99A6-214E8B328AEE}.Debug|x64.ActiveCfg = Debug|x64 - {8006A44D-1877-42EE-99A6-214E8B328AEE}.Debug|x64.Build.0 = Debug|x64 - {8006A44D-1877-42EE-99A6-214E8B328AEE}.PreRelease|x64.ActiveCfg = PreRelease|x64 - {8006A44D-1877-42EE-99A6-214E8B328AEE}.PreRelease|x64.Build.0 = PreRelease|x64 - {8006A44D-1877-42EE-99A6-214E8B328AEE}.Profile|x64.ActiveCfg = Profile|x64 - {8006A44D-1877-42EE-99A6-214E8B328AEE}.Profile|x64.Build.0 = Profile|x64 - {8006A44D-1877-42EE-99A6-214E8B328AEE}.Release|x64.ActiveCfg = Release|x64 - {8006A44D-1877-42EE-99A6-214E8B328AEE}.Release|x64.Build.0 = Release|x64 - {03ACDDF1-56D2-49FF-8762-000EA6CB2C2F}.Debug|x64.ActiveCfg = Debug|x64 - {03ACDDF1-56D2-49FF-8762-000EA6CB2C2F}.Debug|x64.Build.0 = Debug|x64 - {03ACDDF1-56D2-49FF-8762-000EA6CB2C2F}.PreRelease|x64.ActiveCfg = PreRelease|x64 - {03ACDDF1-56D2-49FF-8762-000EA6CB2C2F}.PreRelease|x64.Build.0 = PreRelease|x64 - {03ACDDF1-56D2-49FF-8762-000EA6CB2C2F}.Profile|x64.ActiveCfg = Profile|x64 - {03ACDDF1-56D2-49FF-8762-000EA6CB2C2F}.Profile|x64.Build.0 = Profile|x64 - {03ACDDF1-56D2-49FF-8762-000EA6CB2C2F}.Release|x64.ActiveCfg = Release|x64 - {03ACDDF1-56D2-49FF-8762-000EA6CB2C2F}.Release|x64.Build.0 = Release|x64 - {457B1FC5-D180-4E45-848E-26E1C3743ADC}.Debug|x64.ActiveCfg = Debug|x64 - {457B1FC5-D180-4E45-848E-26E1C3743ADC}.Debug|x64.Build.0 = Debug|x64 - {457B1FC5-D180-4E45-848E-26E1C3743ADC}.PreRelease|x64.ActiveCfg = PreRelease|x64 - {457B1FC5-D180-4E45-848E-26E1C3743ADC}.PreRelease|x64.Build.0 = PreRelease|x64 - {457B1FC5-D180-4E45-848E-26E1C3743ADC}.Profile|x64.ActiveCfg = Profile|x64 - {457B1FC5-D180-4E45-848E-26E1C3743ADC}.Profile|x64.Build.0 = Profile|x64 - {457B1FC5-D180-4E45-848E-26E1C3743ADC}.Release|x64.ActiveCfg = Release|x64 - {457B1FC5-D180-4E45-848E-26E1C3743ADC}.Release|x64.Build.0 = Release|x64 - {F1547BA3-05CB-4166-93C8-9F161E1C75EB}.Debug|x64.ActiveCfg = Debug|x64 - {F1547BA3-05CB-4166-93C8-9F161E1C75EB}.Debug|x64.Build.0 = Debug|x64 - {F1547BA3-05CB-4166-93C8-9F161E1C75EB}.PreRelease|x64.ActiveCfg = PreRelease|x64 - {F1547BA3-05CB-4166-93C8-9F161E1C75EB}.PreRelease|x64.Build.0 = PreRelease|x64 - {F1547BA3-05CB-4166-93C8-9F161E1C75EB}.Profile|x64.ActiveCfg = Profile|x64 - {F1547BA3-05CB-4166-93C8-9F161E1C75EB}.Profile|x64.Build.0 = Profile|x64 - {F1547BA3-05CB-4166-93C8-9F161E1C75EB}.Release|x64.ActiveCfg = Release|x64 - {F1547BA3-05CB-4166-93C8-9F161E1C75EB}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {01ABB943-7451-4047-A4F9-36109CC966F3} - EndGlobalSection -EndGlobal diff --git a/win32/vs2019/pioneer.vcxproj b/win32/vs2019/pioneer.vcxproj deleted file mode 100644 index f25c073c8e0..00000000000 --- a/win32/vs2019/pioneer.vcxproj +++ /dev/null @@ -1,616 +0,0 @@ - - - - - Debug - x64 - - - PreRelease - x64 - - - Profile - x64 - - - Release - x64 - - - - {65A1BBFB-7A42-497C-BF65-A0A06664A204} - Win32Proj - pioneer - 10.0 - - - - Application - true - Unicode - v142 - - - Application - true - Unicode - v142 - - - Application - false - false - Unicode - v142 - - - Application - false - false - Unicode - v142 - - - - - - - - - - - - - - - - - - - - - - - - - - - $(ProjectName)-x64-debug - $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)..\..\ - - - $(ProjectName)-x64-prerelease - false - $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)..\..\ - - - $(ProjectName)-x64-profile - $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)..\..\ - - - $(Platform)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)..\..\ - $(ProjectName)-x64 - - - - ../../contrib/fmt/include;../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../contrib/imgui;../../contrib/lua;../../src/win32;../../src/lua - PSAPI_VERSION=1;_ITERATOR_DEBUG_LEVEL=0;IMGUI_IMPL_OPENGL_LOADER_GLEW;IMGUI_DEFINE_MATH_OPERATORS;GLEW_NO_GLU;GLEW_STATIC;_SCL_SECURE_NO_WARNINGS;HAVE_M_PI;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - Fast - true - false - -Zm137 %(AdditionalOptions) - stdcpp17 - - - Windows - fmt.lib;Psapi.lib;glew.lib;profiler.lib;assimp-vc142-mt.lib;shlwapi.lib;ogg.lib;vorbis.lib;vorbisfile.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype.lib;sigc-vc140-2_0.lib;collider.lib;galaxy.lib;graphics.lib;jenkins.lib;lua.lib;terrain.lib;text.lib;scenegraph.lib;Ws2_32.lib;%(AdditionalDependencies) - ../../win32/lib;../../../pioneer-thirdparty/win32/lib/x64/vs2019;$(SolutionDir)\$(Platform)\$(Configuration) - msvcrt.lib;%(IgnoreSpecificDefaultLibraries) - true - - - xcopy "..\..\..\pioneer-thirdparty\win32\bin\x64\vs2019\*.dll" "$(TargetDir)\*.dll" /Y /C - copy the dlls into the directory - - - - - - Windows - fmt.lib;Psapi.lib;glew.lib;profiler.lib;assimp-vc142-mt.lib;shlwapi.lib;ogg.lib;vorbis.lib;vorbisfile.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype.lib;sigc-vc140-2_0.lib;collider.lib;galaxy.lib;graphics.lib;jenkins.lib;lua.lib;terrain.lib;text.lib;scenegraph.lib;Ws2_32.lib;%(AdditionalDependencies) - ../../win32/lib;../../../pioneer-thirdparty/win32/lib/x64/vs2019;$(SolutionDir)\$(Platform)\$(Configuration) - msvcrt.lib;%(IgnoreSpecificDefaultLibraries) - UseLinkTimeCodeGeneration - true - - - ../../contrib/fmt/include;../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../contrib/imgui;../../contrib/lua;../../src/win32;../../src/lua - PSAPI_VERSION=1;_ITERATOR_DEBUG_LEVEL=0;IMGUI_IMPL_OPENGL_LOADER_GLEW;IMGUI_DEFINE_MATH_OPERATORS;GLEW_NO_GLU;GLEW_STATIC;_SCL_SECURE_NO_WARNINGS;HAVE_M_PI;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - false - NotSet - stdcpp17 - - - xcopy "..\..\..\pioneer-thirdparty\win32\bin\x64\vs2019\*.dll" "$(TargetDir)\*.dll" /Y /C - copy the dlls into the directory - - - - - - Windows - fmt.lib;Psapi.lib;glew.lib;profiler.lib;assimp-vc142-mt.lib;lua.lib;jenkins.lib;shlwapi.lib;ogg.lib;vorbis.lib;vorbisfile.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype.lib;sigc-vc140-2_0.lib;text.lib;galaxy.lib;collider.lib;graphics.lib;terrain.lib;scenegraph.lib;Ws2_32.lib;%(AdditionalDependencies) - ../../win32/lib;../../../pioneer-thirdparty/win32/lib/x64/vs2019;$(SolutionDir)\$(Platform)\$(Configuration) - true - - - - ../../contrib/fmt/include;../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../contrib/imgui;../../contrib/lua;../../src/win32;../../src/lua - PSAPI_VERSION=1;_ITERATOR_DEBUG_LEVEL=0;IMGUI_IMPL_OPENGL_LOADER_GLEW;IMGUI_DEFINE_MATH_OPERATORS;GLEW_NO_GLU;GLEW_STATIC;_SCL_SECURE_NO_WARNINGS;HAVE_M_PI;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions) - true - false - AnySuitable - true - false - NotUsing - NotSet - stdcpp17 - - - xcopy "..\..\..\pioneer-thirdparty\win32\bin\x64\vs2019\*.dll" "$(TargetDir)\*.dll" /Y /C - copy the dlls into the directory - - - - - - Windows - fmt.lib;Psapi.lib;glew.lib;profiler.lib;assimp-vc142-mt.lib;lua.lib;jenkins.lib;shlwapi.lib;ogg.lib;vorbis.lib;vorbisfile.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;SDL2_image.lib;freetype.lib;sigc-vc140-2_0.lib;text.lib;galaxy.lib;collider.lib;graphics.lib;terrain.lib;scenegraph.lib;Ws2_32.lib;%(AdditionalDependencies) - ../../win32/lib;../../../pioneer-thirdparty/win32/lib/x64/vs2019;$(SolutionDir)\$(Platform)\$(Configuration) - true - UseLinkTimeCodeGeneration - - - - ../../contrib/fmt/include;../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../contrib/imgui;../../contrib/lua;../../src/win32;../../src/lua - PSAPI_VERSION=1;_ITERATOR_DEBUG_LEVEL=0;IMGUI_IMPL_OPENGL_LOADER_GLEW;IMGUI_DEFINE_MATH_OPERATORS;GLEW_NO_GLU;GLEW_STATIC;_SCL_SECURE_NO_WARNINGS;HAVE_M_PI;PIONEER_PROFILER;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions) - /Qpar-report:2 /Qvec-report:2 %(AdditionalOptions) - false - true - true - false - NotSet - stdcpp17 - - - xcopy "..\..\..\pioneer-thirdparty\win32\bin\x64\vs2019\*.dll" "$(TargetDir)\*.dll" /Y /C - copy the dlls into the directory - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(IntDir)pigui\ - $(IntDir)pigui\ - $(IntDir)pigui\ - $(IntDir)pigui\ - $(IntDir)pigui\ - $(IntDir)pigui\ - $(IntDir)pigui\ - $(IntDir)pigui\ - - - - - - - - - - - - - - - - - true - true - true - true - true - true - true - true - - - true - true - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/win32/vs2019/pioneer.vcxproj.filters b/win32/vs2019/pioneer.vcxproj.filters deleted file mode 100644 index 64ccd4417da..00000000000 --- a/win32/vs2019/pioneer.vcxproj.filters +++ /dev/null @@ -1,1208 +0,0 @@ - - - - - {2ef8ea5b-7c53-4337-93b0-a929d9103bd6} - - - {172c1b95-e18a-4158-8227-10b5cc882b62} - - - {6d264ce7-1454-4144-a050-a665481a0a20} - - - {3c92be2e-998e-4817-8563-82402b4f3b91} - - - {a4f6a456-a451-445c-9017-dd2865551018} - - - {9493c942-fe23-49f7-9cfe-0984403ead6f} - - - {b6c5e7a4-49dc-4f22-9d91-31bffa101a6c} - - - {c2a80aeb-4181-4173-9532-0648044f2982} - - - {fd3f0e42-c96a-45c3-a489-fccf8c9242f0} - - - {a90916ce-5155-4b0b-baa1-878bd29b7741} - - - {04ea10f9-e4ca-4362-b2af-8434cf3c0418} - - - {8b8f8935-2d4d-49c5-8932-3c973b1fc69a} - - - {077edfac-2118-4205-94da-792445afd8da} - - - {1b3c4a96-acf0-43c9-a71f-5ca25dec7883} - - - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src\win32 - - - src\win32 - - - src\posix - - - src\posix - - - src\win32 - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src\win32 - - - src - - - src - - - src\imgui - - - src\imgui - - - src - - - src - - - src - - - src - - - src - - - src\imgui - - - src\imgui - - - src\sound - - - src\sound - - - src\sound - - - src\ship - - - src\ship - - - src\ship - - - src\pigui - - - src\pigui - - - src\ship - - - src\pigui - - - src\pigui - - - src\lz4 - - - src\lz4 - - - src\lz4 - - - src\lz4 - - - src\pigui - - - src\pigui - - - src - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua\Core - - - src\Lua\Core - - - src\pigui - - - src\pigui - - - src\pigui - - - src\core - - - src\core - - - src\pigui - - - src\Lua - - - src\Lua - - - src\core - - - src\core - - - src\core - - - src\Lua - - - src\core - - - src\ship - - - src\pigui - - - src\pigui - - - src\Lua - - - src - - - src\pigui - - - src\pigui - - - src - - - src\imgui - - - src\ship - - - src\pigui - - - src\imgui - - - src\core - - - src\Lua\Core - - - src - - - src\core - - - src\core - - - src\Lua - - - src\nanosockets - - - src\ship - - - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src\win32 - - - src\win32 - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src\imgui - - - src\nanosvg - - - src\nanosvg - - - src - - - src - - - src - - - src - - - src - - - src\imgui - - - src\imgui - - - src\imgui - - - src\imgui - - - src\imgui - - - src\imgui - - - src\json - - - src\json - - - src\json - - - src\sound - - - src\sound - - - src\sound - - - src\ship - - - src\ship - - - src\ship - - - src\pigui - - - src\ship - - - src\pigui - - - src\lz4 - - - src\lz4 - - - src\lz4 - - - src\lz4 - - - src\pigui - - - src - - - src - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua - - - src\Lua\Core - - - src\pigui - - - src\pigui - - - src\core - - - src\core - - - src\pigui - - - src\core - - - src\core - - - src\core - - - src\Lua - - - src\core - - - src\ship - - - src - - - src\Lua - - - src\pigui - - - src\pigui - - - src\Lua - - - src - - - src\pigui - - - src - - - src\ship - - - src\pigui - - - src\core - - - src\core - - - src\core - - - src\core - - - src\core - - - src\core - - - src - - - src - - - src - - - src - - - src - - - src - - - src\core - - - src\core - - - src\Lua - - - src\nanosockets - - - src\ship - - - - - src\win32 - - - diff --git a/win32/vs2019/profiler/profiler.vcxproj b/win32/vs2019/profiler/profiler.vcxproj deleted file mode 100644 index 56893969909..00000000000 --- a/win32/vs2019/profiler/profiler.vcxproj +++ /dev/null @@ -1,195 +0,0 @@ - - - - - Debug - x64 - - - PreRelease - x64 - - - Profile - x64 - - - Release - x64 - - - - - - - - - - {FFDC1809-F67B-4933-B4E0-5298EA5DDB7E} - profiler - Win32Proj - 10.0 - - - - StaticLibrary - v142 - Unicode - false - - - StaticLibrary - v142 - Unicode - false - - - StaticLibrary - v142 - Unicode - - - StaticLibrary - v142 - Unicode - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.20617.1 - - - true - - - true - - - false - - - false - - - - Disabled - ../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib - _ITERATOR_DEBUG_LEVEL=0;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - true - -Zm137 %(AdditionalOptions) - stdcpp17 - - - true - Console - - - - - MaxSpeed - ../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib - _ITERATOR_DEBUG_LEVEL=0;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - false - Default - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - Speed - Fast - 4305 - - - stdcpp17 - - - true - Console - - - - - Default - true - Speed - false - false - ../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib - _ITERATOR_DEBUG_LEVEL=0;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - - - Sync - MultiThreadedDLL - Default - false - false - NotUsing - Level3 - ProgramDatabase - Fast - stdcpp17 - - - NotSet - true - Console - true - true - - - - - Default - true - Speed - false - false - ../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib - _ITERATOR_DEBUG_LEVEL=0;PIONEER_PROFILER;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - - - Sync - MultiThreadedDLL - Default - false - false - - - Level3 - ProgramDatabase - Fast - stdcpp17 - - - NotSet - true - Console - true - true - - - - - - \ No newline at end of file diff --git a/win32/vs2019/profiler/profiler.vcxproj.filters b/win32/vs2019/profiler/profiler.vcxproj.filters deleted file mode 100644 index ce2d0167b5b..00000000000 --- a/win32/vs2019/profiler/profiler.vcxproj.filters +++ /dev/null @@ -1,18 +0,0 @@ - - - - - {25ae8c86-4134-4ef4-b780-b0b2f106ece0} - - - - - Profiler - - - - - Profiler - - - \ No newline at end of file diff --git a/win32/vs2019/savedump/savedump.vcxproj b/win32/vs2019/savedump/savedump.vcxproj deleted file mode 100644 index 01c74464cab..00000000000 --- a/win32/vs2019/savedump/savedump.vcxproj +++ /dev/null @@ -1,179 +0,0 @@ - - - - - PreRelease - x64 - - - Profile - x64 - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - 15.0 - {457B1FC5-D180-4E45-848E-26E1C3743ADC} - Win32Proj - savedump - 10.0 - - - - Application - true - v142 - Unicode - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - Application - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - NotUsing - Level3 - Disabled - true - _ITERATOR_DEBUG_LEVEL=0;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../contrib/imgui;../../contrib/lua - stdcpp17 - - - Console - true - fmt.lib;sdl2.lib;sdl2main.lib;SDL2_image.lib;shlwapi.lib;sigc-vc140-d-2_0.lib;%(AdditionalDependencies) - ../../win32/lib;../../../../pioneer-thirdparty/win32/lib/x64/vs2019;$(SolutionDir)\$(Platform)\$(Configuration) - - - - - NotUsing - Level3 - Disabled - true - _ITERATOR_DEBUG_LEVEL=0;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../contrib/imgui;../../contrib/lua - stdcpp17 - - - Console - true - fmt.lib;sdl2.lib;sdl2main.lib;SDL2_image.lib;shlwapi.lib;sigc-vc140-d-2_0.lib;%(AdditionalDependencies) - ../../win32/lib;../../../../pioneer-thirdparty/win32/lib/x64/vs2019;$(SolutionDir)\$(Platform)\$(Configuration) - - - - - NotUsing - Level3 - MaxSpeed - true - true - true - _ITERATOR_DEBUG_LEVEL=0;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../contrib/imgui;../../contrib/lua - stdcpp17 - - - Console - true - true - true - ../../win32/lib;../../../../pioneer-thirdparty/win32/lib/x64/vs2019;$(SolutionDir)\$(Platform)\$(Configuration) - fmt.lib;sdl2.lib;sdl2main.lib;SDL2_image.lib;shlwapi.lib;sigc-vc140-2_0.lib;%(AdditionalDependencies) - - - - - NotUsing - Level3 - MaxSpeed - true - true - true - _ITERATOR_DEBUG_LEVEL=0;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../contrib/imgui;../../contrib/lua - stdcpp17 - - - Console - true - true - true - ../../win32/lib;../../../../pioneer-thirdparty/win32/lib/x64/vs2019;$(SolutionDir)\$(Platform)\$(Configuration) - fmt.lib;sdl2.lib;sdl2main.lib;SDL2_image.lib;shlwapi.lib;sigc-vc140-2_0.lib;%(AdditionalDependencies) - - - - - - \ No newline at end of file diff --git a/win32/vs2019/savedump/savedump.vcxproj.filters b/win32/vs2019/savedump/savedump.vcxproj.filters deleted file mode 100644 index f4cf1164656..00000000000 --- a/win32/vs2019/savedump/savedump.vcxproj.filters +++ /dev/null @@ -1,58 +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 - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/win32/vs2019/terrain/terrain.vcxproj b/win32/vs2019/terrain/terrain.vcxproj deleted file mode 100644 index 374e949513a..00000000000 --- a/win32/vs2019/terrain/terrain.vcxproj +++ /dev/null @@ -1,199 +0,0 @@ - - - - - Debug - x64 - - - PreRelease - x64 - - - Profile - x64 - - - Release - x64 - - - - {64F034A3-B40E-4D42-ADDD-E2EE42ED517F} - terrain - 10.0 - - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - false - false - Unicode - v142 - - - StaticLibrary - false - false - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - ../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../../contrib/lua - -Zm137 %(AdditionalOptions) - _ITERATOR_DEBUG_LEVEL=0;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - stdcpp17 - - - - - - true - true - true - - - ../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../../contrib/lua - NotUsing - NotSet - _ITERATOR_DEBUG_LEVEL=0;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions) - stdcpp17 - - - - - - true - true - true - - - ../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../../contrib/lua - _ITERATOR_DEBUG_LEVEL=0;PIONEER_PROFILER;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions) - NotSet - stdcpp17 - - - - - - true - true - true - - - ../../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib;../../../contrib/lua - NotSet - _ITERATOR_DEBUG_LEVEL=0;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - stdcpp17 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/win32/vs2019/terrain/terrain.vcxproj.filters b/win32/vs2019/terrain/terrain.vcxproj.filters deleted file mode 100644 index dd201412fb0..00000000000 --- a/win32/vs2019/terrain/terrain.vcxproj.filters +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/win32/vs2019/text/text.vcxproj b/win32/vs2019/text/text.vcxproj deleted file mode 100644 index 265017d2cef..00000000000 --- a/win32/vs2019/text/text.vcxproj +++ /dev/null @@ -1,146 +0,0 @@ - - - - - Debug - x64 - - - PreRelease - x64 - - - Profile - x64 - - - Release - x64 - - - - {06E6CE3D-9163-453B-BF8D-3B9DECB5AB78} - text - 10.0 - - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - false - false - Unicode - v142 - - - StaticLibrary - false - false - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - ../../../contrib/fmt/include;../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib - -Zm137 %(AdditionalOptions) - _ITERATOR_DEBUG_LEVEL=0;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - stdcpp17 - - - - - - true - true - true - - - ../../../contrib/fmt/include;../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib - NotUsing - NotSet - _ITERATOR_DEBUG_LEVEL=0;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions) - stdcpp17 - - - - - - true - true - true - - - ../../../contrib/fmt/include;../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib - _ITERATOR_DEBUG_LEVEL=0;PIONEER_PROFILER;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions) - NotSet - stdcpp17 - - - - - - true - true - true - - - ../../../contrib/fmt/include;../../contrib/fmt/include;../../../src;../../src;../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include;../../../../pioneer-thirdparty/win32/include/sigc++-2.0;../../win32/include;../../include;../../../contrib;../../contrib - NotSet - _ITERATOR_DEBUG_LEVEL=0;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - stdcpp17 - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/win32/vs2019/text/text.vcxproj.filters b/win32/vs2019/text/text.vcxproj.filters deleted file mode 100644 index 4d5c5eb58db..00000000000 --- a/win32/vs2019/text/text.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file