Changeset 893 for trunk/config/sys

Timestamp:

Nov 27, 2008, 4:56:05 PM (17 years ago)

Author:

garnier

Message:

make 3.80 added because 3.81 is bad

Location:

trunk/config/sys

Files:

• Darwin-g++.gmk (modified) (4 diffs)
• Linux-g++.gmk (modified) (5 diffs)
• WIN32-VC.gmk (modified) (1 diff)

trunk/config/sys/Darwin-g++.gmk

@@ -71 +71 @@
     endif
   endif
+
+# ---- QT Setup block -------------------------------------------------------
   ifndef QTHOME
     QTHOME   := $(shell test -f /Library/Frameworks/Qt3Support.framework/Qt3Support && echo  "/Library/Frameworks" || echo "/sw")
   endif
-
   ifndef QTMOC
    ifeq ($(QTHOME),/Library/Frameworks)
@@ -115 +116 @@
     endif
   endif
-
   ifndef GLQTLIBS
     ifeq ($(QT_VERSION),3)
@@ -125 +125 @@
     endif
   endif
+#----------------------------------------------------------------------------
 
   define build-granular-shared-lib
     @libdir=`(cd $(@D);/bin/pwd)`; \
      cd $(G4TMPDIR); \
-     g++ -dynamiclib -single_module -undefined dynamic_lookup \
+     $(CXX)  -dynamiclib -single_module -undefined dynamic_lookup \
          -o $$libdir/$(@F) $(INTYLIBS) *.o
   endef
@@ -135 +136 @@
     @libdir=`(cd $(@D);/bin/pwd)`; \
      cd $(G4TMP)/$(G4SYSTEM); \
-     g++ -dynamiclib -single_module -undefined dynamic_lookup \
+     $(CXX)  -dynamiclib -single_module -undefined dynamic_lookup \
          -o $$libdir/$(@F) $(INTYLIBS) $(foreach dir,$(SUBLIBS),$(dir)/*.o);
   endef

trunk/config/sys/Linux-g++.gmk

@@ -60 +60 @@
     XMLIBS    := -lXm -lXpm
   endif
+
+# ---- QT Setup block -------------------------------------------------------
   ifndef QTHOME
     QTHOME     := /usr
   endif
-
   ifndef QTMOC
     QTMOC      := $(QTHOME)/bin/moc
@@ -81 +82 @@
     endif
   endif
-
-
   ifndef QTLIBPATH
     QT_SEARCH_LIB1 := $(shell ls  $(QTHOME)/lib/qt$(QT_VERSION)/libq* 2>/dev/null | wc -l )
@@ -93 +92 @@
     endif
   endif
-
   ifndef QTLIBS
     QTLIBS   := -L$(QTHOME)$(QTLIBPATH)
@@ -108 +106 @@
     endif
   endif
-
   ifndef GLQTLIBS
     ifeq ($(QT_VERSION),3)
@@ -117 +114 @@
     endif
   endif
+#----------------------------------------------------------------------------
 
   ifndef XAWFLAGS

trunk/config/sys/WIN32-VC.gmk

@@ -54 +54 @@
     endif
   endif
-  ifndef QTGLLIBS
+  ifndef GLQTLIBS
     ifeq ($(QT_VERSION),QT3)
       QTLIBS   := -L$(QTHOME)/lib -lqt-mt