Changeset 1045 for trunk/config/G4UI_USE.gmk

Timestamp:

May 15, 2009, 12:28:43 PM (15 years ago)

Author:

garnier

Message:

maj en aussi sur CVS

File:

• trunk/config/G4UI_USE.gmk (modified) (2 diffs)

trunk/config/G4UI_USE.gmk

@@ -1 @@
-# $Id: G4UI_USE.gmk,v 1.12 2008/05/14 09:48:19 gbarrand Exp $
+# $Id: G4UI_USE.gmk,v 1.15 2009/03/05 09:19:37 gbarrand Exp $
 # -------------------------------------------------------------
 # GNUmakefile for CPPFLAGS for interfaces USE phase.
 #   John Allison, 6th July 1998.
 
-########################### interfaces/basic #######################
-ifndef G4UI_USE_INCLUDED
-  G4UI_USE_INCLUDED = 1
-  
 ifndef G4UI_NONE
 
-UILIBS :=
+ifndef G4UI_USE_INCLUDED
+G4UI_USE_INCLUDED = 1
+  
+ifndef UILIBS
+  UILIBS :=
+endif
 
 # Sessions not needing external packages or libraries.  These
@@ -81 +82 @@
 endif
 
-ifdef G4UI_USE_OSC
-  CPPFLAGS += -DG4UI_USE_OSC
-  ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
-    # need a syntax that both g++ and CL.exe understand :
-    G4OSC_TMP_1 := $(shell echo "`osc-config --g4lab_incs`")
-    CPPFLAGS += $(patsubst /I%,-I"%",$(G4OSC_TMP_1))
-  else
-    CPPFLAGS += `osc-config --g4lab_incs`
-  endif
-  INTYLIBS += `osc-config --g4lab_libs`
-  INTYLIBS += `osc-config --iv_libs`
-  #    
-  ifndef G4ANALYSIS_AIDA_CONFIG_CFLAGS
-    ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
-      # need a syntax that both g++ and CL.exe understand :
-      G4OSC_TMP_2 := $(shell echo "`aida-config --include`")
-      G4ANALYSIS_AIDA_CONFIG_CFLAGS := $(patsubst /I%,-I"%",$(G4OSC_TMP_2))
-    endif
-  endif
-endif
-
-########################### interfaces/XVT - not currently implemented #####
-
 ##################### Default to TERMINAL if no environment variables set ##
-##################### (No need actually to use it - see above.) ############
 
 ifndef G4UI_USE
-  G4UI_USE  = 1
   CPPFLAGS += -DG4UI_USE_TERMINAL
 endif
 
-endif #G4UI_NONE
+########################### and finally... #######################
+
+G4UI_USE  = 1
+CPPFLAGS += -DG4UI_USE
+
 endif # G4UI_USE_INCLUDED
+endif # G4UI_NONE