cemu config & last working commit

This commit is contained in:
unknown 2020-07-26 19:55:03 +02:00
parent 5a4e2c0484
commit 77b9205a1b
7 changed files with 87 additions and 1 deletions

View File

@ -12,6 +12,12 @@ target_include_directories(
$<INSTALL_INTERFACE:include>
)
find_package(glm CONFIG REQUIRED)
if(NOT GLM_FOUND)
message(Error "GLM not found")
endif(NOT GLM_FOUND)
target_link_libraries(${PROJECT_NAME} PRIVATE glm)
target_sources(
${PROJECT_NAME}
PRIVATE

48
ports/imgui/config.patch Normal file
View File

@ -0,0 +1,48 @@
From bc61e1cd9cbc80cd44fc905393a5278d14dfae8f Mon Sep 17 00:00:00 2001
From: unknown <aaa@bbb.cccdeef>
Date: Sun, 26 Jul 2020 18:27:09 +0200
Subject: [PATCH] config
---
imconfig.h | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/imconfig.h b/imconfig.h
index c6817de7..9346f958 100644
--- a/imconfig.h
+++ b/imconfig.h
@@ -24,7 +24,7 @@
//#define IMGUI_API __declspec( dllimport )
//---- Don't define obsolete functions/enums/behaviors. Consider enabling from time to time after updating to avoid using soon-to-be obsolete function/names.
-//#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS
+#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS
//---- Disable all of Dear ImGui or don't implement standard windows.
// It is very strongly recommended to NOT disable the demo windows during development. Please read comments in imgui_demo.cpp.
@@ -64,15 +64,16 @@
//---- Define constructor and implicit cast operators to convert back<>forth between your math types and ImVec2/ImVec4.
// This will be inlined as part of ImVec2 and ImVec4 class declarations.
-/*
+#include <glm/vec2.hpp>
+#include <glm/vec4.hpp>
#define IM_VEC2_CLASS_EXTRA \
- ImVec2(const MyVec2& f) { x = f.x; y = f.y; } \
- operator MyVec2() const { return MyVec2(x,y); }
+ ImVec2(const glm::vec2& f) { x = f.x; y = f.y; } \
+ operator glm::vec2() const { return glm::vec2(x,y); }
#define IM_VEC4_CLASS_EXTRA \
- ImVec4(const MyVec4& f) { x = f.x; y = f.y; z = f.z; w = f.w; } \
- operator MyVec4() const { return MyVec4(x,y,z,w); }
-*/
+ ImVec4(const glm::vec4& f) { x = f.x; y = f.y; z = f.z; w = f.w; } \
+ operator glm::vec4() const { return glm::vec4(x,y,z,w); }
+
//---- Use 32-bit vertex indices (default is 16-bit) is one way to allow large meshes with more than 64K vertices.
// Your renderer back-end will need to support it (most example renderer back-ends support both 16/32-bit indices).
--
2.27.0.windows.1

View File

@ -6,6 +6,7 @@ vcpkg_from_github(
REF v1.77
SHA512 d5ebf4bb5e1ce83b226f2e68b3afe0f0abaeb55245fedf754e5453afd8d1df4dac8b5c47fc284c2588b40d05a55fc191b5e55c7be279c5e5e23f7c5b70150546
HEAD_REF master
PATCHES config.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})

View File

@ -0,0 +1,13 @@
diff --git a/src/pugiconfig.hpp b/src/pugiconfig.hpp
index ff89716..83b3818 100644
--- a/src/pugiconfig.hpp
+++ b/src/pugiconfig.hpp
@@ -44,7 +44,7 @@
// #define PUGIXML_HEADER_ONLY
// Uncomment this to enable long long support
-// #define PUGIXML_HAS_LONG_LONG
+#define PUGIXML_HAS_LONG_LONG
#endif

View File

@ -4,7 +4,7 @@ vcpkg_from_github(
REF v1.10
SHA512 0634053d4f757b9293997763bb2e51595197c192f3974e954975d6d6ff91e4a6cb7c194efa530e0eef1a2a93db16592c5630010b6482430dff5ffc6879e84b6a
HEAD_REF master
PATCHES pugixml-v1.10_fix_debug_pkgconfig.patch # Upstream: https://github.com/zeux/pugixml/pull/363
PATCHES config.patch pugixml-v1.10_fix_debug_pkgconfig.patch # Upstream: https://github.com/zeux/pugixml/pull/363
)
vcpkg_configure_cmake(

View File

@ -32,6 +32,23 @@ vcpkg_configure_cmake(
-DwxUSE_LIBTIFF=sys
-DwxUSE_STL=ON
-DwxBUILD_DISABLE_PLATFORM_LIB_DIR=ON
-DWXWIN_COMPATIBILITY_3_0=OFF
-DwxUSE_STD_CONTAINERS=ON
-DwxUSE_SOCKETS=OFF
-DwxUSE_IPV6=OFF
-DwxUSE_FS_ZIP=OFF
-DwxUSE_FS_ARCHIVE=OFF
-DwxUSE_FS_INET=OFF
-DwxUSE_ARCHIVE_STREAMS=OFF
-DwxUSE_ZIPSTREAM=OFF
-DwxUSE_TARSTREAM=OFF
-DwxUSE_PROTOCOL=OFF
-DwxUSE_PROTOCOL_FTP=OFF
-DwxUSE_PROTOCOL_HTTP=OFF
-DwxUSE_URL=OFF
-DwxUSE_SOUND=OFF
-DwxUSE_WEBVIEW=OFF
-DwxUSE_RICHTEXT=OFF
${OPTIONS}
)

View File

@ -1,3 +1,4 @@
set(VCPKG_TARGET_ARCHITECTURE x64)
set(VCPKG_CRT_LINKAGE static)
set(VCPKG_LIBRARY_LINKAGE static)
set(VCPKG_PLATFORM_TOOLSET v141)