Lines 1-6
Link Here
|
1 |
--- Makefile.orig Wed Apr 5 14:41:05 2006 |
1 |
--- Makefile Sun Jul 9 12:51:41 2006 |
2 |
+++ Makefile Thu May 4 16:50:55 2006 |
2 |
+++ Makefile.port Mon Jul 10 14:07:04 2006 |
3 |
@@ -2,25 +2,24 @@ |
3 |
@@ -2,19 +2,19 @@ |
4 |
APP_NAME = ump |
4 |
APP_NAME = ump |
5 |
|
5 |
|
6 |
## Change this directory name as you like, it's the installation directory |
6 |
## Change this directory name as you like, it's the installation directory |
Lines 23-48
Link Here
|
23 |
+GL_LIB = -lGL -lGLU -L$(X11BASE)/lib |
23 |
+GL_LIB = -lGL -lGLU -L$(X11BASE)/lib |
24 |
|
24 |
|
25 |
|
25 |
|
|
|
26 |
## This will give auto completion in the main window, but it requires GTK+2.6 |
27 |
@@ -25,7 +25,7 @@ |
26 |
|
28 |
|
27 |
## Choose your optimization level |
29 |
## Choose your optimization level |
28 |
##FLAGS += -O0 |
30 |
##FLAGS += -O0 |
29 |
-FLAGS += -O2 |
31 |
-FLAGS += -O2 |
|
|
32 |
+##FLAGS += -O2 |
30 |
##FLAGS += -O3 |
33 |
##FLAGS += -O3 |
31 |
##FLAGS += -Os |
34 |
##FLAGS += -Os |
32 |
|
35 |
|
33 |
@@ -35,7 +34,10 @@ |
36 |
@@ -40,8 +40,10 @@ |
34 |
## Uncomment one or both of these if the compilation failes |
37 |
## Uncomment one or both of these if the compilation failes |
35 |
## due to trunc undefined or log2 undefined |
38 |
## due to trunc undefined or log2 undefined |
36 |
##FLAGS += -DDONT_HAVE_TRUNC |
39 |
##FLAGS += -DDONT_HAVE_TRUNC |
37 |
-##FLAGS += -DDONT_HAVE_LOG2 |
40 |
-##FLAGS += -DDONT_HAVE_LOG2 |
38 |
+FLAGS += -DDONT_HAVE_LOG2 |
41 |
+FLAGS += -DDONT_HAVE_LOG2 |
39 |
+ |
|
|
40 |
+# include X11 libs |
41 |
+FLAGS += -I$(X11BASE)/include |
42 |
|
42 |
|
|
|
43 |
+# X11 includes |
44 |
+FLAGS += -I$(X11BASE)/include |
43 |
|
45 |
|
44 |
|
46 |
|
45 |
@@ -82,7 +84,7 @@ |
47 |
## If you'd like to compile with debuging info avaliable |
|
|
48 |
@@ -87,7 +89,7 @@ |
46 |
# $< means the name of the first prerequisite |
49 |
# $< means the name of the first prerequisite |
47 |
|
50 |
|
48 |
$(APP_NAME): Makefile $(OBJ_FILES) main.o $(GUI_OBJ) addon_functions.o $(ASM_FILES) |
51 |
$(APP_NAME): Makefile $(OBJ_FILES) main.o $(GUI_OBJ) addon_functions.o $(ASM_FILES) |
Lines 51-58
Link Here
|
51 |
|
54 |
|
52 |
clean: |
55 |
clean: |
53 |
-rm -f $(OBJ_FILES) |
56 |
-rm -f $(OBJ_FILES) |
54 |
@@ -93,18 +95,16 @@ |
57 |
@@ -99,18 +101,16 @@ |
55 |
-rm -f translation_svenska.c |
58 |
-rm -f inliner |
56 |
|
59 |
|
57 |
text: Makefile $(OBJ_FILES) addon_functions.text.o $(ASM_FILES) |
60 |
text: Makefile $(OBJ_FILES) addon_functions.text.o $(ASM_FILES) |
58 |
- g++ $(FLAGS) $(FILES) $(OBJ_FILES) addon_functions.text.o $(ASM_FILES) -DNO_GTK -o $(APP_NAME) -DDATA_DIR=\"$(DATA_DIR)\" -DFLAGS="\"$(FLAGS)\"" $(GL_LIB) |
61 |
- g++ $(FLAGS) $(FILES) $(OBJ_FILES) addon_functions.text.o $(ASM_FILES) -DNO_GTK -o $(APP_NAME) -DDATA_DIR=\"$(DATA_DIR)\" -DFLAGS="\"$(FLAGS)\"" $(GL_LIB) |
Lines 73-92
Link Here
|
73 |
|
76 |
|
74 |
uninstall: |
77 |
uninstall: |
75 |
rm -f $(BIN_DIR)/$(APP_NAME) |
78 |
rm -f $(BIN_DIR)/$(APP_NAME) |
76 |
@@ -114,106 +114,106 @@ |
79 |
@@ -120,107 +120,107 @@ |
77 |
|
80 |
|
78 |
|
81 |
|
79 |
main.o: $(FILES) Makefile $(GUI_HEADER) $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vartypes.h $(SRC)/picture.h $(SRC)/addon_functions.h $(SRC)/ump_3d_viewer.h |
82 |
main.o: $(FILES) Makefile $(GUI_HEADER) $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vartypes.h $(SRC)/picture.h $(SRC)/addon_functions.h $(SRC)/ump_3d_viewer.h |
80 |
- g++ $(FLAGS) $(ASM_FLAG) -c $(GTK_CFLAGS) $(FILES) -o $@ -DDATA_DIR=\"$(DATA_DIR)\" -DFLAGS="\"$(FLAGS)\"" |
83 |
- g++ $(FLAGS) -c $(GTK_CFLAGS) $(FILES) -o $@ -DDATA_DIR=\"$(DATA_DIR)\" -DFLAGS="\"$(FLAGS)\"" |
81 |
+ $(CXX) $(FLAGS) $(ASM_FLAG) -c $(GTK_CFLAGS) $(FILES) -o $@ -DDATA_DIR=\"$(DATA_DIR)\" -DFLAGS="\"$(FLAGS)\"" |
84 |
+ $(CXX) $(FLAGS) -c $(GTK_CFLAGS) $(FILES) -o $@ -DDATA_DIR=\"$(DATA_DIR)\" -DFLAGS="\"$(FLAGS)\"" |
82 |
|
85 |
|
83 |
picture2gtk.o: $(SRC)/picture2gtk.cpp Makefile $(SRC)/picture2gtk.h $(SRC)/vartypes.h $(SRC)/picture.h |
86 |
picture2gtk.o: $(SRC)/picture2gtk.cpp Makefile $(SRC)/picture2gtk.h $(SRC)/vartypes.h $(SRC)/picture.h |
84 |
- g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@ |
87 |
- g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@ |
85 |
+ $(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@ |
88 |
+ $(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@ |
86 |
|
89 |
|
87 |
ump_advancedwin.o: $(SRC)/ump_advancedwin.cpp Makefile $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/picture.h $(GUI_HEADER) $(SRC)/vartypes.h |
90 |
ump_advancedwin.o: $(SRC)/ump_advancedwin.cpp Makefile $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/picture.h $(GUI_HEADER) $(SRC)/vartypes.h |
88 |
- g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@ |
91 |
- g++ $(FLAGS) $(AUTO_COMPLETION) -c $(GTK_CFLAGS) $< -o $@ |
89 |
+ $(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@ |
92 |
+ $(CXX) $(FLAGS) $(AUTO_COMPLETION) -c $(GTK_CFLAGS) $< -o $@ |
90 |
|
93 |
|
91 |
ump_3d_viewer.o: $(SRC)/ump_3d_viewer.cpp Makefile $(SRC)/ump_3d_viewer.h $(SRC)/main.h $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/picture.h $(SRC)/vartypes.h |
94 |
ump_3d_viewer.o: $(SRC)/ump_3d_viewer.cpp Makefile $(SRC)/ump_3d_viewer.h $(SRC)/main.h $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/picture.h $(SRC)/vartypes.h |
92 |
- g++ $(FLAGS) -c $< -o $@ |
95 |
- g++ $(FLAGS) -c $< -o $@ |
Lines 96-106
Link Here
|
96 |
- g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@ |
99 |
- g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@ |
97 |
+ $(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@ |
100 |
+ $(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@ |
98 |
|
101 |
|
99 |
ump_graphwin.o: $(SRC)/ump_graphwin.cpp Makefile $(GUI_HEADER) $(SRC)/vartypes.h $(SRC)/picture.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vector.h |
102 |
ump_graphwin.o: $(SRC)/ump_graphwin.cpp Makefile $(GUI_HEADER) $(SRC)/vartypes.h $(SRC)/picture.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vector.h $(SRC)/gradient_editor.h |
100 |
- g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@ |
103 |
- g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@ |
101 |
+ $(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@ |
104 |
+ $(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@ |
102 |
|
105 |
|
103 |
ump_prefwin.o: $(SRC)/ump_prefwin.cpp Makefile $(SRC)/vector.h $(SRC)/integer.h $(SRC)/picture.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(GUI_HEADER) $(SRC)/vartypes.h |
106 |
ump_prefwin.o: $(SRC)/ump_prefwin.cpp Makefile $(SRC)/vector.h $(SRC)/integer.h $(SRC)/picture.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(GUI_HEADER) $(SRC)/vartypes.h $(SRC)/ump_picturewin.h |
104 |
- g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@ |
107 |
- g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@ |
105 |
+ $(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@ |
108 |
+ $(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@ |
106 |
|
109 |
|
Lines 128-134
Link Here
|
128 |
- g++ $(FLAGS) -c -DNO_GTK $(SRC)/addon_functions.cpp -o $@ |
131 |
- g++ $(FLAGS) -c -DNO_GTK $(SRC)/addon_functions.cpp -o $@ |
129 |
+ $(CXX) $(FLAGS) -c -DNO_GTK $(SRC)/addon_functions.cpp -o $@ |
132 |
+ $(CXX) $(FLAGS) -c -DNO_GTK $(SRC)/addon_functions.cpp -o $@ |
130 |
|
133 |
|
131 |
|
134 |
gradient_editor.o: $(SRC)/gradient_editor.cpp $(SRC)/gradient_editor.h $(SRC)/vector.h $(SRC)/vartypes.h $(SRC)/picture.h |
|
|
135 |
- g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@ |
136 |
+ $(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@ |
132 |
|
137 |
|
133 |
vartypes.o: $(SRC)/vartypes.cpp Makefile $(SRC)/vartypes.h |
138 |
vartypes.o: $(SRC)/vartypes.cpp Makefile $(SRC)/vartypes.h |
134 |
- g++ $(FLAGS) -c $< -o $@ |
139 |
- g++ $(FLAGS) -c $< -o $@ |
Lines 143-150
Link Here
|
143 |
+ $(CXX) $(FLAGS) -c $< -o $@ |
148 |
+ $(CXX) $(FLAGS) -c $< -o $@ |
144 |
|
149 |
|
145 |
integer.o: $(SRC)/integer.cpp Makefile $(SRC)/integer.h $(SRC)/vartypes.h |
150 |
integer.o: $(SRC)/integer.cpp Makefile $(SRC)/integer.h $(SRC)/vartypes.h |
146 |
- g++ $(FLAGS) $(ASM_FLAG) -c $< -o $@ |
151 |
- g++ $(FLAGS) -c $< -o $@ |
147 |
+ $(CXX) $(FLAGS) $(ASM_FLAG) -c $< -o $@ |
152 |
+ $(CXX) $(FLAGS) -c $< -o $@ |
148 |
|
153 |
|
149 |
real.o: $(SRC)/real.cpp Makefile $(SRC)/integer.h $(SRC)/real.h $(SRC)/vartypes.h |
154 |
real.o: $(SRC)/real.cpp Makefile $(SRC)/integer.h $(SRC)/real.h $(SRC)/vartypes.h |
150 |
- g++ $(FLAGS) -c $< -o $@ |
155 |
- g++ $(FLAGS) -c $< -o $@ |
Lines 201-213
Link Here
|
201 |
## Here we create the converter and convert the Swedish translation file into an inline-file |
206 |
## Here we create the converter and convert the Swedish translation file into an inline-file |
202 |
inliner: $(SRC)/inliner.c Makefile |
207 |
inliner: $(SRC)/inliner.c Makefile |
203 |
- gcc $< -o $@ |
208 |
- gcc $< -o $@ |
204 |
+ $(CC) $(CFLAGS) $< -o $@ |
209 |
+ $(CC) $< -o $@ |
205 |
|
210 |
|
206 |
translation_svenska.c: translations/Svenska inliner |
211 |
translation_svenska.c: translations/Svenska inliner |
207 |
./inliner $< translation_svenska $@ |
212 |
./inliner $< translation_svenska $@ |
208 |
|
213 |
|
209 |
translation_svenska.o: translation_svenska.c |
214 |
translation_svenska.o: translation_svenska.c |
210 |
- gcc $< -c -o $@ |
215 |
- gcc $< -c -o $@ |
211 |
+ $(CC) $(CFLAGS) $< -c -o $@ |
216 |
+ $(CC) $< -c -o $@ |
212 |
|
217 |
|
213 |
|
218 |
|