Ignore:
Timestamp:
Apr 17, 2008, 11:32:32 AM (16 years ago)
Author:
garnier
Message:

r785@wl-72126: garnier | 2008-04-17 11:30:37 +0200
une version qui marche avec les moc

Location:
trunk/geant4/visualization
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/geant4/visualization/GNUmakefile

    r763 r776  
    1 # $Id: GNUmakefile,v 1.7 2008/01/15 11:05:08 lgarnier Exp $
     1# $Id: GNUmakefile,v 1.21 2005/06/04 14:53:18 gcosmo Exp $
     2# -----------------------------------------------------------------------
     3# GNUmakefile for visualization and modeling.  John Allison, 5/7/95.
     4# Modeling is always made.  Others by environment.  John Allison  4/7/98.
     5# -----------------------------------------------------------------------
    26
    3 name := G4OpenGL_moc
    4 dirMoc := OpenGL
    5 mocFiles := ../OpenGL/
     7MAKEFLAGS= --no-print-directory
     8
     9name := G4visualization
    610
    711ifndef G4INSTALL
    8   G4INSTALL = ../../..
     12  G4INSTALL = ../..
    913endif
    10 
    11 # Definition of macro for moc files (for Qt use only)
    12 MOC_MACRO = -DG4VIS_BUILD_OPENGLQT_DRIVER
    13 
    14 GLOBLIBS  = libG4vis_management.lib libG4modeling.lib
    15 GLOBLIBS += libG4interfaces.lib libG4run.lib libG4event.lib
    16 GLOBLIBS += libG4tracking.lib libG4processes.lib libG4digits_hits.lib
    17 GLOBLIBS += libG4track.lib libG4particles.lib libG4geometry.lib
    18 GLOBLIBS += libG4materials.lib libG4graphics_reps.lib
    19 GLOBLIBS += libG4intercoms.lib libG4global.lib
    2014
    2115include $(G4INSTALL)/config/architecture.gmk
    … …  
    2317include $(G4INSTALL)/config/interactivity.gmk
    2418
    25 CPPFLAGS += -I$(G4BASE)/visualization/OpenGL/include
    26 CPPFLAGS += -I$(G4BASE)/visualization/management/include
    27 CPPFLAGS += -I$(G4BASE)/visualization/modeling/include
    28 CPPFLAGS += -I$(G4BASE)/global/management/include
    29 CPPFLAGS += -I$(G4BASE)/global/HEPGeometry/include
    30 CPPFLAGS += -I$(G4BASE)/geometry/solids/CSG/include
    31 CPPFLAGS += -I$(G4BASE)/geometry/solids/specific/include
    32 CPPFLAGS += -I$(G4BASE)/graphics_reps/include
    33 CPPFLAGS += -I$(G4BASE)/geometry/management/include
    34 CPPFLAGS += -I$(G4BASE)/intercoms/include
    35 CPPFLAGS += -I$(G4BASE)/interfaces/common/include
    36 CPPFLAGS += -I$(G4BASE)/tracking/include
    37 CPPFLAGS += -I$(G4BASE)/digits_hits/hits/include
     19SUBDIRS := modeling
     20SUBLIBS := G4modeling
    3821
    39 moc_tst := $(shell ls -al litMoc.gmk)
    40 include $(G4INSTALL)/config/moc.gmk
    41 moc_tst := $(shell ls -al litCommon.gmk)
    42 include $(G4INSTALL)/config/common.gmk
    43 moc_tst := $(shell ls -al FIN)
     22ifdef G4LIB_BUILD_ZLIB
     23  SUBDIRS += externals/zlib
     24  SUBLIBS += G4zlib
     25endif
     26
     27# Libraries which can be used without external packages or libraries...
     28ifdef G4VIS_BUILD
     29  SUBDIRS += management
     30  SUBLIBS += G4vis_management
     31  SUBDIRS += FukuiRenderer
     32  SUBLIBS += G4FR
     33  SUBDIRS += HepRep
     34  SUBLIBS += G4visHepRep
     35  SUBDIRS += RayTracer
     36  SUBLIBS += G4RayTracer
     37  SUBDIRS += VRML
     38  SUBLIBS += G4VRML
     39  SUBDIRS += Tree
     40  SUBLIBS += G4Tree
     41  SUBDIRS += XXX
     42  SUBLIBS += G4visXXX
     43
     44ifdef G4VIS_BUILD_OPENGL_DRIVER
     45  SUBDIRS += OpenGL
     46  SUBLIBS += G4OpenGL
     47endif
     48ifdef G4VIS_BUILD_OPENGLQT_DRIVER
     49  SUBDIRS += OpenGL_moc
     50  SUBLIBS += G4OpenGL_moc
     51endif
     52ifdef G4VIS_BUILD_OI_DRIVER
     53  SUBDIRS += OpenInventor
     54  SUBLIBS += G4OpenInventor
     55endif
     56endif #G4VIS_BUILD
     57
     58.PHONY: granular glob global clean
     59
     60glob global: granular
     61
     62granular:
     63        @for dir in $(SUBDIRS); do (cd $$dir; $(MAKE)); done
     64
     65includes:
     66        @for dir in $(SUBDIRS); do (cd $$dir && $(MAKE) $@ ); done
     67
     68clean clean_libs:
     69        @for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) $@); done

  • trunk/geant4/visualization/History

    r688 r776  
    1 $Id: History,v 1.419 2008/01/04 22:17:08 allison Exp $
     1$Id: History,v 1.420 2008/01/29 22:39:52 allison Exp $
    22-------------------------------------------------------------------
    33
    … …  
    2424History file for visualization category
    2525---------------------------------------
     26
     2729th January 2008  John Allison  (vis-V09-01-01)
     28- visman-V09-01-01: Re-instated G4DAWNFILE (somehow got lost!!)
    2629
    27304th January 2008  John Allison  (vis-V09-01-00 with greps-V09-01-00)

  • trunk/geant4/visualization/OpenGL/GNUmakefile

    r688 r776  
    66  G4INSTALL = ../../..
    77endif
    8 
    9 # Definition of macro for moc files (for Qt use only)
    10 MOC_MACRO = -DG4VIS_BUILD_OPENGLQT_DRIVER
    118
    129GLOBLIBS  = libG4vis_management.lib libG4modeling.lib

  • trunk/geant4/visualization/OpenGL/History

    r714 r776  
    1 $Id: History,v 1.108 2008/01/30 11:16:42 lgarnier Exp $
     1$Id: History,v 1.111 2008/03/11 16:05:56 lgarnier Exp $
    22-------------------------------------------------------------------
    33
    … …  
    2121-------------------------------------
    2222
    23 5th February 2008, Laurent Garnier
    24  - Fix a bug on moving step when moving camera. It is now the same screen
    25    step even when we are zooming on scene.
    26  - Improvment : When mouse move the camera, it now follow exactly the scene.
     2311th March 2008, Laurent Garnier
     24 - Resolve QT3 compilation errors
     25
     2610th March 2008, Laurent Garnier
     27 - Add a dialog panel to make movies (Right button->Actions->Movie parameters)
     28 - Add ability to "auto rotate" volume launched with quick mouse move
     29 - Lots of improvments for Qt3
     30 - Improvments on moving steps with shortcuts
     31 - Could now select between orthogonal/perspective view mode
     32
     331st February 2008  John Allison
     34 - G4OpenGLQtViewer.cc: Fix #ifdef QT protection.
     35 - G4OpenGLSceneHandler.cc: Small improvement to logic of setting GL_LIGHTING.
    2736
    283730th January 2008, Laurent Garnier

  • trunk/geant4/visualization/OpenGL_moc/GNUmakefile

    r763 r776  
    33name := G4OpenGL_moc
    44dirMoc := OpenGL
    5 mocFiles := ../OpenGL/
    65
    76ifndef G4INSTALL
    … …  
    3736CPPFLAGS += -I$(G4BASE)/digits_hits/hits/include
    3837
    39 moc_tst := $(shell ls -al litMoc.gmk)
    4038include $(G4INSTALL)/config/moc.gmk
    41 moc_tst := $(shell ls -al litCommon.gmk)
    4239include $(G4INSTALL)/config/common.gmk
    43 moc_tst := $(shell ls -al FIN)
Note: See TracChangeset for help on using the changeset viewer.