This commit is contained in:
Cheney-Wang 2024-11-18 23:28:13 -08:00
parent 21ad552fef
commit 3e963492bb
3 changed files with 24 additions and 24 deletions

View File

@ -1,22 +1,22 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f29be95..1310f91 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,7 +163,7 @@ if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr" OR "${CMAKE_INSTALL_PREFIX}" STREQU
endif()
# Installation paths
-if(UNIX AND SYSTEM_DIR_INSTALL)
+if(1)
# Install into the system (/usr/bin or /usr/local/bin)
set(INSTALL_ROOT "share/${project}") # /usr/[local]/share/<project>
set(INSTALL_CMAKE "share/${project}/cmake") # /usr/[local]/share/<project>/cmake
@@ -176,7 +176,7 @@ if(UNIX AND SYSTEM_DIR_INSTALL)
set(INSTALL_DOC "share/doc/${project}") # /usr/[local]/share/doc/<project>
set(INSTALL_SHORTCUTS "share/applications") # /usr/[local]/share/applications
set(INSTALL_ICONS "share/pixmaps") # /usr/[local]/share/pixmaps
- set(INSTALL_INIT "/etc/init") # /etc/init (upstart init scripts)
+ set(INSTALL_INIT "etc/init") # etc/init (upstart init scripts)
else()
# Install into local directory
set(INSTALL_ROOT ".") # ./
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f29be95..1310f91 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,7 +163,7 @@ if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr" OR "${CMAKE_INSTALL_PREFIX}" STREQU
endif()
# Installation paths
-if(UNIX AND SYSTEM_DIR_INSTALL)
+if(1)
# Install into the system (/usr/bin or /usr/local/bin)
set(INSTALL_ROOT "share/${project}") # /usr/[local]/share/<project>
set(INSTALL_CMAKE "share/${project}/cmake") # /usr/[local]/share/<project>/cmake
@@ -176,7 +176,7 @@ if(UNIX AND SYSTEM_DIR_INSTALL)
set(INSTALL_DOC "share/doc/${project}") # /usr/[local]/share/doc/<project>
set(INSTALL_SHORTCUTS "share/applications") # /usr/[local]/share/applications
set(INSTALL_ICONS "share/pixmaps") # /usr/[local]/share/pixmaps
- set(INSTALL_INIT "/etc/init") # /etc/init (upstart init scripts)
+ set(INSTALL_INIT "etc/init") # etc/init (upstart init scripts)
else()
# Install into local directory
set(INSTALL_ROOT ".") # ./

View File

@ -25,7 +25,7 @@ index 3ad2c25..3e98a9a 100644
+#ifdef WINDOWS_STORE
+ static auto module = ::LoadPackagedLibrary(_T("OPENGL32.DLL"), 0);
+#else
+ static auto module = ::LoadLibrary(_T("OPENGL32.DLL"));
+ static auto module = ::LoadLibrary(_T("OPENGL32.DLL"));
+#endif
// Prevent static linking of opengl32

View File

@ -1,7 +1,7 @@
{
"versions": [
{
"git-tree": "ca265991eb42f44963c516f5bd8a0f16d4082366",
"git-tree": "6c42ceff3df465ea0e40a1a9f7f5a0ae06e1cff0",
"version": "3.3.0",
"port-version": 0
},