Import Geant4 11.2.0 source tree
This commit is contained in:
@@ -91,6 +91,9 @@ ifeq ($(G4SYSTEM),Darwin-clang)
|
||||
ifndef QTHOME
|
||||
QTHOME := /Library/Frameworks
|
||||
endif
|
||||
ifndef QT_VERSION
|
||||
QT_VERSION := 5
|
||||
endif
|
||||
ifeq ($(QTHOME),/Library/Frameworks)
|
||||
ifndef QTMOC
|
||||
QTMOC := /usr/bin/moc
|
||||
@@ -103,6 +106,9 @@ ifeq ($(G4SYSTEM),Darwin-clang)
|
||||
QTFLAGS += -I $(QTHOME)/Qt3DCore.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/Qt3DExtras.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/Qt3DRender.framework/Headers
|
||||
ifeq ($(QT_VERSION),6)
|
||||
QTFLAGS += -I $(QTHOME)/QtOpenGLWidgets.framework/Headers
|
||||
endif
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt -I$(QTHOME)/include
|
||||
endif
|
||||
ifndef QTLIBPATH
|
||||
@@ -129,8 +135,14 @@ ifeq ($(G4SYSTEM),Darwin-clang)
|
||||
ifndef GLQTLIBS
|
||||
ifdef QT_AS_FRAMEWORK
|
||||
GLQTLIBS := $(QTLIBPATH) -framework QtCore -framework QtGui -framework QtOpenGL
|
||||
ifeq ($(QT_VERSION),6)
|
||||
GLQTLIBS += -framework QtOpenGLWidgets
|
||||
endif
|
||||
else
|
||||
GLQTLIBS := -L$(QTLPATH) -lQtCore -lQtGui -lQtOpenGL
|
||||
ifeq ($(QT_VERSION),6)
|
||||
GLQTLIBS += -lQtOpenGLWidgets
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
else
|
||||
@@ -138,7 +150,7 @@ ifeq ($(G4SYSTEM),Darwin-clang)
|
||||
QTMOC := $(QTHOME)/bin/moc
|
||||
endif
|
||||
QTLPATH := $(QTHOME)/lib
|
||||
ifndef QTFLAGS # Qt5
|
||||
ifndef QTFLAGS
|
||||
QTFLAGS := -I $(QTLPATH)/QtCore.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/QtGui.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/QtWidgets.framework/Headers
|
||||
@@ -147,6 +159,9 @@ ifeq ($(G4SYSTEM),Darwin-clang)
|
||||
QTFLAGS += -I $(QTLPATH)/Qt3DExtras.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/Qt3DRender.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt -I$(QTHOME)/include
|
||||
ifeq ($(QT_VERSION),6)
|
||||
QTFLAGS += -I $(QTHOME)/QtOpenGLWidgets.framework/Headers
|
||||
endif
|
||||
endif
|
||||
ifndef QTLIBS
|
||||
QTLIBS := -F$(QTLPATH) -framework QtCore -framework QtGui
|
||||
@@ -161,6 +176,9 @@ ifeq ($(G4SYSTEM),Darwin-clang)
|
||||
GLQTLIBS := -F$(QTLPATH) -framework QtCore -framework QtGui
|
||||
GLQTLIBS += -framework QtWidgets
|
||||
GLQTLIBS += -framework QtOpenGL
|
||||
ifeq ($(QT_VERSION),6)
|
||||
GLQTLIBS += -framework QtOpenGLWidgets
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
@@ -120,6 +120,9 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
ifndef QTHOME
|
||||
QTHOME := /Library/Frameworks
|
||||
endif
|
||||
ifndef QT_VERSION
|
||||
QT_VERSION := 5
|
||||
endif
|
||||
ifeq ($(QTHOME),/Library/Frameworks)
|
||||
ifndef QTMOC
|
||||
QTMOC := /usr/bin/moc
|
||||
@@ -132,6 +135,9 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
QTFLAGS += -I $(QTHOME)/Qt3DCore.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/Qt3DExtras.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/Qt3DRender.framework/Headers
|
||||
ifeq ($(QT_VERSION),6)
|
||||
QTFLAGS += -I $(QTHOME)/QtOpenGLWidgets.framework/Headers
|
||||
endif
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt -I$(QTHOME)/include
|
||||
endif
|
||||
ifndef QTLIBPATH
|
||||
@@ -158,8 +164,14 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
ifndef GLQTLIBS
|
||||
ifdef QT_AS_FRAMEWORK
|
||||
GLQTLIBS := $(QTLIBPATH) -framework QtCore -framework QtGui -framework QtOpenGL
|
||||
ifeq ($(QT_VERSION),6)
|
||||
GLQTLIBS += -framework QtOpenGLWidgets
|
||||
endif
|
||||
else
|
||||
GLQTLIBS := -L$(QTLPATH) -lQtCore -lQtGui -lQtOpenGL
|
||||
ifeq ($(QT_VERSION),6)
|
||||
GLQTLIBS += -lQtOpenGLWidgets
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
else
|
||||
@@ -167,7 +179,7 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
QTMOC := $(QTHOME)/bin/moc
|
||||
endif
|
||||
QTLPATH := $(QTHOME)/lib
|
||||
ifndef QTFLAGS # Qt5
|
||||
ifndef QTFLAGS
|
||||
QTFLAGS := -I $(QTLPATH)/QtCore.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/QtGui.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/QtWidgets.framework/Headers
|
||||
@@ -175,6 +187,9 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
QTFLAGS += -I $(QTLPATH)/Qt3DCore.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/Qt3DExtras.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/Qt3DRender.framework/Headers
|
||||
ifeq ($(QT_VERSION),6)
|
||||
QTFLAGS += -I $(QTHOME)/QtOpenGLWidgets.framework/Headers
|
||||
endif
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt -I$(QTHOME)/include
|
||||
endif
|
||||
ifndef QTLIBS
|
||||
@@ -190,6 +205,9 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
GLQTLIBS := -F$(QTLPATH) -framework QtCore -framework QtGui
|
||||
GLQTLIBS += -framework QtWidgets
|
||||
GLQTLIBS += -framework QtOpenGL
|
||||
ifeq ($(QT_VERSION),6)
|
||||
GLQTLIBS += -framework QtOpenGLWidgets
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
+20
-23
@@ -96,23 +96,17 @@ ifeq ($(G4SYSTEM),Linux-clang)
|
||||
QT_VERSION := 5
|
||||
endif
|
||||
|
||||
ifeq ($(QT_VERSION),5)
|
||||
ifndef QTFLAGS # Qt5
|
||||
QTFLAGS := -I $(QTHOME)/include -I$(QTHOME)/include/Qt
|
||||
QTFLAGS += -I $(QTHOME)/include/QtCore
|
||||
QTFLAGS += -I $(QTHOME)/include/QtGui
|
||||
QTFLAGS += -I $(QTHOME)/include/QtWidgets
|
||||
QTFLAGS += -I $(QTHOME)/include/QtOpenGL
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DCore
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DExtras
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DRender
|
||||
endif
|
||||
else # Qt4
|
||||
ifndef QTFLAGS
|
||||
QTFLAGS := -I$(QTHOME)/include -I$(QTHOME)/include/Qt
|
||||
QTFLAGS += -I$(QTHOME)/include/QtCore
|
||||
QTFLAGS += -I$(QTHOME)/include/QtGui
|
||||
QTFLAGS += -I$(QTHOME)/include/QtOpenGL
|
||||
ifndef QTFLAGS
|
||||
QTFLAGS := -I $(QTHOME)/include -I$(QTHOME)/include/Qt
|
||||
QTFLAGS += -I $(QTHOME)/include/QtCore
|
||||
QTFLAGS += -I $(QTHOME)/include/QtGui
|
||||
QTFLAGS += -I $(QTHOME)/include/QtWidgets
|
||||
QTFLAGS += -I $(QTHOME)/include/QtOpenGL
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DCore
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DExtras
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DRender
|
||||
ifeq ($(QT_VERSION),6)
|
||||
QTFLAGS += -I $(QTHOME)/include/QtOpenGLWidgets
|
||||
endif
|
||||
endif
|
||||
ifndef QTLIBPATH
|
||||
@@ -122,22 +116,25 @@ ifeq ($(G4SYSTEM),Linux-clang)
|
||||
QTLIBPATH := $(QTHOME)/lib/qt$(QT_VERSION)
|
||||
endif
|
||||
endif
|
||||
ifeq ($(QT_VERSION),5)
|
||||
ifndef QTLIBS # Qt5
|
||||
ifeq ($(QT_VERSION),5) # Qt5
|
||||
ifndef QTLIBS
|
||||
QTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets
|
||||
endif
|
||||
ifndef QT3DLIBS
|
||||
QT3DLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt53DCore -lQt53DExtras -lQt53DRender
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL
|
||||
endif
|
||||
else # Qt4
|
||||
else # Qt6
|
||||
ifndef QTLIBS
|
||||
QTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui
|
||||
QTLIBS := -L$(QTLIBPATH) -lQt6Core -lQt6Gui -lQt6Widgets
|
||||
endif
|
||||
ifndef QT3DLIBS
|
||||
QT3DLIBS := -L$(QTLIBPATH) -lQt6Core -lQt6Gui -lQt6Widgets -lQt63DCore -lQt63DExtras -lQt63DRender
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui -lQtOpenGL
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQt6Core -lQt6Gui -lQt6Widgets -lQt6OpenGL -lQt6OpenGLWidgets
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
+20
-23
@@ -93,23 +93,17 @@ ifeq ($(G4SYSTEM),Linux-g++)
|
||||
QT_VERSION := 5
|
||||
endif
|
||||
|
||||
ifeq ($(QT_VERSION),5)
|
||||
ifndef QTFLAGS # Qt5
|
||||
QTFLAGS := -I $(QTHOME)/include -I$(QTHOME)/include/Qt
|
||||
QTFLAGS += -I $(QTHOME)/include/QtCore
|
||||
QTFLAGS += -I $(QTHOME)/include/QtGui
|
||||
QTFLAGS += -I $(QTHOME)/include/QtWidgets
|
||||
QTFLAGS += -I $(QTHOME)/include/QtOpenGL
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DCore
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DExtras
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DRender
|
||||
endif
|
||||
else # Qt4
|
||||
ifndef QTFLAGS
|
||||
QTFLAGS := -I$(QTHOME)/include -I$(QTHOME)/include/Qt
|
||||
QTFLAGS += -I$(QTHOME)/include/QtCore
|
||||
QTFLAGS += -I$(QTHOME)/include/QtGui
|
||||
QTFLAGS += -I$(QTHOME)/include/QtOpenGL
|
||||
ifndef QTFLAGS
|
||||
QTFLAGS := -I $(QTHOME)/include -I$(QTHOME)/include/Qt
|
||||
QTFLAGS += -I $(QTHOME)/include/QtCore
|
||||
QTFLAGS += -I $(QTHOME)/include/QtGui
|
||||
QTFLAGS += -I $(QTHOME)/include/QtWidgets
|
||||
QTFLAGS += -I $(QTHOME)/include/QtOpenGL
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DCore
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DExtras
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DRender
|
||||
ifeq ($(QT_VERSION),6)
|
||||
QTFLAGS += -I $(QTHOME)/include/QtOpenGLWidgets
|
||||
endif
|
||||
endif
|
||||
ifndef QTLIBPATH
|
||||
@@ -119,22 +113,25 @@ ifeq ($(G4SYSTEM),Linux-g++)
|
||||
QTLIBPATH := $(QTHOME)/lib/qt$(QT_VERSION)
|
||||
endif
|
||||
endif
|
||||
ifeq ($(QT_VERSION),5)
|
||||
ifndef QTLIBS # Qt5
|
||||
ifeq ($(QT_VERSION),5) # Qt5
|
||||
ifndef QTLIBS
|
||||
QTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets
|
||||
endif
|
||||
ifndef QT3DLIBS
|
||||
QT3DLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt53DCore -lQt53DExtras -lQt53DRender
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL
|
||||
endif
|
||||
else # Qt4
|
||||
else # Qt6
|
||||
ifndef QTLIBS
|
||||
QTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui
|
||||
QTLIBS := -L$(QTLIBPATH) -lQt6Core -lQt6Gui -lQt6Widgets
|
||||
endif
|
||||
ifndef QT3DLIBS
|
||||
QT3DLIBS := -L$(QTLIBPATH) -lQt6Core -lQt6Gui -lQt6Widgets -lQt63DCore -lQt63DExtras -lQt63DRender
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui -lQtOpenGL
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQt6Core -lQt6Gui -lQt6Widgets -lQt6OpenGL -lQt6OpenGLWidgets
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
+20
-23
@@ -87,23 +87,17 @@ ifeq ($(G4SYSTEM),Linux-icc)
|
||||
QT_VERSION := 5
|
||||
endif
|
||||
|
||||
ifeq ($(QT_VERSION),5)
|
||||
ifndef QTFLAGS # Qt5
|
||||
QTFLAGS := -I $(QTHOME)/include -I$(QTHOME)/include/Qt
|
||||
QTFLAGS += -I $(QTHOME)/include/QtCore
|
||||
QTFLAGS += -I $(QTHOME)/include/QtGui
|
||||
QTFLAGS += -I $(QTHOME)/include/QtWidgets
|
||||
QTFLAGS += -I $(QTHOME)/include/QtOpenGL
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DCore
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DExtras
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DRender
|
||||
endif
|
||||
else # Qt4
|
||||
ifndef QTFLAGS
|
||||
QTFLAGS := -I$(QTHOME)/include -I$(QTHOME)/include/Qt
|
||||
QTFLAGS += -I$(QTHOME)/include/QtCore
|
||||
QTFLAGS += -I$(QTHOME)/include/QtGui
|
||||
QTFLAGS += -I$(QTHOME)/include/QtOpenGL
|
||||
ifndef QTFLAGS
|
||||
QTFLAGS := -I $(QTHOME)/include -I$(QTHOME)/include/Qt
|
||||
QTFLAGS += -I $(QTHOME)/include/QtCore
|
||||
QTFLAGS += -I $(QTHOME)/include/QtGui
|
||||
QTFLAGS += -I $(QTHOME)/include/QtWidgets
|
||||
QTFLAGS += -I $(QTHOME)/include/QtOpenGL
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DCore
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DExtras
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DRender
|
||||
ifeq ($(QT_VERSION),6)
|
||||
QTFLAGS += -I $(QTHOME)/include/QtOpenGLWidgets
|
||||
endif
|
||||
endif
|
||||
ifndef QTLIBPATH
|
||||
@@ -113,22 +107,25 @@ ifeq ($(G4SYSTEM),Linux-icc)
|
||||
QTLIBPATH := $(QTHOME)/lib/qt$(QT_VERSION)
|
||||
endif
|
||||
endif
|
||||
ifeq ($(QT_VERSION),5)
|
||||
ifndef QTLIBS # Qt5
|
||||
ifeq ($(QT_VERSION),5) # Qt5
|
||||
ifndef QTLIBS
|
||||
QTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets
|
||||
endif
|
||||
ifndef QT3DLIBS
|
||||
QT3DLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt53DCore -lQt53DExtras -lQt53DRender
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL
|
||||
endif
|
||||
else # Qt4
|
||||
else # Qt6
|
||||
ifndef QTLIBS
|
||||
QTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui
|
||||
QTLIBS := -L$(QTLIBPATH) -lQt6Core -lQt6Gui -lQt6Widgets
|
||||
endif
|
||||
ifndef QT3DLIBS
|
||||
QT3DLIBS := -L$(QTLIBPATH) -lQt6Core -lQt6Gui -lQt6Widgets -lQt63DCore -lQt63DExtras -lQt63DRender
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui -lQtOpenGL
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQt6Core -lQt6Gui -lQt6Widgets -lQt6OpenGL -lQt6OpenGLWidgets
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
+20
-23
@@ -88,23 +88,17 @@ ifeq ($(G4SYSTEM),Linux-icx)
|
||||
QT_VERSION := 5
|
||||
endif
|
||||
|
||||
ifeq ($(QT_VERSION),5)
|
||||
ifndef QTFLAGS # Qt5
|
||||
QTFLAGS := -I $(QTHOME)/include -I$(QTHOME)/include/Qt
|
||||
QTFLAGS += -I $(QTHOME)/include/QtCore
|
||||
QTFLAGS += -I $(QTHOME)/include/QtGui
|
||||
QTFLAGS += -I $(QTHOME)/include/QtWidgets
|
||||
QTFLAGS += -I $(QTHOME)/include/QtOpenGL
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DCore
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DExtras
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DRender
|
||||
endif
|
||||
else # Qt4
|
||||
ifndef QTFLAGS
|
||||
QTFLAGS := -I$(QTHOME)/include -I$(QTHOME)/include/Qt
|
||||
QTFLAGS += -I$(QTHOME)/include/QtCore
|
||||
QTFLAGS += -I$(QTHOME)/include/QtGui
|
||||
QTFLAGS += -I$(QTHOME)/include/QtOpenGL
|
||||
ifndef QTFLAGS
|
||||
QTFLAGS := -I $(QTHOME)/include -I$(QTHOME)/include/Qt
|
||||
QTFLAGS += -I $(QTHOME)/include/QtCore
|
||||
QTFLAGS += -I $(QTHOME)/include/QtGui
|
||||
QTFLAGS += -I $(QTHOME)/include/QtWidgets
|
||||
QTFLAGS += -I $(QTHOME)/include/QtOpenGL
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DCore
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DExtras
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DRender
|
||||
ifeq ($(QT_VERSION),6)
|
||||
QTFLAGS += -I $(QTHOME)/include/QtOpenGLWidgets
|
||||
endif
|
||||
endif
|
||||
ifndef QTLIBPATH
|
||||
@@ -114,22 +108,25 @@ ifeq ($(G4SYSTEM),Linux-icx)
|
||||
QTLIBPATH := $(QTHOME)/lib/qt$(QT_VERSION)
|
||||
endif
|
||||
endif
|
||||
ifeq ($(QT_VERSION),5)
|
||||
ifndef QTLIBS # Qt5
|
||||
ifeq ($(QT_VERSION),5) # Qt5
|
||||
ifndef QTLIBS
|
||||
QTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets
|
||||
endif
|
||||
ifndef QT3DLIBS
|
||||
QT3DLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt53DCore -lQt53DExtras -lQt53DRender
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL
|
||||
endif
|
||||
else # Qt4
|
||||
else # Qt6
|
||||
ifndef QTLIBS
|
||||
QTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui
|
||||
QTLIBS := -L$(QTLIBPATH) -lQt6Core -lQt6Gui -lQt6Widgets
|
||||
endif
|
||||
ifndef QT3DLIBS
|
||||
QT3DLIBS := -L$(QTLIBPATH) -lQt6Core -lQt6Gui -lQt6Widgets -lQt63DCore -lQt63DExtras -lQt63DRender
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui -lQtOpenGL
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQt6Core -lQt6Gui -lQt6Widgets -lQt6OpenGL -lQt6OpenGLWidgets
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
+19
-6
@@ -41,22 +41,35 @@ ifeq ($(G4SYSTEM),WIN32-VC)
|
||||
ifndef QTHOME
|
||||
QTHOME := /Qt
|
||||
endif
|
||||
ifndef QTFLAGS # Qt5
|
||||
ifndef QT_VERSION
|
||||
QT_VERSION := 5
|
||||
endif
|
||||
ifndef QTFLAGS
|
||||
QTFLAGS := -I$(QTHOME)/include
|
||||
QTFLAGS += -I$(QTHOME)/include/QtCore
|
||||
QTFLAGS += -I$(QTHOME)/include/QtGui
|
||||
QTFLAGS += -I$(QTHOME)/include/QtWidgets
|
||||
QTFLAGS += -I$(QTHOME)/include/QtOpenGL
|
||||
ifeq ($(QT_VERSION),6)
|
||||
QTFLAGS += -I $(QTHOME)/include/QtOpenGLWidgets
|
||||
endif
|
||||
endif
|
||||
ifndef QTMOC
|
||||
QTMOC := $(QTHOME)/bin/moc
|
||||
endif
|
||||
ifndef QTLIBS # Qt5
|
||||
QTLIBS := $(LIB_PATH)$(QTHOME)/lib Qt5Core.lib Qt5Gui.lib Qt5Widgets.lib
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := $(LIB_PATH)$(QTHOME)/lib Qt5Core.lib Qt5Gui.lib Qt5Widgets.lib Qt5OpenGL.lib
|
||||
ifeq ($(QT_VERSION),5) # Qt5
|
||||
ifndef QTLIBS
|
||||
QTLIBS := $(LIB_PATH)$(QTHOME)/lib Qt5Core.lib Qt5Gui.lib Qt5Widgets.lib
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := $(LIB_PATH)$(QTHOME)/lib Qt5Core.lib Qt5Gui.lib Qt5Widgets.lib Qt5OpenGL.lib
|
||||
endif
|
||||
else # Qt6
|
||||
ifndef QTLIBS
|
||||
QTLIBS := $(LIB_PATH)$(QTHOME)/lib Qt6Core.lib Qt6Gui.lib Qt6Widgets.lib
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := $(LIB_PATH)$(QTHOME)/lib Qt6Core.lib Qt6Gui.lib Qt6Widgets.lib Qt6OpenGL.lib Qt6OpenGLWidgets.lib
|
||||
endif
|
||||
endif
|
||||
|
||||
#
|
||||
# Building DLLs
|
||||
# -------------
|
||||
|
||||
Reference in New Issue
Block a user