From 92a95eecc7f89717925ec33ae3e3d97ac0378613 Mon Sep 17 00:00:00 2001 From: Mr-Wiseguy Date: Mon, 18 Dec 2023 19:10:15 -0500 Subject: [PATCH] Add freetype binary git submodule to replace vcpkg --- .gitmodules | 3 +++ CMakeLists.txt | 3 +-- lib/FindFreetype.cmake | 2 ++ lib/freetype-windows-binaries | 1 + vcpkg-configuration.json | 14 -------------- vcpkg.json | 6 ------ 6 files changed, 7 insertions(+), 22 deletions(-) create mode 100644 lib/FindFreetype.cmake create mode 160000 lib/freetype-windows-binaries delete mode 100644 vcpkg-configuration.json delete mode 100644 vcpkg.json diff --git a/.gitmodules b/.gitmodules index 2a8708b..649f911 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "lib/RT64-HLE"] path = lib/RT64-HLE url = https://github.com/DarioSamo/RT64-HLE/ +[submodule "lib/freetype-windows-binaries"] + path = lib/freetype-windows-binaries + url = https://github.com/ubawurinna/freetype-windows-binaries diff --git a/CMakeLists.txt b/CMakeLists.txt index beacf4f..d35c226 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ endif() set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) -find_package(Freetype REQUIRED) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/lib/") add_subdirectory(${CMAKE_SOURCE_DIR}/lib/RT64-HLE ${CMAKE_BINARY_DIR}/rt64) add_subdirectory(${CMAKE_SOURCE_DIR}/lib/RmlUi) @@ -149,7 +149,6 @@ target_link_libraries(MMRecomp PRIVATE RecompiledFuncs SDL2 rt64 - Freetype::Freetype RmlCore RmlDebugger nfd diff --git a/lib/FindFreetype.cmake b/lib/FindFreetype.cmake new file mode 100644 index 0000000..e2d9e2c --- /dev/null +++ b/lib/FindFreetype.cmake @@ -0,0 +1,2 @@ +set(FREETYPE_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/lib/freetype-windows-binaries/include) +set(FREETYPE_LIBRARIES "${CMAKE_SOURCE_DIR}/lib/freetype-windows-binaries/release static/vs2015-2022/win64/freetype.lib") diff --git a/lib/freetype-windows-binaries b/lib/freetype-windows-binaries new file mode 160000 index 0000000..d6fb49d --- /dev/null +++ b/lib/freetype-windows-binaries @@ -0,0 +1 @@ +Subproject commit d6fb49d11a9d0011bf4ecfe7e570beaaa189838a diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json deleted file mode 100644 index 83dd23a..0000000 --- a/vcpkg-configuration.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "default-registry": { - "kind": "git", - "baseline": "84df5613f71eda8a73ab08dc3041f3af7103a5b2", - "repository": "https://github.com/microsoft/vcpkg" - }, - "registries": [ - { - "kind": "artifact", - "location": "https://aka.ms/vcpkg-ce-default", - "name": "microsoft" - } - ] -} diff --git a/vcpkg.json b/vcpkg.json deleted file mode 100644 index 22fe2da..0000000 --- a/vcpkg.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", - "dependencies": [ - "freetype" - ] -}