EI/VirtualLeaf Changeset - 67230a3743ca · Centrum Wiskunde & Informatica (CWI)

Changeset - 67230a3743ca

Parent rev.

Child rev.

[Not reviewed]

default

0 23 0

Michael Guravage - 15 years ago 2010-10-18 12:52:20
michael.guravage@cwi.nl

Removed erroneous qmake -makefile option. MACOSX, look for gpl3.txt in ../doc directory.

--
user: Michael Guravage <michael.guravage@cwi.nl>
branch 'default'
changed src/ChangeLog
changed src/Makefile
changed src/TutorialCode/Tutorial0/ChangeLog
changed src/TutorialCode/Tutorial0/Makefile
changed src/TutorialCode/Tutorial1A/ChangeLog
changed src/TutorialCode/Tutorial1A/Makefile
changed src/TutorialCode/Tutorial1B/ChangeLog
changed src/TutorialCode/Tutorial1B/Makefile
changed src/TutorialCode/Tutorial1C/ChangeLog
changed src/TutorialCode/Tutorial1C/Makefile
changed src/TutorialCode/Tutorial1D/ChangeLog
changed src/TutorialCode/Tutorial1D/Makefile
changed src/TutorialCode/Tutorial2/ChangeLog
changed src/TutorialCode/Tutorial2/Makefile
changed src/TutorialCode/Tutorial3/ChangeLog
changed src/TutorialCode/Tutorial3/Makefile
changed src/TutorialCode/Tutorial4/ChangeLog
changed src/TutorialCode/Tutorial4/Makefile
changed src/TutorialCode/Tutorial5/ChangeLog
changed src/TutorialCode/Tutorial5/Makefile
changed src/VirtualLeaf.pro
changed src/build_models/ChangeLog
changed src/build_models/Makefile

23 files changed with 59 insertions and 15 deletions:

src/ChangeLog

src/Makefile

src/TutorialCode/Tutorial0/ChangeLog

src/TutorialCode/Tutorial0/Makefile

src/TutorialCode/Tutorial1A/ChangeLog

src/TutorialCode/Tutorial1A/Makefile

src/TutorialCode/Tutorial1B/ChangeLog

src/TutorialCode/Tutorial1B/Makefile

src/TutorialCode/Tutorial1C/ChangeLog

src/TutorialCode/Tutorial1C/Makefile

src/TutorialCode/Tutorial1D/ChangeLog

src/TutorialCode/Tutorial1D/Makefile

src/TutorialCode/Tutorial2/ChangeLog

src/TutorialCode/Tutorial2/Makefile

src/TutorialCode/Tutorial3/ChangeLog

src/TutorialCode/Tutorial3/Makefile

src/TutorialCode/Tutorial4/ChangeLog

src/TutorialCode/Tutorial4/Makefile

src/TutorialCode/Tutorial5/ChangeLog

src/TutorialCode/Tutorial5/Makefile

src/VirtualLeaf.pro

src/build_models/ChangeLog

src/build_models/Makefile

0 comments (0 inline, 0 general)

src/ChangeLog

➞

Show inline comments

 -10-18    <guravage@caterpie.sen.cwi.nl>
 	* VirtualLeaf.pro: MAXOSX, look for gpl3.txt in the ../doc directory.
 	* Makefile (Makefile.libplugin): Removed -makefile qmake option.
 	* VirtualLeaf.cpp (TIMESTEP): Removed getIterations().
 	* mesh.h (Mesh): Removed {increment,get}Iterations().

src/Makefile

➞

Show inline comments

@@ @@ -19,13 +19,13 @@ VirtualLeaf: Makefile.VirtualLeaf @@
 	$(MAKE) -f Makefile.VirtualLeaf
 Makefile.VirtualLeaf: VirtualLeaf.pro
-	$(QMAKE) -makefile -o $@ $<
 	$(QMAKE) -o $@ $<
 libplugin: Makefile.libplugin
 	$(MAKE) -f Makefile.libplugin
 Makefile.libplugin: libplugin.pro
-	$(QMAKE) -makefile -o $@ $<
 	$(QMAKE) -o $@ $<
 plugins:
 	$(MAKE) -C build_models -f Makefile

src/TutorialCode/Tutorial0/ChangeLog

➞

Show inline comments

 -10-18    <guravage@caterpie.sen.cwi.nl>
 	* Makefile (Makefile.tutorial0): Removed -makefile qmake option.
 -06-25    <guravage@caterpie.sen.cwi.nl>
 	* tutorial0.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS.

src/TutorialCode/Tutorial0/Makefile

➞

Show inline comments

