Skip to content

Commit 0a47ef5

Browse files
uwewoessneruwewoessner
committed
make it compile with latest windows compiler
1 parent 85c2edc commit 0a47ef5

8 files changed

Lines changed: 52 additions & 18 deletions

File tree

‎README-Building-deps.txt‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,21 @@ serialize file processing to fix compression
185185

186186
use admin developer cmd
187187
cd build
188+
set ICU_ROOT=c:\src\externlibs\zebu\icu
189+
set VERBOSE=TRUE
190+
set OPENSSL_ROOT_DIR=C:/src/externlibs/zebu/OpenSSL3
191+
set PATH=%PATH%;c:\src\externlibs\zebu\UnixUtils\bin
192+
set WEBVIEW2_SDK_ROOT=C:/src/gitbase/WebView2Samples/GettingStartedGuides/Win32_GettingStarted/packages/Microsoft.Web.WebView2.1.0.3967.48
188193
set PATH=c:\src\externlibs\zebu\Python2\bin;%PATH%
189194
##..\configure.bat -prefix c:\src\externlibs\zebu\qt6 -skip qtspeech -debug-and-release -qt-zlib -openssl-linked -- -D OPENSSL_ROOT_DIR=C:/src/externlibs/zebu/OpenSSL
190-
..\configure -prefix c:/src/externlibs/zebu/qt6 -opensource -debug-and-release -make tools -nomake examples -nomake tests -confirm-license -openssl -icu -openssl-linked -opengl dynamic -- -DCMAKE_PREFIX_PATH=c:/src/externlibs/zebu/md4c;c:/src/externlibs/zebu/Coin3D;c:/src/externlibs/zebu/flex;c:/src/externlibs/zebu/bison;c:/src/externlibs/zebu/OpenSSL;c:/src/externlibs/zebu/curl;c:/src/externlibs/zebu/freetype;c:/src/externlibs/zebu/giflib;c:/src/externlibs/zebu/glut;c:/src/externlibs/zebu/icu;c:/src/externlibs/zebu/jpeg;c:/src/externlibs/zebu/libpng;c:/src/externlibs/zebu/nvtt;c:/src/externlibs/zebu/OpenEXR;c:/src/externlibs/zebu/OpenSSL;c:/src/externlibs/zebu/Python;c:/src/externlibs/zebu/qt5;c:/src/externlibs/zebu/SDL;c:/src/externlibs/zebu/xerces;c:/src/externlibs/zebu/zlib;c:/src/externlibs/zebu/gdal
195+
##..\configure -prefix c:/src/externlibs/zebu/qt6 -opensource -debug-and-release -make tools -nomake examples -nomake tests -confirm-license -openssl -icu -openssl-linked -opengl dynamic -- -DCMAKE_PREFIX_PATH=c:/src/externlibs/zebu/md4c;c:/src/externlibs/zebu/Coin3D;c:/src/externlibs/zebu/flex;c:/src/externlibs/zebu/bison;c:/src/externlibs/zebu/OpenSSL;c:/src/externlibs/zebu/curl;c:/src/externlibs/zebu/freetype;c:/src/externlibs/zebu/giflib;c:/src/externlibs/zebu/glut;c:/src/externlibs/zebu/icu;c:/src/externlibs/zebu/jpeg;c:/src/externlibs/zebu/libpng;c:/src/externlibs/zebu/nvtt;c:/src/externlibs/zebu/OpenEXR;c:/src/externlibs/zebu/OpenSSL;c:/src/externlibs/zebu/Python;c:/src/externlibs/zebu/SDL;c:/src/externlibs/zebu/xerces;c:/src/externlibs/zebu/zlib;c:/src/externlibs/zebu/gdal
196+
..\configure.bat -prefix c:/src/externlibs/zebu/qt6 -opensource -debug-and-release -nomake examples -nomake manual-tests -nomake minimal-static-tests -confirm-license -openssl-runtime -icu -opengl dynamic -DOPENSSL_ROOT_DIR=c:/src/externlibs/zebu/OpenSSL3 -DCMAKE_PREFIX_PATH=c:/src/externlibs/zebu/md4c;c:/src/externlibs/zebu/Coin3D;c:/src/externlibs/zebu/flex;c:/src/externlibs/zebu/bison;c:/src/externlibs/zebu/OpenSSL;c:/src/externlibs/zebu/curl;c:/src/externlibs/zebu/freetype;c:/src/externlibs/zebu/giflib;c:/src/externlibs/zebu/glut;c:/src/externlibs/zebu/icu;c:/src/externlibs/zebu/jpeg;c:/src/externlibs/zebu/libpng;c:/src/externlibs/zebu/nvtt;c:/src/externlibs/zebu/OpenEXR;c:/src/externlibs/zebu/OpenSSL;c:/src/externlibs/zebu/Python;c:/src/externlibs/zebu/SDL;c:/src/externlibs/zebu/xerces;c:/src/externlibs/zebu/zlib;c:/src/externlibs/zebu/gdal;c:/src/externlibs/zebu/flex;c:/src/externlibs/zebu/bison;c:/src/externlibs/zebu/protobuf;C:/src/gitbase/WebView2Samples/GettingStartedGuides/Win32_GettingStarted/packages/Microsoft.Web.WebView2.1.0.3967.48
197+
fixed bluetooth bugs:
198+
199+
#define _SILENCE_EXPERIMENTAL_COROUTINE_DEPRECATION_WARNINGS
200+
#include "../../../../qtbase/src/corelib/platform/windows/qfactorycacheregistration_p.h" //<QtCore/private/qfactorycacheregistration_p.h>
201+
in *winrt*
202+
191203
cmake --build . --parallel
192204
ninja qtdeclarative
193205
ninja
@@ -384,7 +396,7 @@ disable performance tests and normal tests, build (be very patient) and install
384396
cmake .. -G "Visual Studio 18 2026" -A x64 -DCMAKE_INSTALL_PREFIX=c:/src/externlibs/zebu/VTK -DCMAKE_DEBUG_POSTFIX=d
385397

