1 |
jlec 11/08/31 14:28:51 |
2 |
|
3 |
Added: 0.20.1-build.conf.patch |
4 |
Log: |
5 |
Version Bump |
6 |
|
7 |
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 sci-chemistry/gsim/files/0.20.1-build.conf.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gsim/files/0.20.1-build.conf.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gsim/files/0.20.1-build.conf.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: 0.20.1-build.conf.patch |
16 |
=================================================================== |
17 |
gsim.pro | 25 +++++++++++++++---------- |
18 |
1 files changed, 15 insertions(+), 10 deletions(-) |
19 |
|
20 |
diff --git a/gsim.pro b/gsim.pro |
21 |
index 7316aee..9278b6a 100755 |
22 |
--- a/gsim.pro |
23 |
+++ b/gsim.pro |
24 |
@@ -16,21 +16,26 @@ |
25 |
#CONFIG+=use_script |
26 |
|
27 |
# Change directories locations for libcmatrix, MinUIT and muParser libraries |
28 |
-unix:INCLUDEPATH += /home/vjuser/gsim/libcmatrixR3/include \ |
29 |
- /home/vjuser/gsim/Minuit2/include \ |
30 |
- /usr/include/muParser |
31 |
+#unix:INCLUDEPATH += /home/vjuser/gsim/libcmatrixR3/include \ |
32 |
+# /home/vjuser/gsim/Minuit2/include \ |
33 |
+# /usr/include/muParser |
34 |
|
35 |
-win32:INCLUDEPATH += "C:\gsim\libcmatrixR3\include" "C:\gsim\Minuit2\include" "C:\gsim\muparser\include" |
36 |
+#win32:INCLUDEPATH += "C:\gsim\libcmatrixR3\include" "C:\gsim\Minuit2\include" "C:\gsim\muparser\include" |
37 |
|
38 |
-unix:LIBS += -lcmatrix -L/home/vjuser/gsim/libcmatrixR3/lib -lMinuit2 -L/home/vjuser/gsim/Minuit2/lib -L/home/vjuser/gsim/muparser/lib -lmuparser |
39 |
+#unix:LIBS += -lcmatrix -L/home/vjuser/gsim/libcmatrixR3/lib -lMinuit2 -L/home/vjuser/gsim/Minuit2/lib -L/home/vjuser/gsim/muparser/lib -lmuparser |
40 |
|
41 |
-win32:LIBS += -lcmatrix -L"C:\gsim\libcmatrixR3\lib" -lMinuit2 -L"C:\gsim\Minuit2\lib" -L"C:\gsim\muparser\lib" -lmuparser |
42 |
+#win32:LIBS += -lcmatrix -L"C:\gsim\libcmatrixR3\lib" -lMinuit2 -L"C:\gsim\Minuit2\lib" -L"C:\gsim\muparser\lib" -lmuparser |
43 |
|
44 |
#Change directories location for libEMF (if used) |
45 |
-use_emf { |
46 |
- DEFINES+=USE_EMF_OUTPUT |
47 |
- unix:LIBS +=-lEMF -L/usr/include/libEmf |
48 |
- win32:LIBS +=-lgdi32 |
49 |
+#use_emf { |
50 |
+# DEFINES+=USE_EMF_OUTPUT |
51 |
+# unix:LIBS +=-lEMF -L/usr/include/libEmf |
52 |
+# win32:LIBS +=-lgdi32 |
53 |
+#} |
54 |
+ |
55 |
+GSIM_ROOT = . |
56 |
+!include( $$GSIM_ROOT/build.conf ) { |
57 |
+ message( "You need a build.conf file with local settings!" ) |
58 |
} |
59 |
|
60 |
################################################################################################# |