Skip to content

Commit

Permalink
Merge pull request #187 from TheNitesWhoSay/development
Browse files Browse the repository at this point in the history
1.06 - Remastered Skins & CMake
  • Loading branch information
TheNitesWhoSay authored Sep 6, 2024
2 parents fc6c778 + 4a02cbd commit 8aa818c
Show file tree
Hide file tree
Showing 1,895 changed files with 92,906 additions and 2,932,178 deletions.
6 changes: 6 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"files.exclude": {
"**/edit_resource.sln": true,
"**/edit_resource.vcxproj": true
}
}
41 changes: 41 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Compile the Chkdraft executable, the sub-libraries (Chkdraft, CrossCut, MappingCore, Windows), and their respective test exectuables
cmake_minimum_required (VERSION 3.20)

cmake_policy(SET CMP0091 NEW)
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
set(VCPKG_TARGET_TRIPLET x64-windows-static)
set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake")

set(This ChkdraftWithTests)

project(${This})

set(CMAKE_BUILD_PARALLEL_LEVEL)
set(CMAKE_C_STANDARD 99)
set(CMAKE_CXX_STANDARD 20)
add_compile_options(/permissive-)
add_compile_definitions(_UNICODE UNICODE NOMINMAX CHKDRAFT)

include(FetchContent)
FetchContent_Declare(
rarecpp
GIT_REPOSITORY https://github.com/TheNitesWhoSay/RareCpp.git
GIT_TAG 21ba359 # release-2.3.3
)
FetchContent_MakeAvailable(rarecpp)
include_directories(${rarecpp_SOURCE_DIR}/include)

find_package(Freetype REQUIRED)
get_target_property(FREETYPE_INCLUDE_DIRS freetype INTERFACE_INCLUDE_DIRECTORIES)
include_directories(${FREETYPE_INCLUDE_DIRS})

find_package(harfbuzz CONFIG REQUIRED)
get_target_property(HARFBUZZ_INCLUDE_DIRS harfbuzz::harfbuzz INTERFACE_INCLUDE_DIRECTORIES)
include_directories(${HARFBUZZ_INCLUDE_DIRS})

find_package(glm CONFIG REQUIRED)

enable_testing()

add_subdirectory(src) # Compiles the Chkdraft executable & static libraries
add_subdirectory(test) # Compiles the Chkdraft test executables
27 changes: 27 additions & 0 deletions CMakeSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"configurations": [
{
"name": "x64-Debug",
"generator": "Ninja",
"configurationType": "Debug",
"inheritEnvironments": [ "msvc_x64_x64" ],
"buildRoot": "${projectDir}\\out\\build\\${name}",
"installRoot": "${projectDir}\\out\\install\\${name}",
"cmakeCommandArgs": "",
"buildCommandArgs": "",
"ctestCommandArgs": ""
},
{
"name": "x64-Release",
"generator": "Ninja",
"configurationType": "Release",
"buildRoot": "${projectDir}\\out\\build\\${name}",
"installRoot": "${projectDir}\\out\\install\\${name}",
"cmakeCommandArgs": "",
"buildCommandArgs": "",
"ctestCommandArgs": "",
"inheritEnvironments": [ "msvc_x64_x64" ],
"variables": []
}
]
}
19 changes: 0 additions & 19 deletions CascLib/.gitattributes

This file was deleted.

51 changes: 0 additions & 51 deletions CascLib/.gitignore

This file was deleted.

187 changes: 0 additions & 187 deletions CascLib/CMakeLists.txt

This file was deleted.

Loading

0 comments on commit 8aa818c

Please sign in to comment.