Changeset 1354 for trunk


Ignore:
Timestamp:
Jan 7, 2011, 12:24:48 PM (13 years ago)
Author:
garnier
Message:

fix remove OGL problem on windows

Location:
trunk/source
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/interfaces/basic/GNUmakefile

    r1349 r1354  
    2020
    2121# NO need OGL, then reset OGLGLAGS
    22 OGLFLAGS = ""
    23 OGLLIBS  = ""
     22OGLFLAGS =
     23OGLLIBS  =
    2424
    2525CPPFLAGS += -I$(G4BASE)/global/management/include

  • trunk/source/interfaces/basic/GNUmakefile~

    r1350 r1354  
    1 # $Id: GNUmakefile,v 1.7 2009/10/19 07:37:48 lgarnier Exp $
     1# $Id: GNUmakefile,v 1.8 2010/12/23 14:09:53 lgarnier Exp $
    22# -------------------------------------------------------------
    33# GNUmakefile for interfaces/basic library.  John Allison, 6/7/98.
    … …  
    1313
    1414# For debug mode
    15 CPPFLAGS += -DG4DEBUG_INTERFACES_BASIC
     15# CPPFLAGS += -DG4DEBUG_INTERFACES_BASIC
    1616
    1717include $(G4INSTALL)/config/architecture.gmk

  • trunk/source/interfaces/common/GNUmakefile

    r1349 r1354  
    1717
    1818# NO need OGL, then reset OGLGLAGS
    19 OGLFLAGS = ""
    20 OGLLIBS  = ""
     19OGLFLAGS =
     20OGLLIBS  =
    2121
    2222CPPFLAGS += -I$(G4BASE)/global/management/include

  • trunk/source/interfaces/common/GNUmakefile~

    r1350 r1354  
    1 # $Id: GNUmakefile,v 1.5 2010/01/06 14:08:20 lgarnier Exp $
     1# $Id: GNUmakefile,v 1.6 2010/12/23 14:09:53 lgarnier Exp $
    22# -------------------------------------------------------------
    33# GNUmakefile for interfaces/common library.  John Allison, 6/7/98.
    … …  
    1313
    1414include $(G4INSTALL)/config/architecture.gmk
    15 #include $(G4INSTALL)/config/G4VIS_BUILD.gmk
    1615include $(G4INSTALL)/config/G4UI_BUILD.gmk
    1716include $(G4INSTALL)/config/interactivity.gmk

  • trunk/source/visualization/FukuiRenderer/GNUmakefile

    r1348 r1354  
    1919
    2020# NO need OGL, then reset OGLGLAGS
    21 OGLFLAGS = ""
    22 OGLLIBS  = ""
     21OGLFLAGS =
     22OGLLIBS  =
    2323# NO need QT, then reset QTGLAGS
    24 QTFLAGS = ""
    25 QTLIBS  = ""
    26 GLQTLIBS  = ""
     24QTFLAGS =
     25QTLIBS  =
     26GLQTLIBS  =
    2727
    2828CPPFLAGS += -I$(G4BASE)/visualization/management/include

  • trunk/source/visualization/FukuiRenderer/GNUmakefile~

    r1350 r1354  
    1 # $Id: GNUmakefile,v 1.6 2009/10/21 14:59:17 allison Exp $
     1# $Id: GNUmakefile,v 1.7 2011/01/03 14:32:22 lgarnier Exp $
    22
    33name := G4FR
    … …  
    1818include $(G4INSTALL)/config/interactivity.gmk
    1919
     20# NO need OGL, then reset OGLGLAGS
     21OGLFLAGS = ""
     22OGLLIBS  = ""
     23# NO need QT, then reset QTGLAGS
     24QTFLAGS = ""
     25QTLIBS  = ""
     26GLQTLIBS  = ""
     27
    2028CPPFLAGS += -I$(G4BASE)/visualization/management/include
    2129CPPFLAGS += -I$(G4BASE)/visualization/modeling/include

  • trunk/source/visualization/RayTracer/GNUmakefile

    r1348 r1354  
    1919
    2020# NO need OGL, then reset OGLGLAGS
    21 OGLFLAGS = ""
    22 OGLLIBS  = ""
     21OGLFLAGS =
     22OGLLIBS  =
    2323# NO need QT, then reset QTGLAGS
    24 QTFLAGS = ""
    25 QTLIBS  = ""
    26 GLQTLIBS  = ""
     24QTFLAGS =
     25QTLIBS  =
     26GLQTLIBS =
    2727
    2828CPPFLAGS += -DG4VIS_ALLOC_EXPORT

  • trunk/source/visualization/RayTracer/GNUmakefile~

    r1350 r1354  
    1 # $Id: GNUmakefile,v 1.11 2005/11/18 23:07:04 allison Exp $
     1# $Id: GNUmakefile,v 1.14 2011/01/03 14:53:34 lgarnier Exp $
    22
    33name := G4RayTracer

  • trunk/source/visualization/Tree/GNUmakefile

    r1348 r1354  
    1919
    2020# NO need OGL, then reset OGLGLAGS
    21 OGLFLAGS = ""
    22 OGLLIBS  = ""
     21OGLFLAGS =
     22OGLLIBS  =
    2323# NO need QT, then reset QTGLAGS
    24 QTFLAGS = ""
    25 QTLIBS  = ""
    26 GLQTLIBS  = ""
     24QTFLAGS =
     25QTLIBS  =
     26GLQTLIBS  =
    2727
    2828CPPFLAGS += -I$(G4BASE)/visualization/management/include

  • trunk/source/visualization/Tree/GNUmakefile~

    r1350 r1354  
    1 # $Id: GNUmakefile,v 1.6 2006/11/05 20:45:45 allison Exp $
     1# $Id: GNUmakefile,v 1.7 2011/01/03 14:55:59 lgarnier Exp $
    22
    33name := G4Tree
    … …  
    1717include $(G4INSTALL)/config/G4VIS_BUILD.gmk
    1818include $(G4INSTALL)/config/interactivity.gmk
     19
     20# NO need OGL, then reset OGLGLAGS
     21OGLFLAGS = ""
     22OGLLIBS  = ""
     23# NO need QT, then reset QTGLAGS
     24QTFLAGS = ""
     25QTLIBS  = ""
     26GLQTLIBS  = ""
    1927
    2028CPPFLAGS += -I$(G4BASE)/visualization/management/include

  • trunk/source/visualization/VRML/GNUmakefile

    r1348 r1354  
    2020
    2121# NO need OGL, then reset OGLGLAGS
    22 OGLFLAGS = ""
    23 OGLLIBS  = ""
     22OGLFLAGS =
     23OGLLIBS  =
    2424# NO need QT, then reset QTGLAGS
    25 QTFLAGS = ""
    26 QTLIBS  = ""
    27 GLQTLIBS  = ""
     25QTFLAGS =
     26QTLIBS  =
     27GLQTLIBS  =
    2828
    2929CPPFLAGS += -I$(G4BASE)/visualization/management/include

  • trunk/source/visualization/VRML/GNUmakefile~

    r1350 r1354  
    1 # $Id: GNUmakefile,v 1.8 2009/10/21 15:27:21 allison Exp $
     1# $Id: GNUmakefile,v 1.9 2010/12/23 14:18:05 lgarnier Exp $
    22
    33# lib name
    … …  
    1919include $(G4INSTALL)/config/interactivity.gmk
    2020
     21# NO need OGL, then reset OGLGLAGS
     22OGLFLAGS = ""
     23OGLLIBS  = ""
     24# NO need QT, then reset QTGLAGS
     25QTFLAGS = ""
     26QTLIBS  = ""
     27GLQTLIBS  = ""
     28
    2129CPPFLAGS += -I$(G4BASE)/visualization/management/include
    2230CPPFLAGS += -I$(G4BASE)/visualization/modeling/include

  • trunk/source/visualization/gMocren/GNUmakefile

    r1348 r1354  
    1919
    2020# NO need OGL, then reset OGLGLAGS
    21 OGLFLAGS = ""
    22 OGLLIBS  = ""
     21OGLFLAGS =
     22OGLLIBS  =
    2323# NO need QT, then reset QTGLAGS
    24 QTFLAGS = ""
    25 QTLIBS  = ""
    26 GLQTLIBS  = ""
     24QTFLAGS =
     25QTLIBS  =
     26GLQTLIBS  =
    2727
    2828CPPFLAGS += -I$(G4BASE)/visualization/management/include

  • trunk/source/visualization/gMocren/GNUmakefile~

    r1350 r1354  
    1 # $Id: GNUmakefile,v 1.2 2009/10/12 10:24:23 akimura Exp $
     1# $Id: GNUmakefile,v 1.3 2011/01/03 14:34:46 lgarnier Exp $
    22
    33name := G4GMocren
    … …  
    1717include $(G4INSTALL)/config/G4VIS_BUILD.gmk
    1818include $(G4INSTALL)/config/interactivity.gmk
     19
     20# NO need OGL, then reset OGLGLAGS
     21OGLFLAGS = ""
     22OGLLIBS  = ""
     23# NO need QT, then reset QTGLAGS
     24QTFLAGS = ""
     25QTLIBS  = ""
     26GLQTLIBS  = ""
    1927
    2028CPPFLAGS += -I$(G4BASE)/visualization/management/include
Note: See TracChangeset for help on using the changeset viewer.