* segmentation/segmentation.pro, * segmentation/segmentation.sh, * segmentation2dt/segmentation2dt.pro, * segmentation2dt/segmentation2dt.sh, * viewer/viewer.pro: Here. * anapath/anapath.sh: New. --- igr/ChangeLog | 10 ++++++++++ igr/anapath/anapath.sh | 4 ++++ igr/segmentation/segmentation.pro | 2 +- igr/segmentation/segmentation.sh | 2 +- igr/segmentation2dt/segmentation2dt.pro | 4 ++-- igr/segmentation2dt/segmentation2dt.sh | 2 +- igr/viewer/viewer.pro | 2 +- 7 files changed, 20 insertions(+), 6 deletions(-) create mode 100755 igr/anapath/anapath.sh diff --git a/igr/ChangeLog b/igr/ChangeLog index 9298ac3..f915752 100644 --- a/igr/ChangeLog +++ b/igr/ChangeLog @@ -1,3 +1,13 @@ +2010-11-18 Guillaume Lazzara <z@lrde.epita.fr> + + Fix Paths in scripts and build systems. + + * segmentation/segmentation.pro, + * segmentation/segmentation.sh, + * segmentation2dt/segmentation2dt.pro, + * segmentation2dt/segmentation2dt.sh, + * viewer/viewer.pro: Here. + 2010-11-16 Guillaume Lazzara <z@lrde.epita.fr> Update build system to use MLN_WO_GLOBAL_VARS. diff --git a/igr/anapath/anapath.sh b/igr/anapath/anapath.sh new file mode 100755 index 0000000..b1c0c85 --- /dev/null +++ b/igr/anapath/anapath.sh @@ -0,0 +1,4 @@ +#!/bin/zsh +source ~/.zshrc +/home/inca/olena/igr/anapath/anapath + diff --git a/igr/segmentation/segmentation.pro b/igr/segmentation/segmentation.pro index 4a0f003..743ce04 100644 --- a/igr/segmentation/segmentation.pro +++ b/igr/segmentation/segmentation.pro @@ -5,7 +5,7 @@ TEMPLATE = app TARGET = DEPENDPATH += . src ui -#INCLUDEPATH += . src $(PWD)/../../ $(PWD)/.. $(PWD)/../shared $(OLN)/milena /home/inca/local/include +#INCLUDEPATH += . src $(PWD)/../../ $(PWD)/.. $(PWD)/../shared $(OLN)/milena /home/inca/local/include /usr/local/qwt-5.0.2/include INCLUDEPATH += . src $(PWD)/.. $(PWD)/../shared $(OLN)/milena DEFINES= NDEBUG MLN_WO_GLOBAL_VARS diff --git a/igr/segmentation/segmentation.sh b/igr/segmentation/segmentation.sh index ea2f160..32a8c5c 100755 --- a/igr/segmentation/segmentation.sh +++ b/igr/segmentation/segmentation.sh @@ -1,3 +1,3 @@ #!/bin/zsh source ~/.zshrc -/home/inca/olena/trunk/milena/sandbox/lazzara/igr/gui/segmentation/segmentation +/home/inca/olena/igr/segmentation/segmentation diff --git a/igr/segmentation2dt/segmentation2dt.pro b/igr/segmentation2dt/segmentation2dt.pro index d7ce7e6..69456f1 100644 --- a/igr/segmentation2dt/segmentation2dt.pro +++ b/igr/segmentation2dt/segmentation2dt.pro @@ -5,14 +5,14 @@ TEMPLATE = app TARGET = DEPENDPATH += . src ui -#INCLUDEPATH += . src $(PWD)/../../ $(PWD)/.. $(PWD)/../shared $(OLN)/milena /home/inca/local/include +#INCLUDEPATH += . src $(PWD)/../../ $(PWD)/.. $(PWD)/../shared $(OLN)/milena /home/inca/local/include /usr/local/qwt-5.0.2/include INCLUDEPATH += . src $(PWD)/.. $(PWD)/../shared $(OLN)/milena DEFINES= NDEBUG MLN_WO_GLOBAL_VARS QMAKE_CXX += -O2 -#LIBS += -L/home/inca/local/lib -lgdcmCommon -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib -lqwt-qt4 +#LIBS += -L/home/inca/local/lib -lgdcmCommon -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib -L/usr/local/qwt-5.0.2/lib -lqwt LIBS += -lgdcmCommon -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lqwt-qt4 diff --git a/igr/segmentation2dt/segmentation2dt.sh b/igr/segmentation2dt/segmentation2dt.sh index 54b0a37..9ceeeef 100755 --- a/igr/segmentation2dt/segmentation2dt.sh +++ b/igr/segmentation2dt/segmentation2dt.sh @@ -1,4 +1,4 @@ #!/bin/zsh source ~/.zshrc -/home/inca/olena/trunk/milena/sandbox/lazzara/igr/gui/segmentation2dt/segmentation2dt +/home/inca/olena/igr/segmentation2dt/segmentation2dt diff --git a/igr/viewer/viewer.pro b/igr/viewer/viewer.pro index b384b8f..ef01446 100644 --- a/igr/viewer/viewer.pro +++ b/igr/viewer/viewer.pro @@ -6,7 +6,7 @@ TEMPLATE = app TARGET = DEPENDPATH += . src ui INCLUDEPATH += . src ../shared ../ $(OLN)/milena -#INCLUDEPATH += . src ../shared ../ $(OLN)/milena /home/inca/local/include +#INCLUDEPATH += . src ../shared ../ $(OLN) /home/inca/local/include DEFINES= NDEBUG MLN_WO_GLOBAL_VARS -- 1.5.6.5