(#612) Remove conan integration
parent
e615890aab
commit
8644b5a91f
|
@ -1,12 +1,6 @@
|
|||
cmake_minimum_required(VERSION 3.2)
|
||||
project(nothing)
|
||||
|
||||
if(WIN32)
|
||||
# Conan integration
|
||||
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
|
||||
conan_basic_setup()
|
||||
endif()
|
||||
|
||||
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
|
||||
|
||||
find_package(SDL2 REQUIRED)
|
||||
|
|
28
README.md
28
README.md
|
@ -144,31 +144,9 @@ $ make
|
|||
|
||||
## Build on Windows
|
||||
|
||||
You need to install [conan][] and [Visual Studio 2017][visual-studio].
|
||||
TBD
|
||||
|
||||
### Dependencies
|
||||
|
||||
Current version of [SDL2/2.0.5@lasote/stable][conan-sdl2] in the conan-transit
|
||||
repository is not compatible with the latest conan, so you'll need to install
|
||||
it locally from the git repository:
|
||||
|
||||
```console
|
||||
$ git clone https://github.com/lasote/conan-sdl2.git # temporary, I hope hope hope
|
||||
$ cd conan-sdl2
|
||||
$ conan export SDL2/2.0.5@lasote/stable
|
||||
```
|
||||
|
||||
### Building
|
||||
|
||||
Execute the following commands inside of the `nothing` directory:
|
||||
|
||||
```console
|
||||
$ conan install --build missing --install-folder build
|
||||
$ cd build
|
||||
$ cmake .. -G "Visual Studio 15 2017 Win64"
|
||||
```
|
||||
|
||||
After that, build the `build/nothing.sln` file with Visual Studio.
|
||||
<!-- TODO: Windows build is not documented -->
|
||||
|
||||
## Support
|
||||
|
||||
|
@ -177,8 +155,6 @@ You can support my work via
|
|||
- Twitch channel: https://www.twitch.tv/subs/tsoding
|
||||
- Patreon: https://www.patreon.com/tsoding
|
||||
|
||||
[conan]: https://www.conan.io/
|
||||
[conan-sdl2]: https://bintray.com/conan/conan-transit/SDL2%3Alasote/2.0.5%3Astable
|
||||
[visual-studio]: https://www.visualstudio.com/
|
||||
[svg2rects.py]: ./devtools/svg2rects.py
|
||||
[./levels/]: ./levels/
|
||||
|
|
Loading…
Reference in New Issue