Import Geant4 11.2.0.beta source tree
This commit is contained in:
@@ -146,23 +146,21 @@ ifeq ($(G4SYSTEM),Darwin-clang)
|
||||
QTFLAGS += -I $(QTLPATH)/Qt3DCore.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/Qt3DExtras.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/Qt3DRender.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/QtPrintSupport.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt -I$(QTHOME)/include
|
||||
endif
|
||||
ifndef QTLIBS
|
||||
QTLIBS := -F$(QTLPATH) -framework QtCore -framework QtGui
|
||||
QTLIBS += -framework QtWidgets -framework QtPrintSupport
|
||||
QTLIBS += -framework QtWidgets
|
||||
endif
|
||||
ifndef QT3DLIBS
|
||||
QT3DLIBS := -F$(QTLPATH) -framework QtCore -framework QtGui
|
||||
QT3DLIBS += -framework QtWidgets
|
||||
QT3DLIBS += -framework Qt3DCore -framework Qt3DExtras -framework Qt3DRender
|
||||
QT3DLIBS += -framework QtPrintSupport
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := -F$(QTLPATH) -framework QtCore -framework QtGui
|
||||
GLQTLIBS += -framework QtWidgets
|
||||
GLQTLIBS += -framework QtOpenGL -framework QtPrintSupport
|
||||
GLQTLIBS += -framework QtOpenGL
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
@@ -175,23 +175,21 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
QTFLAGS += -I $(QTLPATH)/Qt3DCore.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/Qt3DExtras.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/Qt3DRender.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/QtPrintSupport.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt -I$(QTHOME)/include
|
||||
endif
|
||||
ifndef QTLIBS
|
||||
QTLIBS := -F$(QTLPATH) -framework QtCore -framework QtGui
|
||||
QTLIBS += -framework QtWidgets -framework QtPrintSupport
|
||||
QTLIBS += -framework QtWidgets
|
||||
endif
|
||||
ifndef QT3DLIBS
|
||||
QT3DLIBS := -F$(QTLPATH) -framework QtCore -framework QtGui
|
||||
QT3DLIBS += -framework QtWidgets
|
||||
QT3DLIBS += -framework Qt3DCore -framework Qt3DExtras -framework Qt3DRender
|
||||
QT3DLIBS += -framework QtPrintSupport
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := -F$(QTLPATH) -framework QtCore -framework QtGui
|
||||
GLQTLIBS += -framework QtWidgets
|
||||
GLQTLIBS += -framework QtOpenGL -framework QtPrintSupport
|
||||
GLQTLIBS += -framework QtOpenGL
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
@@ -106,7 +106,6 @@ ifeq ($(G4SYSTEM),Linux-clang)
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DCore
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DExtras
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DRender
|
||||
QTFLAGS += -I $(QTHOME)/include/QtPrintSupport
|
||||
endif
|
||||
else # Qt4
|
||||
ifndef QTFLAGS
|
||||
@@ -125,13 +124,13 @@ ifeq ($(G4SYSTEM),Linux-clang)
|
||||
endif
|
||||
ifeq ($(QT_VERSION),5)
|
||||
ifndef QTLIBS # Qt5
|
||||
QTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5PrintSupport
|
||||
QTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets
|
||||
endif
|
||||
ifndef QT3DLIBS
|
||||
QT3DLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt53DCore -lQt53DExtras -lQt53DRender -lQt5PrintSupport
|
||||
QT3DLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt53DCore -lQt53DExtras -lQt53DRender
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL -lQt5PrintSupport
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL
|
||||
endif
|
||||
else # Qt4
|
||||
ifndef QTLIBS
|
||||
|
||||
@@ -103,7 +103,6 @@ ifeq ($(G4SYSTEM),Linux-g++)
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DCore
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DExtras
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DRender
|
||||
QTFLAGS += -I $(QTHOME)/include/QtPrintSupport
|
||||
endif
|
||||
else # Qt4
|
||||
ifndef QTFLAGS
|
||||
@@ -122,13 +121,13 @@ ifeq ($(G4SYSTEM),Linux-g++)
|
||||
endif
|
||||
ifeq ($(QT_VERSION),5)
|
||||
ifndef QTLIBS # Qt5
|
||||
QTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5PrintSupport
|
||||
QTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets
|
||||
endif
|
||||
ifndef QT3DLIBS
|
||||
QT3DLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt53DCore -lQt53DExtras -lQt53DRender -lQt5PrintSupport
|
||||
QT3DLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt53DCore -lQt53DExtras -lQt53DRender
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL -lQt5PrintSupport
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL
|
||||
endif
|
||||
else # Qt4
|
||||
ifndef QTLIBS
|
||||
|
||||
@@ -97,7 +97,6 @@ ifeq ($(G4SYSTEM),Linux-icc)
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DCore
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DExtras
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DRender
|
||||
QTFLAGS += -I $(QTHOME)/include/QtPrintSupport
|
||||
endif
|
||||
else # Qt4
|
||||
ifndef QTFLAGS
|
||||
@@ -116,13 +115,13 @@ ifeq ($(G4SYSTEM),Linux-icc)
|
||||
endif
|
||||
ifeq ($(QT_VERSION),5)
|
||||
ifndef QTLIBS # Qt5
|
||||
QTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5PrintSupport
|
||||
QTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets
|
||||
endif
|
||||
ifndef QT3DLIBS
|
||||
QT3DLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt53DCore -lQt53DExtras -lQt53DRender -lQt5PrintSupport
|
||||
QT3DLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt53DCore -lQt53DExtras -lQt53DRender
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL -lQt5PrintSupport
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL
|
||||
endif
|
||||
else # Qt4
|
||||
ifndef QTLIBS
|
||||
|
||||
@@ -98,7 +98,6 @@ ifeq ($(G4SYSTEM),Linux-icx)
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DCore
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DExtras
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt3DRender
|
||||
QTFLAGS += -I $(QTHOME)/include/QtPrintSupport
|
||||
endif
|
||||
else # Qt4
|
||||
ifndef QTFLAGS
|
||||
@@ -117,13 +116,13 @@ ifeq ($(G4SYSTEM),Linux-icx)
|
||||
endif
|
||||
ifeq ($(QT_VERSION),5)
|
||||
ifndef QTLIBS # Qt5
|
||||
QTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5PrintSupport
|
||||
QTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets
|
||||
endif
|
||||
ifndef QT3DLIBS
|
||||
QT3DLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt53DCore -lQt53DExtras -lQt53DRender -lQt5PrintSupport
|
||||
QT3DLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt53DCore -lQt53DExtras -lQt53DRender
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL -lQt5PrintSupport
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQt5Core -lQt5Gui -lQt5Widgets -lQt5OpenGL
|
||||
endif
|
||||
else # Qt4
|
||||
ifndef QTLIBS
|
||||
|
||||
@@ -47,16 +47,14 @@ ifeq ($(G4SYSTEM),WIN32-VC)
|
||||
QTFLAGS += -I$(QTHOME)/include/QtGui
|
||||
QTFLAGS += -I$(QTHOME)/include/QtWidgets
|
||||
QTFLAGS += -I$(QTHOME)/include/QtOpenGL
|
||||
QTFLAGS += -I$(QTHOME)/include/QtPrintSupport
|
||||
endif
|
||||
ifndef QTMOC
|
||||
QTMOC := $(QTHOME)/bin/moc
|
||||
endif
|
||||
ifndef QTLIBS # Qt5
|
||||
QTLIBS := $(LIB_PATH)$(QTHOME)/lib Qt5Core.lib Qt5Gui.lib Qt5Widgets.lib Qt5PrintSupport.lib
|
||||
endif
|
||||
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 Qt5PrintSupport.lib
|
||||
GLQTLIBS := $(LIB_PATH)$(QTHOME)/lib Qt5Core.lib Qt5Gui.lib Qt5Widgets.lib Qt5OpenGL.lib
|
||||
endif
|
||||
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user