Conjure/conjure-engine
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CONGE-1 Fixed some issues to make it cross compatible with clion, vscode and vs studio

Browse Source
This commit is contained in:
Jimmy Tremblay-Bernier 2024-11-21 16:13:11 -05:00
parent af2d1c0683
commit 9766eb80cf
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -11,4 +11,5 @@ build.ninja
cmake_install.cmake cmake_install.cmake
CMakeCache.txt CMakeCache.txt
CMakeUserPresets.json CMakeUserPresets.json
.ninja* .ninja*
.vs/

6
CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.29) cmake_minimum_required(VERSION 3.26)
project(ConjureEngineProject) project(ConjureEngineProject)
set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD 20)
@ -18,9 +18,9 @@ endif()
set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/build) set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/build)
# Include the Conan-generated files # Include the Conan-generated files
list(APPEND CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/generators") list(APPEND CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR}/generators")
include("${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/generators/conan_toolchain.cmake") include("${CMAKE_BINARY_DIR}/generators/conan_toolchain.cmake")
# Set common output directories # Set common output directories

6
Configure.bat
View File

@ -1,8 +1,10 @@
@REM Run Conan to install dependencies @REM Run Conan to install dependencies
rmdir build /s /q rmdir build /s /q
mkdir build
@REM DEBUG @REM DEBUG
conan install . -c tools.cmake.cmaketoolchain:generator=Msbuild -s build_type=Debug --build=missing conan install . -s build_type=Debug --build=missing
@REM RELEASE @REM RELEASE
conan install . -c tools.cmake.cmaketoolchain:generator=Msbuild -s build_type=Release --build=missing conan install . -s build_type=Release --build=missing

7
ConjureEngine/CMakeLists.txt
View File

@ -1,8 +1,11 @@
cmake_minimum_required(VERSION 3.29) cmake_minimum_required(VERSION 3.26)
project(ConjureEngine)
set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD 20)
project(ConjureEngine)
find_package(glm REQUIRED) find_package(glm REQUIRED)
find_package(SDL2 REQUIRED) find_package(SDL2 REQUIRED)
find_package(Vulkan REQUIRED) find_package(Vulkan REQUIRED)

2
Demo1/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.29) cmake_minimum_required(VERSION 3.26)
project(Demo1) project(Demo1)
set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD 20)