early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,21 @@
diff --git a/QGLViewer/QGLViewer.pro b/QGLViewer/QGLViewer.pro
index 263a141..51e3359 100644
--- a/QGLViewer/QGLViewer.pro
+++ b/QGLViewer/QGLViewer.pro
@@ -38,7 +38,6 @@ SOURCES = \
HEADERS *= $${QGL_HEADERS}
DISTFILES *= qglviewer-icon.xpm
-DESTDIR = $${PWD}
TRANSLATIONS = qglviewer_fr.ts
@@ -273,7 +272,7 @@ win32 {
QMAKE_CXXFLAGS *= -TP -GR
DEFINES += NOMINMAX
win32-msvc {
- QMAKE_CXXFLAGS *= -EHs -FS
+ QMAKE_CXXFLAGS *= -EHs -FS
} else {
QMAKE_CXXFLAGS *= -EHs
}

View File

@@ -0,0 +1,24 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO GillesDebunne/libQGLViewer
REF fee0916f2af3d0993df51956d2e5a51bbaf0c1f0 #v2.7.2
SHA512 449bf4ccadaf50d4333bd91050e9b50f440a64229391827aaf4a80ade2c3f5fc60501d2baee885cf1214f7e2a8a04615bafe9ac7da9f866ffa4ebe33b9b999d8
HEAD_REF master
PATCHES
use-default-config-on-all-platforms.patch
destdir.patch
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
set(OPTIONS CONFIG*=staticlib)
endif()
vcpkg_configure_qmake(
SOURCE_PATH ${SOURCE_PATH}/QGLViewer/QGLViewer.pro
OPTIONS ${OPTIONS}
)
vcpkg_install_qmake()
file(INSTALL ${SOURCE_PATH}/QGLViewer DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*.h")
file(INSTALL ${SOURCE_PATH}/LICENCE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libqglviewer RENAME copyright)

View File

@@ -0,0 +1,33 @@
diff --git a/QGLViewer/QGLViewer.pro b/QGLViewer/QGLViewer.pro
index e0205e5..6db4c81 100644
--- a/QGLViewer/QGLViewer.pro
+++ b/QGLViewer/QGLViewer.pro
@@ -108,9 +108,6 @@ contains( DEFINES, NO_VECTORIAL_RENDER ) {
# -- U n i x --
# ---------------
unix {
- CONFIG -= debug debug_and_release
- CONFIG *= release
-
# INCLUDE_DIR and LIB_DIR specify where to install the include files and the library.
# Use qmake INCLUDE_DIR=... LIB_DIR=... , or qmake PREFIX=... to customize your installation.
isEmpty( PREFIX ) {
@@ -250,9 +247,6 @@ macx|darwin-g++ {
# -- W i n d o w s --
# ---------------------
win32 {
- # Windows requires a debug lib version to link against debug applications
- CONFIG *= debug_and_release build_all
-
# Needed by Intel C++, (icl.exe) so that WINGDIAPI is a defined symbol in gl.h.
DEFINES *= WIN32
@@ -279,7 +273,7 @@ win32 {
QMAKE_CXXFLAGS *= -TP -GR
DEFINES += NOMINMAX
win32-msvc {
- QMAKE_CXXFLAGS *= -EH -FS
+ QMAKE_CXXFLAGS *= -EHs -FS
} else {
QMAKE_CXXFLAGS *= -EHs
}

12
externals/vcpkg/ports/libqglviewer/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,12 @@
{
"name": "libqglviewer",
"version-string": "2.7.2",
"port-version": 4,
"description": "libQGLViewer is an open source C++ library based on Qt that eases the creation of OpenGL 3D viewers.",
"dependencies": [
{
"name": "qt5-base",
"default-features": false
}
]
}