@@ @@ -19,7 +19,7 @@ tutorial0: Makefile.tutorial0 @@
 	$(MAKE) -f Makefile.tutorial0
 Makefile.tutorial0: tutorial0.pro
-	$(QMAKE) -makefile -o $@ $<
 	$(QMAKE) -o $@ $<
 clean:
 	$(MAKE) -f Makefile.tutorial0 clean

src/TutorialCode/Tutorial1A/ChangeLog

➞

Show inline comments

 -10-18    <guravage@caterpie.sen.cwi.nl>
 	* Makefile (Makefile.tutorial1A): Removed -makefile qmake option.
 -06-25    <guravage@caterpie.sen.cwi.nl>
 	* tutorial1A.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS.

src/TutorialCode/Tutorial1A/Makefile

➞

Show inline comments

@@ @@ -19,7 +19,7 @@ tutorial1A: Makefile.tutorial1A @@
 	$(MAKE) -f Makefile.tutorial1A
 Makefile.tutorial1A: tutorial1A.pro
-	$(QMAKE) -makefile -o $@ $<
 	$(QMAKE) -o $@ $<
 clean:
 	$(MAKE) -f Makefile.tutorial1A clean

src/TutorialCode/Tutorial1B/ChangeLog

➞

Show inline comments

 -10-18    <guravage@caterpie.sen.cwi.nl>
 	* Makefile (Makefile.tutorial1B): Removed -makefile qmake option.
 -06-25    <guravage@caterpie.sen.cwi.nl>
 	* tutorial1B.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS.

src/TutorialCode/Tutorial1B/Makefile

➞

Show inline comments

@@ @@ -19,7 +19,7 @@ tutorial1B: Makefile.tutorial1B @@
 	$(MAKE) -f Makefile.tutorial1B
 Makefile.tutorial1B: tutorial1B.pro
-	$(QMAKE) -makefile -o $@ $<
 	$(QMAKE) -o $@ $<
 clean:
 	$(MAKE) -f Makefile.tutorial1B clean

src/TutorialCode/Tutorial1C/ChangeLog

➞

Show inline comments

 -10-18    <guravage@caterpie.sen.cwi.nl>
 	* Makefile (Makefile.tutorial1C): Removed -makefile qmake option.
 -06-25    <guravage@caterpie.sen.cwi.nl>
 	* tutorial1C.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS.

src/TutorialCode/Tutorial1C/Makefile

➞

Show inline comments

@@ @@ -19,7 +19,7 @@ tutorial1C: Makefile.tutorial1C @@
 	$(MAKE) -f Makefile.tutorial1C
 Makefile.tutorial1C: tutorial1C.pro
-	$(QMAKE) -makefile -o $@ $<
 	$(QMAKE) -o $@ $<
 clean:
 	$(MAKE) -f Makefile.tutorial1C clean

src/TutorialCode/Tutorial1D/ChangeLog

➞

Show inline comments

 -10-18    <guravage@caterpie.sen.cwi.nl>
 	* Makefile (Makefile.tutorial1D): Removed -makefile qmake option.
 -06-25    <guravage@caterpie.sen.cwi.nl>
 	* tutorial1D.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS.

src/TutorialCode/Tutorial1D/Makefile

➞

Show inline comments

@@ @@ -19,7 +19,7 @@ tutorial1D: Makefile.tutorial1D @@
 	$(MAKE) -f Makefile.tutorial1D
 Makefile.tutorial1D: tutorial1D.pro
-	$(QMAKE) -makefile -o $@ $<
 	$(QMAKE) -o $@ $<
 clean:
 	$(MAKE) -f Makefile.tutorial1D clean

src/TutorialCode/Tutorial2/ChangeLog

➞

Show inline comments

 -10-18    <guravage@caterpie.sen.cwi.nl>
 	* Makefile (Makefile.tutorial2): Removed -makefile qmake option.
 -06-25    <guravage@caterpie.sen.cwi.nl>
 	* tutorial2.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS.

src/TutorialCode/Tutorial2/Makefile

➞

Show inline comments

@@ @@ -19,7 +19,7 @@ tutorial2: Makefile.tutorial2 @@
 	$(MAKE) -f Makefile.tutorial2
 Makefile.tutorial2: tutorial2.pro
-	$(QMAKE) -makefile -o $@ $<
 	$(QMAKE) -o $@ $<
 clean:
 	$(MAKE) -f Makefile.tutorial2 clean

src/TutorialCode/Tutorial3/ChangeLog

➞

