]> git.proxmox.com Git - ceph.git/blob - ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/libqglviewer/use-default-config-on-all-platforms.patch
update ceph source to reef 18.1.2
[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / libqglviewer / use-default-config-on-all-platforms.patch
1 diff --git a/QGLViewer/QGLViewer.pro b/QGLViewer/QGLViewer.pro
2 index e0205e5..6db4c81 100644
3 --- a/QGLViewer/QGLViewer.pro
4 +++ b/QGLViewer/QGLViewer.pro
5 @@ -108,9 +108,6 @@ contains( DEFINES, NO_VECTORIAL_RENDER ) {
6 # -- U n i x --
7 # ---------------
8 unix {
9 - CONFIG -= debug debug_and_release
10 - CONFIG *= release
11 -
12 # INCLUDE_DIR and LIB_DIR specify where to install the include files and the library.
13 # Use qmake INCLUDE_DIR=... LIB_DIR=... , or qmake PREFIX=... to customize your installation.
14 isEmpty( PREFIX ) {
15 @@ -250,9 +247,6 @@ macx|darwin-g++ {
16 # -- W i n d o w s --
17 # ---------------------
18 win32 {
19 - # Windows requires a debug lib version to link against debug applications
20 - CONFIG *= debug_and_release build_all
21 -
22 # Needed by Intel C++, (icl.exe) so that WINGDIAPI is a defined symbol in gl.h.
23 DEFINES *= WIN32
24
25 @@ -279,7 +273,7 @@ win32 {
26 QMAKE_CXXFLAGS *= -TP -GR
27 DEFINES += NOMINMAX
28 win32-msvc {
29 - QMAKE_CXXFLAGS *= -EH -FS
30 + QMAKE_CXXFLAGS *= -EHs -FS
31 } else {
32 QMAKE_CXXFLAGS *= -EHs
33 }