Backups/librw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix cmake build

Browse Source
This commit is contained in:
withmorten 2021-08-17 23:29:20 +02:00
parent 57559969f7
commit f150f91a16
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.appveyor.yml
View File

@ -1,11 +1,11 @@
image: Visual Studio 2017 image: Visual Studio 2017
configuration: Release configuration: Release
environment: environment:
GLFW_BASE: glfw-3.3.4.bin.WIN64 GLFW_BASE: glfw-3.2.1.bin.WIN64
GLFW_URL: https://github.com/glfw/glfw/releases/download/3.3.4/%GLFW_BASE%.zip GLFW_URL: https://github.com/glfw/glfw/releases/download/3.2.1/%GLFW_BASE%.zip
SDL2_BASE: SDL2-devel-2.0.14-VC SDL2_BASE: SDL2-devel-2.0.8-VC
SDL2_URL: https://www.libsdl.org/release/%SDL2_BASE%.zip SDL2_URL: https://www.libsdl.org/release/%SDL2_BASE%.zip
SDL2_DIRAME: SDL2-2.0.14 SDL2_DIRAME: SDL2-2.0.8
PREMAKE5_URL: https://github.com/premake/premake-core/releases/download/v5.0.0-alpha16/premake-5.0.0-alpha16-windows.zip PREMAKE5_URL: https://github.com/premake/premake-core/releases/download/v5.0.0-alpha16/premake-5.0.0-alpha16-windows.zip
matrix: matrix:
- PLATFORM: win-amd64-null - PLATFORM: win-amd64-null

4
.github/workflows/build-cmake-conan.yml vendored
View File

@ -8,11 +8,11 @@ jobs:
build-cmake: build-cmake:
strategy: strategy:
matrix: matrix:
os: [windows-latest, ubuntu-latest, macos-latest] os: [windows-latest, ubuntu-18.04, macos-latest]
platform: ['null', 'gl3', 'd3d9'] platform: ['null', 'gl3', 'd3d9']
gl3_gfxlib: ['glfw', 'sdl2'] gl3_gfxlib: ['glfw', 'sdl2']
exclude: exclude:
- os: ubuntu-latest - os: ubuntu-18.04
platform: d3d9 platform: d3d9
- os: macos-latest - os: macos-latest
platform: d3d9 platform: d3d9

4
CMakeLists.txt
View File

@ -65,8 +65,8 @@ endif()
add_subdirectory(src) add_subdirectory(src)
if(NOT LIBRW_PLATFORM_PS2 AND NOT LIBRW_PLATFORM_NULL) if(LIBRW_TOOLS AND NOT LIBRW_PLATFORM_PS2 AND NOT LIBRW_PLATFORM_NULL)
add_subdirectory(skeleton) add_subdirectory(skeleton)
endif() endif()
add_subdirectory(tools) add_subdirectory(tools)

2
conanfile.py
View File

@ -108,7 +108,7 @@ class LibrwConan(ConanFile):
env = {} env = {}
cmake.definitions["LIBRW_PLATFORM"] = self._librw_platform cmake.definitions["LIBRW_PLATFORM"] = self._librw_platform
cmake.definitions["LIBRW_INSTALL"] = True cmake.definitions["LIBRW_INSTALL"] = True
cmake.definitions["LIBRW_TOOLS"] = True cmake.definitions["LIBRW_TOOLS"] = False
if self.options.platform == "gl3": if self.options.platform == "gl3":
cmake.definitions["LIBRW_GL3_GFXLIB"] = str(self.options.gl3_gfxlib).upper() cmake.definitions["LIBRW_GL3_GFXLIB"] = str(self.options.gl3_gfxlib).upper()
if self._os_is_playstation2: if self._os_is_playstation2: