Changeset 1213 for trunk/config
- Timestamp:
- Dec 10, 2009, 5:31:31 PM (15 years ago)
- Location:
- trunk/config
- Files:
-
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/config/G4UI_BUILD.gmk
r593 r1213 31 31 endif 32 32 33 ifdef G4UI_BUILD_XAW_SESSION34 G4UI_BUILD = 135 G4UI_BUILD_BASIC_SESSION = 136 G4INTY_BUILD_XT = 137 INC_XAW = 138 CPPFLAGS += -DG4UI_BUILD_XAW_SESSION39 endif40 41 33 ifdef G4UI_BUILD_WIN32_SESSION 42 34 G4UI_BUILD = 1 … … 60 52 endif 61 53 62 ifdef G4UI_BUILD_XAW_SESSION63 G4UI_USE_XAW = 164 endif65 66 54 ifdef G4UI_BUILD_WIN32_SESSION 67 55 G4UI_USE_WIN32 = 1 -
trunk/config/G4UI_USE.gmk
r1045 r1213 68 68 endif 69 69 70 ifdef G4UI_USE_XAW71 G4UI_USE = 172 G4INTY_USE_XT = 173 INC_XAW = 174 LOAD_XAW = 175 CPPFLAGS += -DG4UI_USE_XAW76 endif77 78 70 ifdef G4UI_USE_WIN32 79 71 G4UI_USE = 1 -
trunk/config/History
r1195 r1213 17 17 ---------------------------------------------------------- 18 18 19 10th December 2009 Laurent Garnier 20 -Remove old XAW driver 21 19 22 18th November 2009 Gabriele Cosmo (config-V09-02-15) 20 23 - architecture.gmk: corrected inclusion of -lz for zlib. -
trunk/config/interactivity.gmk
r855 r1213 58 58 endif 59 59 60 # Should be before X11.61 ifdef INC_XAW62 INC_X11 = 163 CPPFLAGS += $(XAWFLAGS)64 endif65 ifdef LOAD_XAW66 LOAD_X11 = 167 INTYLIBS += $(XAWLIBS)68 endif69 70 71 60 ifdef INC_X11 72 61 CPPFLAGS += $(X11FLAGS) -
trunk/config/scripts/env.csh.SH
r1195 r1213 57 57 unsetenv G4UI_NONE 58 58 unsetenv G4UI_BUILD_WIN32_SESSION 59 unsetenv G4UI_BUILD_XAW_SESSION60 59 unsetenv G4UI_BUILD_XM_SESSION 61 60 unsetenv G4UI_USE_TCSH 62 61 unsetenv G4UI_USE_WIN32 63 unsetenv G4UI_USE_XAW64 62 unsetenv G4UI_USE_XM 65 63 unsetenv G4UI_USE_QT … … 228 226 229 227 #+ 230 if ( X$g4ui_build_xaw_session == Xy ) then231 setenv G4UI_BUILD_XAW_SESSION 1232 echo "On this machine the G4UI_BUILD_XAW_SESSION=\$G4UI_BUILD_XAW_SESSION"233 endif234 235 #+236 if ( X$g4ui_use_xaw == Xy ) then237 setenv G4UI_USE_XAW 1238 echo "On this machine the G4UI_USE_XAW=\$G4UI_USE_XAW"239 endif240 241 #+242 228 if ( X$g4ui_build_xm_session == Xy ) then 243 229 setenv G4UI_BUILD_XM_SESSION 1 … … 431 417 echo "On this machine the XMLIBS=\$XMLIBS" 432 418 endif 433 434 #+435 if ( X$g4ui_build_xaw_session != X ) then436 setenv XAWFLAGS "$g4ui_xawflags"437 echo "On this machine the XAWFLAGS=\$XAWFLAGS"438 endif439 440 #+441 if ( X$g4ui_build_xaw_session != X ) then442 setenv XAWLIBS "$g4ui_xawlibs"443 echo "On this machine the XAWLIBS=\$XAWLIBS"444 endif445 446 419 447 420 # -
trunk/config/scripts/env.sh.SH
r1195 r1213 57 57 unset G4UI_NONE 58 58 unset G4UI_BUILD_WIN32_SESSION 59 unset G4UI_BUILD_XAW_SESSION60 59 unset G4UI_BUILD_XM_SESSION 61 60 unset G4UI_USE_TCSH 62 61 unset G4UI_USE_WIN32 63 unset G4UI_USE_XAW64 62 unset G4UI_USE_XM 65 63 unset G4UI_USE_QT … … 290 288 291 289 #+ 292 if [ X$g4ui_build_xaw_session = Xy ] ; then293 G4UI_BUILD_XAW_SESSION=1294 export G4UI_BUILD_XAW_SESSION295 if [ X\$g4non_display = X ] ; then296 echo "On this machine the G4UI_BUILD_XAW_SESSION=\$G4UI_BUILD_XAW_SESSION"297 fi298 fi299 300 #+301 if [ X$g4ui_use_xaw = Xy ] ; then302 G4UI_USE_XAW=1303 export G4UI_USE_XAW304 if [ X\$g4non_display = X ] ; then305 echo "On this machine the G4UI_USE_XAW=\$G4UI_USE_XAW"306 fi307 fi308 309 #+310 290 if [ X$g4ui_build_xm_session = Xy ] ; then 311 291 G4UI_BUILD_XM_SESSION=1 … … 597 577 fi 598 578 fi 599 600 #+601 if [ X$g4ui_build_xaw_session != X ] ; then602 XAWFLAGS="$g4ui_xawflags"603 export XAWFLAGS604 if [ X\$g4non_display = X ] ; then605 echo "On this machine the XAWFLAGS=\$XAWFLAGS"606 fi607 fi608 609 #+610 if [ X$g4ui_build_xaw_session != X ] ; then611 XAWLIBS="$g4ui_xawlibs"612 export XAWLIBS613 if [ X\$g4non_display = X ] ; then614 echo "On this machine the XAWLIBS=\$XAWLIBS"615 fi616 fi617 618 579 619 580 # -
trunk/config/scripts/install.sh.SH
r1195 r1213 56 56 unset G4UI_NONE 57 57 unset G4UI_BUILD_WIN32_SESSION 58 unset G4UI_BUILD_XAW_SESSION59 58 unset G4UI_BUILD_XM_SESSION 60 59 unset G4UI_BUILD_QT_SESSION 61 60 unset G4UI_USE_TCSH 62 61 unset G4UI_USE_WIN32 63 unset G4UI_USE_XAW64 62 unset G4UI_USE_XM 65 63 unset G4UI_USE_QT … … 244 242 245 243 #+ 246 if [ X$g4ui_build_xaw_session = Xy ] ; then247 G4UI_BUILD_XAW_SESSION=1248 export G4UI_BUILD_XAW_SESSION249 echo "On this machine the G4UI_BUILD_XAW_SESSION=\$G4UI_BUILD_XAW_SESSION"250 fi251 252 #+253 if [ X$g4ui_use_xaw = Xy ] ; then254 G4UI_USE_XAW=1255 export G4UI_USE_XAW256 echo "On this machine the G4UI_USE_XAW=\$G4UI_USE_XAW"257 fi258 259 #+260 244 if [ X$g4ui_build_xm_session = Xy ] ; then 261 245 G4UI_BUILD_XM_SESSION=1 … … 501 485 fi 502 486 fi 503 504 #+505 if [ X$g4ui_build_xaw_session != X ] ; then506 XAWFLAGS="$g4ui_xawflags"507 export XAWFLAGS508 if [ X\$g4non_display = X ] ; then509 echo "On this machine the XAWFLAGS=\$XAWFLAGS"510 fi511 fi512 513 #+514 if [ X$g4ui_build_xaw_session != X ] ; then515 XAWLIBS="$g4ui_xawlibs"516 export XAWLIBS517 if [ X\$g4non_display = X ] ; then518 echo "On this machine the XAWLIBS=\$XAWLIBS"519 fi520 fi521 522 523 487 524 488 # Qt Flags and Libs, messy, but needed for backward compatibility -
trunk/config/scripts/move.sh.SH
r689 r1213 165 165 # 166 166 #+ 167 if [ X$g4ui_build_xaw_session = Xy ] ; then168 G4UI_BUILD_XAW_SESSION=1169 export G4UI_BUILD_XAW_SESSION170 echo "On this machine the G4UI_BUILD_XAW_SESSION=\$G4UI_BUILD_XAW_SESSION"171 fi172 173 #+174 if [ X$g4ui_use_xaw = Xy ] ; then175 G4UI_USE_XAW=1176 export G4UI_USE_XAW177 echo "On this machine the G4UI_USE_XAW=\$G4UI_USE_XAW"178 fi179 180 #+181 167 if [ X$g4ui_build_xm_session = Xy ] ; then 182 168 G4UI_BUILD_XM_SESSION=1 -
trunk/config/sys/AIX-xlC.gmk
r865 r1213 30 30 XMLIBS := -L/usr/lib -lXm -lXt -lX11 31 31 endif 32 ifndef XAWFLAGS33 XAWFLAGS := -I/usr/include/X1134 endif35 ifndef XAWLIBS36 XAWLIBS := -L/usr/lib -lXaw -lXmu -lXt -lX11 -lXext37 endif38 32 ifndef OGLFLAGS 39 33 OGLFLAGS := -I$(OGLHOME)/include -
trunk/config/sys/DEC-cxx.gmk
r472 r1213 31 31 XMLIBS := -lXm 32 32 endif 33 ifndef XAWFLAGS34 XAWFLAGS :=35 endif36 ifndef XAWLIBS37 XAWLIBS := -lXaw38 endif39 33 ifndef OGLFLAGS 40 34 OGLFLAGS := -I$(OGLHOME)/include -
trunk/config/sys/Darwin-g++.gmk
r1185 r1213 54 54 XMLIBS := -L/sw/lib -lXm -lXpm 55 55 # XMLIBS := -L/usr/X11R6/lib -lXm -lXpm ##### some installations. 56 endif57 ifndef XAWFLAGS58 XAWFLAGS := -I/sw/include59 # XAWFLAGS := -I/usr/X11R6/include ##### some installations.60 endif61 ifndef XAWLIBS62 XAWLIBS := -lXaw63 56 endif 64 57 DLDLIBS := -ldl -
trunk/config/sys/HP-aCC.gmk
r472 r1213 38 38 XMLIBS := -L/usr/lib/Motif1.2_R6 -lXm 39 39 endif 40 ifndef XAWFLAGS41 XAWFLAGS := -I/usr/contrib/X11R6/include -I/usr/contrib/X11R6/include/X1142 endif43 ifndef XAWLIBS44 XAWLIBS := -L/usr/contrib/X11R6/lib -lXaw45 endif46 40 ifndef OGLFLAGS 47 41 OGLFLAGS := -I$(OGLHOME)/include -
trunk/config/sys/Linux-egcs.gmk
r472 r1213 44 44 XMLIBS := -lXm -lXpm 45 45 endif 46 ifndef XAWFLAGS47 XAWFLAGS := -I/usr/X11R6/include48 endif49 ifndef XAWLIBS50 XAWLIBS := -lXaw51 endif52 46 DLDLIBS := -ldl 53 47 ifndef OGLFLAGS -
trunk/config/sys/Linux-g++.gmk
r1030 r1213 61 61 ifndef XMLIBS 62 62 XMLIBS := -lXm -lXpm 63 endif64 ifndef XAWFLAGS65 XAWFLAGS := -I/usr/X11R6/include66 endif67 ifndef XAWLIBS68 XAWLIBS := -lXaw69 63 endif 70 64 DLDLIBS := -ldl -
trunk/config/sys/Linux-icc.gmk
r1045 r1213 46 46 XMLIBS := -lXm -lXpm 47 47 endif 48 ifndef XAWFLAGS49 XAWFLAGS := -I/usr/X11R6/include50 endif51 ifndef XAWLIBS52 XAWLIBS := -lXaw53 endif54 48 DLDLIBS := -ldl 55 49 ifndef OGLFLAGS -
trunk/config/sys/SGI-CC.gmk
r472 r1213 30 30 XMLIBS := -L/usr/lib -lXm 31 31 endif 32 ifndef XAWFLAGS33 XAWFLAGS :=34 endif35 ifndef XAWLIBS36 XAWLIBS := -lXaw37 endif38 32 ifndef OGLFLAGS 39 33 OGLFLAGS := -
trunk/config/sys/SUN-CC.gmk
r593 r1213 39 39 XMLIBS += -R/usr/openwin/lib -lXt -lXm -lX11 40 40 endif 41 ifndef XAWFLAGS42 XAWFLAGS := -I/usr/openwin/include/X1143 endif44 ifndef XAWLIBS45 XAWLIBS := -L/usr/openwin/lib -L/usr/dt/lib -L/usr/ucblib46 XAWLIBS += -R/usr/openwin/lib -lXaw -lXmu -lXt -lX11 -lXext47 endif48 41 ifndef OGLFLAGS 49 42 OGLFLAGS := -I$(OGLHOME)/include -
trunk/config/sys/WIN32-g++.gmk
r1185 r1213 60 60 XMLIBS := -lXm -lXpm 61 61 endif 62 ifndef XAWFLAGS63 XAWFLAGS := -I/usr/X11R6/include64 endif65 ifndef XAWLIBS66 XAWLIBS := -lXaw67 endif68 62 ifndef OGLFLAGS 69 63 OGLFLAGS := -I$(OGLHOME)/include
Note: See TracChangeset
for help on using the changeset viewer.