OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +03:00
Code Activity

0026787: Do not declare redundant macros WNT, LIN, WIN32, WIN64 within samples project files

Browse Source 
Redundant macros were removed.

Defines _WIN32, __linux__ and LININTEL were removed from qt samples *.pro files
This commit is contained in:
ski
2015-10-23 16:12:34 +03:00
committed by bugmaster
parent f1a70360a7
commit 50fe2dab24
82 changed files with 305 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
samples/qt/Tutorial/Tutorial.pro
View File

@@ -50,7 +50,6 @@ unix {
MACOSX_USE_GLX = $$(MACOSX_USE_GLX)
!macx | equals(MACOSX_USE_GLX, true): INCLUDEPATH += $$QMAKE_INCDIR_X11 $$QMAKE_INCDIR_OPENGL $$QMAKE_INCDIR_THREAD
!macx | equals(MACOSX_USE_GLX, true): DEFINES += LIN LININTEL
equals(MACOSX_USE_GLX, true): DEFINES += MACOSX_USE_GLX
DEFINES += OCC_CONVERT_SIGNALS QT_NO_STL
!macx | equals(MACOSX_USE_GLX, true): LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
@@ -73,7 +72,7 @@ win32 {
MOC_DIR = ./win$(ARCH)/$(VCVER)/moc
LIBS = -L$$(QT_DIR)/lib;$$(CASROOT)/win$$(ARCH)/$$(VCVER)/lib
}
DEFINES +=WNT WIN32 NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS
DEFINES += NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS
}
LIBS += -lTKernel -lTKMath -lTKService -lTKV3d -lTKOpenGl \