]>
Commit | Line | Data |
---|---|---|
5114a73c | 1 | --- freelords/src/Makefile~ Mon Aug 5 11:55:16 2002 |
2 | +++ freelords/src/Makefile Wed Sep 18 16:49:45 2002 | |
3 | @@ -1,10 +1,12 @@ | |
4 | # Makefile for src | |
7b8197c5 AM |
5 | |
6 | CXX = g++ | |
5114a73c | 7 | +CXXFLAGS = -O2 |
8 | INCLUDES = -Icommon -Igraphic | |
9 | CPPFLAGS = -g -Wall -Werror $(INCLUDES) `paragui-config --cflags` | |
10 | PROFILERFLAGS = -pg -fprofile-arcs | |
11 | -LFLAGS = `paragui-config --libs` -L/usr/lib -lSDL_image -lexpat -L./common -lflcommon -L./graphic -lflgraphic | |
12 | +LDFLAGS = -s | |
13 | +LIBS = `paragui-config --libs` -lSDL_image -lexpat -L./common -lflcommon -L./graphic -lflgraphic | |
14 | TARGET = freelords | |
7b8197c5 | 15 | |
5114a73c | 16 | OBJECTS = main.o |
80354996 | 17 | @@ -15,11 +17,11 @@ |
18 | @echo "FreeLords has successfully built" | |
19 | ||
20 | MYLIBS: | |
21 | - cd common; $(MAKE); | |
22 | - cd graphic; $(MAKE); | |
23 | + cd common; $(MAKE) CXXFLAGS="$(CXXFLAGS)"; | |
24 | + cd graphic; $(MAKE) CXXFLAGS="$(CXXFLAGS)"; | |
25 | ||
26 | $(TARGET): $(OBJECTS) | |
27 | - $(CXX) -Wall $(W_ERROR) -g $(LFLAGS) $(OBJECTS) -o $(TARGET) | |
28 | + $(CXX) -Wall $(W_ERROR) $(LFLAGS) $(LIBS) $(OBJECTS) -o $(TARGET) | |
29 | ||
30 | clean: | |
31 | cd common && $(MAKE) clean | |
5114a73c | 32 | --- freelords/src/common/Makefile~ Wed Sep 18 16:29:08 2002 |
33 | +++ freelords/src/common/Makefile Wed Sep 18 16:29:08 2002 | |
34 | @@ -1,8 +1,9 @@ | |
35 | # Makefile for src/common | |
7b8197c5 | 36 | |
5114a73c | 37 | CXX = g++ |
38 | +CXXFLSGS = -O2 -g | |
39 | INCLUDES = -I. -I../graphic | |
40 | -CPPFLAGS = -g -Wall -Werror -fPIC `paragui-config --cflags` $(INCLUDES) | |
41 | +CPPFLAGS = -Wall -fPIC `paragui-config --cflags` $(INCLUDES) | |
42 | PROFILERFLAGS = -pg -fprofile-arcs | |
43 | LFLAGS = `paragui-config --libs` | |
44 | OBJECTS = \ | |
45 | @@ -16,16 +17,17 @@ | |
46 | # Important pattern rule for making object files :) | |
7b8197c5 | 47 | |
5114a73c | 48 | %.o: %.cpp %.h |
49 | - $(CXX) $(CPPFLAGS) -c $< -o $@ | |
50 | + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@ | |
51 | ||
52 | # Main Target | |
53 | # NOTE: remove the symbolic link so we don't get an errormessage if it already exists | |
54 | # TODO: sym. links can't be created under windows! there has to be a better way ;) | |
55 | ||
56 | $(TARGET): $(OBJECTS) | |
57 | - $(CXX) -g -shared -Wl,-soname,libflcommon.so $(OBJECTS) -o $(TARGET) -lc | |
58 | - -rm -f libflcommon.so | |
59 | - -ln -s libflcommon.so.0.1.0 libflcommon.so | |
60 | + $(CXX) -shared -Wl,-soname,libflcommon.so.0 $(OBJECTS) -o $(TARGET) -lc | |
61 | + -rm -f libflcommon.so.0 libflcommon.so | |
62 | + -ln -s libflcommon.so.0.1.0 libflcommon.so.0 | |
63 | + -ln -s libflcommon.so.0 libflcommon.so | |
64 | ||
65 | clean: | |
66 | -rm -f $(OBJECTS) $(TARGET) *.da *~ libflcommon.so | |
67 | --- freelords/src/graphic/Makefile~ Wed Sep 18 16:31:46 2002 | |
68 | +++ freelords/src/graphic/Makefile Wed Sep 18 16:31:46 2002 | |
69 | @@ -1,8 +1,9 @@ | |
70 | # Makefile for src/graphics | |
71 | ||
72 | CXX = g++ | |
73 | +CXXFLAGS = -O2 -g | |
74 | INCLUDES = -I../common -I. | |
75 | -CPPFLAGS = -g -Wall -Werror -fPIC `paragui-config --cflags` $(INCLUDES) | |
76 | +CPPFLAGS = -Wall -fPIC `paragui-config --cflags` $(INCLUDES) | |
77 | PROFILERFLAGS = -pg -fprofile-arcs | |
78 | LFLAGS = `paragui-config --libs` | |
79 | OBJECTS = \ | |
80 | @@ -17,16 +18,17 @@ | |
81 | # Important pattern rule for making object files :) | |
82 | ||
83 | %.o: %.cpp %.h | |
84 | - $(CXX) $(CPPFLAGS) -c $< -o $@ | |
85 | + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@ | |
86 | ||
87 | # Main Target | |
88 | # NOTE: remove the symbolic link so that we don't get an errormessage if it already exists | |
89 | # TODO: this can't be done on MS Windows, there has to be another way ;) | |
90 | ||
91 | $(TARGET): $(OBJECTS) | |
92 | - $(CXX) -g -shared -Wl,-soname,libflgraphic.so $(OBJECTS) -o $(TARGET) -lc | |
93 | - -rm -f libflgraphic.so | |
94 | - -ln -s libflgraphic.so.0.1.0 libflgraphic.so | |
95 | + $(CXX) -shared -Wl,-soname,libflgraphic.so.0.1.0 $(OBJECTS) -o $(TARGET) -lc | |
96 | + -rm -f libflgraphic.so libflgraphic.so.0 | |
97 | + -ln -s libflgraphic.so.0.1.0 libflgraphic.so.0 | |
98 | + -ln -s libflgraphic.so.0 libflgraphic.so | |
7b8197c5 | 99 | |
5114a73c | 100 | clean: |
101 | -rm -f $(OBJECTS) $(TARGET) *.da *~ libflgraphic.so |