Show inline comments

 -10-18    <guravage@caterpie.sen.cwi.nl>
 	* Makefile (Makefile.tutorial3): Removed -makefile qmake option.
 -10-14    <guravage@caterpie.sen.cwi.nl>
 	* tutorial3.h (SimPluginInterface): Added default LeafML file.

src/TutorialCode/Tutorial3/Makefile

➞

Show inline comments

@@ @@ -19,7 +19,7 @@ tutorial3: Makefile.tutorial3 @@
 	$(MAKE) -f Makefile.tutorial3
 Makefile.tutorial3: tutorial3.pro
-	$(QMAKE) -makefile -o $@ $<
 	$(QMAKE) -o $@ $<
 clean:
 	$(MAKE) -f Makefile.tutorial3 clean

src/TutorialCode/Tutorial4/ChangeLog

➞

Show inline comments

 -10-18    <guravage@caterpie.sen.cwi.nl>
 	* Makefile (Makefile.tutorial4): Removed -makefile qmake option.
 -10-14    <guravage@caterpie.sen.cwi.nl>
 	* tutorial4.h (SimPluginInterface): Added default LeafML file.

src/TutorialCode/Tutorial4/Makefile

➞

Show inline comments

@@ @@ -19,7 +19,7 @@ tutorial4: Makefile.tutorial4 @@
 	$(MAKE) -f Makefile.tutorial4
 Makefile.tutorial4: tutorial4.pro
-	$(QMAKE) -makefile -o $@ $<
 	$(QMAKE) -o $@ $<
 clean:
 	$(MAKE) -f Makefile.tutorial4 clean

src/TutorialCode/Tutorial5/ChangeLog

➞

Show inline comments

 -10-18    <guravage@caterpie.sen.cwi.nl>
 	* Makefile (Makefile.tutorial5): Removed -makefile qmake option.
 -10-14    <guravage@caterpie.sen.cwi.nl>
 	* tutorial5.h (SimPluginInterface): Added default LeafML file.

src/TutorialCode/Tutorial5/Makefile

➞

Show inline comments

@@ @@ -19,7 +19,7 @@ tutorial5: Makefile.tutorial5 @@
 	$(MAKE) -f Makefile.tutorial5
 Makefile.tutorial5: tutorial5.pro
-	$(QMAKE) -makefile -o $@ $<
 	$(QMAKE) -o $@ $<
 clean:
 	$(MAKE) -f Makefile.tutorial5 clean

src/VirtualLeaf.pro

➞

Show inline comments

@@ @@ -203,7 +203,7 @@ ICON = leaficon.icns @@
 QMAKE_POST_LINK = "\
 	#install_name_tool -change libqwt.5.dylib $$QWTDIR/lib/libqwt.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}; \
 	cp leaficon.icns $${DESTDIR}/$${TARGET}.app; \
 	cp gpl3.txt $${DESTDIR}/$${TARGET}.app/Contents/MacOS/.                                    ; \
+	cp ../doc/gpl3.txt $${DESTDIR}/$${TARGET}.app/Contents/MacOS/.                                    ; \
 	mkdir $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \
 	cp -R /Library/Frameworks/QtCore.framework $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \
 	cp -R /Library/Frameworks/QtGui.framework $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \

src/build_models/ChangeLog

➞

Show inline comments

 -10-18    <guravage@caterpie.sen.cwi.nl>
 	* Makefile (Makefile.plugin_test): Removed -makefile qmake option.
 -06-25    <guravage@caterpie.sen.cwi.nl>
 	* plugin_auxingrowth.pro: Added -Wno-write-strings and -Wno-unused-parameter to QMAKE_CXXFLAGS.

src/build_models/Makefile

➞

Show inline comments

@@ @@ -19,19 +19,19 @@ plugin_auxingrowth: Makefile.plugin_auxi @@
 	$(MAKE) -f Makefile.plugin_auxingrowth
 Makefile.plugin_auxingrowth: plugin_auxingrowth.pro
-	$(QMAKE) -makefile -o $@ $<
 	$(QMAKE) -o $@ $<
 plugin_meinhardt: Makefile.plugin_meinhardt
 	$(MAKE) -f Makefile.plugin_meinhardt
 Makefile.plugin_meinhardt: plugin_meinhardt.pro
-	$(QMAKE) -makefile -o $@ $<
 	$(QMAKE) -o $@ $<
 plugin_test: Makefile.plugin_test
 	$(MAKE) -f Makefile.plugin_test
 Makefile.plugin_test: plugin_test.pro
-	$(QMAKE) -makefile -o $@ $<
 	$(QMAKE) -o $@ $<
 clean:
 	$(MAKE) -f Makefile.plugin_auxingrowth clean

0 comments (0 inline, 0 general)