React to PR feedback

This commit is contained in:
Andriy Svyryd 2019-04-22 22:11:48 -07:00 committed by Linus Probert
parent 86e6f66b58
commit b0753901ec
3 changed files with 18 additions and 33 deletions

17
.gitignore vendored
View File

@ -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/
/breakhack*.run

View File

@ -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
```

View File

@ -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
----------