From b0753901ec9f674d180988f624116ab0ea22546a Mon Sep 17 00:00:00 2001 From: Andriy Svyryd Date: Mon, 22 Apr 2019 22:11:48 -0700 Subject: [PATCH] React to PR feedback --- .gitignore | 17 +---------------- MSVC_BUILD_INSTRUCTIONS.md | 16 ++++++++++++++++ README.md | 18 +----------------- 3 files changed, 18 insertions(+), 33 deletions(-) create mode 100644 MSVC_BUILD_INSTRUCTIONS.md diff --git a/.gitignore b/.gitignore index 5ee8166..3a76f4c 100644 --- a/.gitignore +++ b/.gitignore @@ -14,19 +14,4 @@ *~ /steam_appid.txt /*.so -/breakhack*.run -/config.h -/CMakeCache.txt -/CPackSourceConfig.cmake -/CPackConfig.cmake -cmake_install.cmake -/install_manifest_* -*.stamp* -*.vcxproj* -*.sln* -CMakeFiles/ -Release/ -Debug/ -/Win32/ -/breakhack.dir/ -/package/ \ No newline at end of file +/breakhack*.run \ No newline at end of file diff --git a/MSVC_BUILD_INSTRUCTIONS.md b/MSVC_BUILD_INSTRUCTIONS.md new file mode 100644 index 0000000..67ae2eb --- /dev/null +++ b/MSVC_BUILD_INSTRUCTIONS.md @@ -0,0 +1,16 @@ +Compile on Windows with Visual Studio +------------------------------------- + +1. Install [Visual Studio Community 2019](https://visualstudio.microsoft.com/vs/community/) with the "Desktop development with C++" workload +2. Install [CMake](https://cmake.org/download/) +3. Install [NSIS](https://nsis.sourceforge.io/Download) +4. Download and unzip [SDL2-devel-2.x.x-VC.zip](https://www.libsdl.org/download-2.0.php), [SDL2_image-devel-2.x.x-VC.zip](https://www.libsdl.org/projects/SDL_image/), [SDL2_mixer-devel-2.x.x-VC.zip](https://www.libsdl.org/projects/SDL_mixer/), [SDL2_ttf-devel-2.x.x-VC.zip](https://www.libsdl.org/projects/SDL_ttf/) +5. Open Developer Command Prompt for VS 2019 and run the following, substituting paths as appropriate: +```batch +SET SDL2DIR=C:\repos\breakhackBuild\SDL2-2.0.9 +SET SDL2MIXERDIR=C:\repos\breakhackBuild\SDL2_mixer-2.0.4 +SET SDL2_IMAGE=C:\repos\breakhackBuild\SDL2_image-2.0.4 +SET SDLTTFDIR=C:\repos\breakhackBuild\SDL2_ttf-2.0.15 +cmake -S C:\repos\breakhack -B C:\repos\breakhackBuild +cmake --build C:\repos\breakhackBuild --target package --config Release +``` \ No newline at end of file diff --git a/README.md b/README.md index a15fb08..67ce2cf 100644 --- a/README.md +++ b/README.md @@ -57,23 +57,7 @@ cmake -DCMAKE_BUILD_TYPE=Debug .. # Build type flag is optional make ``` -Compile on Windows ------------------- - -1. Install [Visual Studio Community 2019](https://visualstudio.microsoft.com/vs/community/) with the "Desktop development with C++" workload -2. Install [CMake](https://cmake.org/download/) -3. Install [NSIS](https://nsis.sourceforge.io/Download) -4. Download and unzip [SDL2-devel-2.x.x-VC.zip](https://www.libsdl.org/download-2.0.php), [SDL2_image-devel-2.x.x-VC.zip](https://www.libsdl.org/projects/SDL_image/), [SDL2_mixer-devel-2.x.x-VC.zip](https://www.libsdl.org/projects/SDL_mixer/), [SDL2_ttf-devel-2.x.x-VC.zip](https://www.libsdl.org/projects/SDL_ttf/) -5. Open Developer Command Prompt for VS 2019 and run the following, substituting paths as appropriate: -```batch -cd C:\repos\breakhack -SET SDL2DIR=C:/SDL2/SDL2-2.0.9 -SET SDL2MIXERDIR=C:/SDL2/SDL2_mixer-2.0.4 -SET SDL2_IMAGE=C:/SDL2/SDL2_image-2.0.4 -SET SDLTTFDIR=C:/SDL2/SDL2_ttf-2.0.15 -cmake . -cmake --build . --target package --config Release -``` +Also see [compilation instructions for Windows](MSVC_BUILD_INSTRUCTIONS.md). Contribute ----------