blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 04:00:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #488 from dpaulat/feature/dependency-cleanup

Browse source 
GLEW/GLU Dependency Cleanup
This commit is contained in:
Dan Paulat 2025-07-16 06:59:39 -05:00 • committed by GitHub
commit 73beea8842
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ACKNOWLEDGEMENTS.md
View file

@ -24,7 +24,6 @@ Supercell Wx uses code from the following dependencies:
| [GeographicLib](https://geographiclib.sourceforge.io/) | [MIT License](https://spdx.org/licenses/MIT.html) | | [GeographicLib](https://geographiclib.sourceforge.io/) | [MIT License](https://spdx.org/licenses/MIT.html) |
| [geos](https://libgeos.org/) | [GNU Lesser General Public License v2.1 or later](https://spdx.org/licenses/LGPL-2.1-or-later.html) | | [geos](https://libgeos.org/) | [GNU Lesser General Public License v2.1 or later](https://spdx.org/licenses/LGPL-2.1-or-later.html) |
| [GLAD](https://github.com/Dav1dde/glad) | [MIT License](https://spdx.org/licenses/MIT.html) | | [GLAD](https://github.com/Dav1dde/glad) | [MIT License](https://spdx.org/licenses/MIT.html) |
| [GLEW](https://www.opengl.org/sdk/libs/GLEW/) | [MIT License](https://spdx.org/licenses/MIT.html) |
| [GLM](https://github.com/g-truc/glm) | [MIT License](https://spdx.org/licenses/MIT.html) | | [GLM](https://github.com/g-truc/glm) | [MIT License](https://spdx.org/licenses/MIT.html) |
| [GoogleTest](https://google.github.io/googletest/) | [BSD 3-Clause "New" or "Revised" License](https://spdx.org/licenses/BSD-3-Clause.html) | | [GoogleTest](https://google.github.io/googletest/) | [BSD 3-Clause "New" or "Revised" License](https://spdx.org/licenses/BSD-3-Clause.html) |
| [HSLuv](https://www.hsluv.org/) | [MIT License](https://spdx.org/licenses/MIT.html) | | [HSLuv](https://www.hsluv.org/) | [MIT License](https://spdx.org/licenses/MIT.html) |
@ -33,6 +32,7 @@ Supercell Wx uses code from the following dependencies:
| [libpng](http://libpng.org/pub/png/libpng.html) | [PNG Reference Library version 2](https://spdx.org/licenses/libpng-2.0.html) | | [libpng](http://libpng.org/pub/png/libpng.html) | [PNG Reference Library version 2](https://spdx.org/licenses/libpng-2.0.html) |
| [libxml2](http://xmlsoft.org/) | [MIT License](https://spdx.org/licenses/MIT.html) | | [libxml2](http://xmlsoft.org/) | [MIT License](https://spdx.org/licenses/MIT.html) |
| [MapLibre Native](https://maplibre.org/projects/maplibre-native/) | [BSD 2-Clause "Simplified" License](https://spdx.org/licenses/BSD-2-Clause.html) | | [MapLibre Native](https://maplibre.org/projects/maplibre-native/) | [BSD 2-Clause "Simplified" License](https://spdx.org/licenses/BSD-2-Clause.html) |
| [Mesa 3D](https://mesa3d.org/) | [MIT License](https://spdx.org/licenses/MIT.html) |
| [nunicode](https://bitbucket.org/alekseyt/nunicode/src/master/) | [MIT License](https://spdx.org/licenses/MIT.html) | Modified for MapLibre Native | | [nunicode](https://bitbucket.org/alekseyt/nunicode/src/master/) | [MIT License](https://spdx.org/licenses/MIT.html) | Modified for MapLibre Native |
| [OpenSSL](https://www.openssl.org/) | [OpenSSL License](https://spdx.org/licenses/OpenSSL.html) | | [OpenSSL](https://www.openssl.org/) | [OpenSSL License](https://spdx.org/licenses/OpenSSL.html) |
| [Qt](https://www.qt.io/) | [GNU Lesser General Public License v3.0 only](https://spdx.org/licenses/LGPL-3.0-only.html) | Qt Core, Qt GUI, Qt Multimedia, Qt Network, Qt OpenGL, Qt Positioning, Qt Serial Port, Qt SQL, Qt SVG, Qt Widgets<br/>Additional Licenses: https://doc.qt.io/qt-6/licenses-used-in-qt.html | | [Qt](https://www.qt.io/) | [GNU Lesser General Public License v3.0 only](https://spdx.org/licenses/LGPL-3.0-only.html) | Qt Core, Qt GUI, Qt Multimedia, Qt Network, Qt OpenGL, Qt Positioning, Qt Serial Port, Qt SQL, Qt SVG, Qt Widgets<br/>Additional Licenses: https://doc.qt.io/qt-6/licenses-used-in-qt.html |

4
conanfile.py
View file

@ -11,7 +11,6 @@ class SupercellWxConan(ConanFile):
"freetype/2.13.2", "freetype/2.13.2",
"geographiclib/2.4", "geographiclib/2.4",
"geos/3.13.0", "geos/3.13.0",
"glew/2.2.0",
"glm/1.0.1", "glm/1.0.1",
"gtest/1.16.0", "gtest/1.16.0",
"libcurl/8.12.1", "libcurl/8.12.1",
@ -42,8 +41,7 @@ class SupercellWxConan(ConanFile):
def requirements(self): def requirements(self):
if self.settings.os == "Linux": if self.settings.os == "Linux":
self.requires("onetbb/2022.0.0") self.requires("mesa-glu/9.0.3")
elif self.settings.os == "Macos":
self.requires("onetbb/2022.0.0") self.requires("onetbb/2022.0.0")
def generate(self): def generate(self):

15
scwx-qt/scwx-qt.cmake
View file

@ -17,8 +17,8 @@ find_package(Boost)
find_package(Fontconfig) find_package(Fontconfig)
find_package(geographiclib) find_package(geographiclib)
find_package(geos) find_package(geos)
find_package(GLEW)
find_package(glm) find_package(glm)
find_package(OpenGL)
find_package(Python COMPONENTS Interpreter) find_package(Python COMPONENTS Interpreter)
find_package(SQLite3) find_package(SQLite3)
@ -662,6 +662,11 @@ if (LINUX)
target_compile_definitions(supercell-wx PRIVATE QT_NO_EMIT) target_compile_definitions(supercell-wx PRIVATE QT_NO_EMIT)
endif() endif()
if (APPLE)
target_compile_definitions(scwx-qt PRIVATE GL_SILENCE_DEPRECATION)
target_compile_definitions(supercell-wx PRIVATE GL_SILENCE_DEPRECATION)
endif()
target_include_directories(scwx-qt PUBLIC ${scwx-qt_SOURCE_DIR}/source target_include_directories(scwx-qt PUBLIC ${scwx-qt_SOURCE_DIR}/source
${FTGL_INCLUDE_DIR} ${FTGL_INCLUDE_DIR}
${IMGUI_INCLUDE_DIRS} ${IMGUI_INCLUDE_DIRS}
@ -729,6 +734,13 @@ if (LINUX)
target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::WaylandClient) target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::WaylandClient)
endif() endif()
if (LINUX)
find_package(mesa-glu REQUIRED)
target_link_libraries(scwx-qt PUBLIC mesa-glu::mesa-glu)
else()
target_link_libraries(scwx-qt PUBLIC OpenGL::GLU)
endif()
target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
Qt${QT_VERSION_MAJOR}::OpenGLWidgets Qt${QT_VERSION_MAJOR}::OpenGLWidgets
Qt${QT_VERSION_MAJOR}::Multimedia Qt${QT_VERSION_MAJOR}::Multimedia
@ -746,7 +758,6 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
GEOS::geos GEOS::geos
GEOS::geos_cxx_flags GEOS::geos_cxx_flags
glad_gl_core_33 glad_gl_core_33
GLEW::GLEW
glm::glm glm::glm
imgui imgui
qt6ct-common qt6ct-common