Changeset 258 in PSPA for Interface_Web/trunk/pspaWT

Timestamp:

Jan 21, 2013, 6:32:58 PM (11 years ago)

Author:

garnier

Message:

refactoring

Location:

Interface_Web/trunk/pspaWT

Files:

• History (modified) (1 diff)
• cmt/requirements (modified) (2 diffs)

Interface_Web/trunk/pspaWT/History

@@ -12 +12 @@
 - renommage de GWt_LigneFaisceau en GWt_ligneFaisceau
 - ajout d'une srollbar
+- refactoring
 
 19 Janvier 2012  Laurent Garnier

Interface_Web/trunk/pspaWT/cmt/requirements

@@ -12 +12 @@
 include_dirs $(PSPAWTROOT)/sources/userInterface/include  $(PSPAWTROOT)/sources/controler/include
 
-#library PSPSLib   \
-#  ../src/pspa.C
+library PSPSLib   \
+ ../sources/controler/src/bareParticle.cc \
+ ../sources/controler/src/particleBeam.cc \
+ ../sources/controler/src/dataManager.cc \
+ ../sources/controler/src/elementsCollection.cc \
+ ../sources/controler/src/elementDrift.cc \
+ ../sources/controler/src/elementCell.cc \
+ ../sources/controler/src/elementRfgun.cc \
+ ../sources/controler/src/elementSoleno.cc \
+ ../sources/controler/src/elementBend.cc \
+ ../sources/controler/src/elementBeam.cc \
+ ../sources/controler/src/elementFit.cc \
+ ../sources/controler/src/globalParameters.cc \
+ ../sources/controler/src/abstractElement.cc \
+ ../sources/controler/src/nomdElements.cc \
+ ../sources/controler/src/nomDeLogiciel.cc \
+ ../sources/controler/src/beam2Moments.cc \
+ ../sources/userInterface/src/GWt_cell.cc \
+ ../sources/userInterface/src/GWt_rfgun.cc \
+ ../sources/userInterface/src/GWt_soleno.cc \
+ ../sources/userInterface/src/GWt_bend.cc \
+ ../sources/userInterface/src/GWt_beam.cc \
+ ../sources/userInterface/src/GWt_globalParameters.cc \
+ ../sources/userInterface/src/GWt_drift.cc \
+ ../sources/userInterface/src/GWt_dialog.cc \
+ ../sources/userInterface/src/GWt_fit.cc \
+ ../sources/userInterface/src/GWt_abstractElement.cc \
+ ../sources/userInterface/src/GWt_console.cc \
+ ../sources/userInterface/src/GWt_ligneFaisceau.cc \
+ ../sources/userInterface/src/GWt_pspaApplication.cc \
+ ../sources/userInterface/src/GWt_elementLigneFaiseau.cc \
+ ../sources/userInterface/src/GWt_dropZoneLigneFaisceau.cc \
+ ../sources/userInterface/src/GWt_draggableImage.cc
 
 
 
-#macro lib_PSPSLib_cppflags " ${Wt_cflags} ${boost_cflags} -DTHREADED -DDRAWWT_BUILD  -DHAS_IMAGEMAGIC -DPSPA_DEBUG" Linux-x86_64  " ${Wt_cflags} ${boost_cflags} -DTHREADED -DDRAWWT_BUILD -DHAS_IMAGEMAGIC"
+macro lib_PSPSLib_cppflags " ${Wt_cflags} ${boost_cflags} -DTHREADED -DDRAWWT_BUILD  -DHAS_IMAGEMAGIC -DPSPA_DEBUG" Linux-x86_64  " ${Wt_cflags} ${boost_cflags} -DTHREADED -DDRAWWT_BUILD -DHAS_IMAGEMAGIC"
 
 macro lib_PSPSLib_cppflags " ${Wt_cflags} ${boost_cflags} -DTHREADED -DDRAWWT_BUILD  -DPSPA_DEBUG" Linux-x86_64  " ${Wt_cflags} ${boost_cflags} -DTHREADED -DDRAWWT_BUILD "
 
+macro PSPSLib_shlibflags   " ${Wt_linkopts} ${boost_linkopts} ${dld_linkopts} -F/System/Library/Frameworks "
 
+macro PSPSLib_linkopts     " -L${PSPAWTROOT}/$(Platform_bin) -lPSPSLib "
 
+macro_append pspaWT_cppflags "${lib_PSPSLib_cppflags}"
+macro_append pspaWTlinkopts "${PSPSLib_linkopts}"
 
-#macro PSPSLib_shlibflags   " ${Wt_linkopts} ${boost_linkopts} ${dld_linkopts} -F/System/Library/Frameworks "
-
-#macro PSPSLib_linkopts     " -L${PSPAWTROOT}/$(Platform_bin) -lPSPSLib "
-application pspaWT bareParticle.cc particleBeam.cc GWt_cell.cc GWt_rfgun.cc GWt_soleno.cc GWt_bend.cc GWt_beam.cc GWt_globalParameters.cc GWt_drift.cc GWt_fit.cc GWt_abstractElement.cc dataManager.cc elementsCollection.cc elementDrift.cc elementCell.cc elementRfgun.cc elementSoleno.cc elementBend.cc elementBeam.cc elementFit.cc globalParameters.cc abstractElement.cc GWt_console.cc GWt_ligneFaisceau.cc GWt_pspaApplication.cc GWt_elementLigneFaiseau.cc GWt_dropZoneLigneFaisceau.cc GWt_draggableImage.cc GWt_dialog.cc nomdElements.cc nomDeLogiciel.cc beam2Moments.cc main.cc use_cppflags='" ${lib_PSPSLib_cppflags}"'
+application pspaWT ../sources/controler/src/main.cc
 
 macro DrawWt_linkopts " ${PSPSLib_linkopts} ${Wt_linkopts} ${boost_linkopts} ${dld_linkopts}"
@@ -40 +72 @@
 #macro_append cppflags  " -O" WIN32 " /O2"
 #macro_append cpplinkflags  " -O" WIN32 ""
+
+path_append DYLD_LIBRARY_PATH "$(Platform_bin)" 
+path_append LD_LIBRARY_PATH "$(Platform_bin)"