386398
#hdf5
387-
cmake .. -G "Visual Studio 18 2026" -A x64 -DCMAKE_INSTALL_PREFIX=c:/src/externlibs/zebu/hdf5
399+
cmake .. -G "Visual Studio 18 2026" -A x64 -DCMAKE_DEBUG_POSTFIX=d -DCMAKE_INSTALL_PREFIX=c:/src/externlibs/zebu/hdf5 -DHDF5_BUILD_CPP_LIB=true -DBUILD_TESTING=false
388400

389401
#alvar
390402
alvar needs openCV 2.4 (currently 2412)

‎cmake/FindICU.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ mark_as_advanced(ICU_LIBRARY)
2626
# Look for the library.
2727
find_library(
2828
ICU_DATA_LIBRARY
29-
NAMES icudata
29+
NAMES icudata icudt
3030
DOC "Libraries to link against for the common parts of ICU")
3131
mark_as_advanced(ICU_DATA_LIBRARY)
3232

‎cmake/Using/UseHDF5.cmake‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,20 @@ MACRO(USE_HDF5)
5252
SET(HDF5_USED TRUE)
5353
INCLUDE_DIRECTORIES(SYSTEM ${HDF5_INCLUDE_DIR})
5454
ENDIF()
55+
set (WINLIBS "")
56+
IF (WIN32)
57+
set(WINLIBS shlwapi.lib)
58+
endif()
5559
if (component STREQUAL "all")
56-
SET(EXTRA_LIBS ${EXTRA_LIBS} ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_CXX_LIBRARIES} ${HDF5_HL_CXX_LIBRARIES})
60+
SET(EXTRA_LIBS ${EXTRA_LIBS} ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_CXX_LIBRARIES} ${HDF5_HL_CXX_LIBRARIES} ${WINLIBS})
5761
elseif (component STREQUAL "hl")
58-
SET(EXTRA_LIBS ${EXTRA_LIBS} ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES})
62+
SET(EXTRA_LIBS ${EXTRA_LIBS} ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES} ${WINLIBS})
5963
elseif (component STREQUAL "c")
60-
SET(EXTRA_LIBS ${EXTRA_LIBS} ${HDF5_LIBRARIES})
64+
SET(EXTRA_LIBS ${EXTRA_LIBS} ${HDF5_LIBRARIES} ${WINLIBS})
6165
elseif (component STREQUAL "cxx_hl")
62-
SET(EXTRA_LIBS ${EXTRA_LIBS} ${HDF5_LIBRARIES} ${HDF5_CXX_LIBRARIES} ${HDF5_HL_CXX_LIBRARIES})
66+
SET(EXTRA_LIBS ${EXTRA_LIBS} ${HDF5_LIBRARIES} ${HDF5_CXX_LIBRARIES} ${HDF5_HL_CXX_LIBRARIES} ${WINLIBS})
6367
elseif (component STREQUAL "cxx")
64-
SET(EXTRA_LIBS ${EXTRA_LIBS} ${HDF5_LIBRARIES} ${HDF5_CXX_LIBRARIES})
68+
SET(EXTRA_LIBS ${EXTRA_LIBS} ${HDF5_LIBRARIES} ${HDF5_CXX_LIBRARIES} ${WINLIBS})
6569
endif()
6670
ENDMACRO(USE_HDF5)
6771

‎src/OpenCOVER/plugins/hlrs/Revit/RevitPlugin/OpenCOVERPlugin/COVER.cs‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2155,13 +2155,18 @@ private void SendElement(GeometryElement elementGeom, Element elem)
21552155
{
21562156
extendBB(ebb, solid.GetBoundingBox());
21572157
}
2158+
doWalk = false;
2159+
if (graphicsStyle.Name.Substring(0, 6) == "doWalk")
2160+
{
2161+
doWalk = true;
2162+
}
21582163
if (graphicsStyle.Name.Substring(0, 8) == "elevator")
21592164
{
2160-
sendElevatorGeomElement(elevatorName, graphicsStyle.Name, elem, num, geomObject, false, false);
2165+
sendElevatorGeomElement(elevatorName, graphicsStyle.Name, elem, num, geomObject, false, doWalk);
21612166
}
21622167
else
21632168
{
2164-
sendGeomElement(elem, num, geomObject, false, false);
2169+
sendGeomElement(elem, num, geomObject, false, doWalk);
21652170
}
21662171
}
21672172
else // no style --> will be treated as static parts

‎src/sys/mapeditor/material/MEMaterialDisplay.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
#include <QtGui>
1010
#include <QtOpenGL>
1111
#include <QSizePolicy>
12+
#ifdef WIN32
13+
#include <windows.h>
14+
#endif
1215
#ifdef __APPLE__
1316
#include <OpenGL/glu.h>
1417
#else

‎src/tools/hlrsDemo/demowindow.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#ifndef HLRS_DEMO_WINDOW_H
22
#define HLRS_DEMO_WINDOW_H
3-
3+
#include <iterator>
44
#include "flowlayout.h"
55
#include "launch.h"
66
#include <QWidget>
@@ -39,4 +39,4 @@ class DemoWindow : public QWidget
3939
};
4040

4141

42-
#endif // HLRS_DEMO_WINDOW_H
42+
#endif // HLRS_DEMO_WINDOW_H

‎src/tools/hlrsDemo/tui.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#ifndef HLRS_DEMO_TUI_H
22
#define HLRS_DEMO_TUI_H
3+
#include <iterator>
34
#include <nlohmann/json.hpp>
45
#include "launch.h"
56
class DemoTui
@@ -10,4 +11,4 @@ class DemoTui
1011
int runningDemoId = -1;
1112
};
1213

13-
#endif // HLRS_DEMO_TUI_H
14+
#endif // HLRS_DEMO_TUI_H

‎src/tools/vrmlexp/coTypes.h‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@
4141
#else
4242
#include <unistd.h>
4343
#endif
44+
#ifndef _USE_MATH_DEFINES
4445
#define _USE_MATH_DEFINES
46+
#endif
4547

4648
//#include <sysdep/net.h>
4749

@@ -143,11 +145,18 @@ using __gnu_cxx::hash_map;
143145
using __gnu_cxx::hash_set;
144146
#else
145147
#ifdef _WIN32
146-
#define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS
147-
#include <hash_map>
148-
using stdext::hash_map;
149-
#include <hash_set>
150-
using stdext::hash_set;
148+
//#define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS
149+
//#include <hash_map>
150+
// using stdext::hash_map; hash_map is deprecated in Visual Studio 2026
151+
#include <unordered_map>
152+
153+
template<typename K, typename V>
154+
using hash_map = std::unordered_map<K, V>;
155+
#include <unordered_set>
156+
template<typename K, typename V>
157+
using hash_set = std::unordered_set<K, V>;
158+
//#include <hash_set>
159+
//using stdext::hash_set;
151160
#else
152161
#include <hash_map>
153162
using std::hash_map;

0 commit comments

Comments
 (0)