]>
Commit | Line | Data |
---|---|---|
cb22b872 | 1 | --- ./src/Makefile.gege Tue May 22 07:25:50 2001 |
2 | +++ ./src/Makefile Fri May 25 16:36:51 2001 | |
3 | @@ -10,8 +10,8 @@ | |
4 | ||
5 | CC = gcc | |
6 | CXX = g++ | |
7 | -CFLAGS = -pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT | |
8 | -CXXFLAGS= -pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT | |
9 | +#CFLAGS = -pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT | |
10 | +#CXXFLAGS= -pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT | |
11 | INCPATH = -I../support/include -I../support/glpng/include -I/usr/X11R6/include | |
12 | LINK = g++ | |
13 | LFLAGS = | |
14 | @@ -162,19 +162,19 @@ | |
15 | .SUFFIXES: .cpp .cxx .cc .C .c | |
16 | ||
17 | .cpp.o: | |
18 | - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | |
19 | + $(CXX) -c $(CXXFLAGS) $(INCPATH) $(DEFS) -o $@ $< | |
20 | ||
21 | .cxx.o: | |
22 | - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | |
23 | + $(CXX) -c $(CXXFLAGS) $(INCPATH) $(DEFS) -o $@ $< | |
24 | ||
25 | .cc.o: | |
26 | - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | |
27 | + $(CXX) -c $(CXXFLAGS) $(INCPATH) $(DEFS) -o $@ $< | |
28 | ||
29 | .C.o: | |
30 | - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | |
31 | + $(CXX) -c $(CXXFLAGS) $(INCPATH) $(DEFS) -o $@ $< | |
32 | ||
33 | .c.o: | |
34 | - $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< | |
35 | + $(CC) -c $(CFLAGS) $(INCPATH) $(DEFS) -o $@ $< | |
36 | ||
37 | ####### Build rules | |
38 | ||
39 | --- ./src-setup/Makefile.gege Mon May 21 09:47:11 2001 | |
40 | +++ ./src-setup/Makefile Fri May 25 16:41:21 2001 | |
41 | @@ -10,8 +10,8 @@ | |
42 | ||
43 | CC = gcc | |
44 | CXX = g++ | |
45 | -CFLAGS = -pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -Wall -W -g -D_REENTRANT | |
46 | -CXXFLAGS= -pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -Wall -W -g -D_REENTRANT | |
47 | +#CFLAGS = -pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -Wall -W -g -D_REENTRANT | |
48 | +#CXXFLAGS= -pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -Wall -W -g -D_REENTRANT | |
49 | INCPATH = -I$(QTDIR)/include | |
50 | LINK = g++ | |
51 | LFLAGS = | |
52 | @@ -74,19 +74,19 @@ | |
53 | .SUFFIXES: .cpp .cxx .cc .C .c | |
54 | ||
55 | .cpp.o: | |
56 | - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | |
57 | + $(CXX) -c $(CXXFLAGS) $(INCPATH) $(DEFS) -o $@ $< | |
58 | ||
59 | .cxx.o: | |
60 | - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | |
61 | + $(CXX) -c $(CXXFLAGS) $(INCPATH) $(DEFS) -o $@ $< | |
62 | ||
63 | .cc.o: | |
64 | - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | |
65 | + $(CXX) -c $(CXXFLAGS) $(INCPATH) $(DEFS) -o $@ $< | |
66 | ||
67 | .C.o: | |
68 | - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< | |
69 | + $(CXX) -c $(CXXFLAGS) $(INCPATH) $(DEFS) -o $@ $< | |
70 | ||
71 | .c.o: | |
72 | - $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< | |
73 | + $(CC) -c $(CFLAGS) $(INCPATH) $(DEFS) -o $@ $< | |
74 | ||
75 | ####### Build rules | |
76 | ||
77 | --- ./src-setup/MainWidget.cpp.gege Mon May 21 09:46:39 2001 | |
78 | +++ ./src-setup/MainWidget.cpp Fri May 25 16:41:58 2001 | |
79 | @@ -153,7 +153,7 @@ | |
80 | { | |
81 | char buffer[256]; | |
82 | FILE *inpipe; | |
83 | - QFileInfo fileInfo(CHROMIUM_EXEC); | |
84 | + QFileInfo fileInfo(GAMESBINDIR "/chromium"); | |
85 | ||
86 | if(!fileInfo.isExecutable()) // if file isn't there, let's look in the same directory as this one... | |
87 | { | |
88 | --- ./support/glpng/src/Makefile.gege Thu Feb 8 06:03:24 2001 | |
89 | +++ ./support/glpng/src/Makefile Fri May 25 16:37:37 2001 | |
90 | @@ -9,8 +9,8 @@ | |
91 | ||
92 | CC = gcc | |
93 | CXX = g++ | |
94 | -CFLAGS = -pipe -O2 | |
95 | -CXXFLAGS= -pipe -O2 | |
96 | +#CFLAGS = -pipe -O2 | |
97 | +#CXXFLAGS= -pipe -O2 | |
98 | INCPATH = -I../include -I/usr/include -I/usr/X11R6/include | |
99 | AR = ar cqs | |
100 | RANLIB = | |
101 | --- ./src-setup/Makefile.gege Fri May 25 16:53:43 2001 | |
102 | +++ ./src-setup/Makefile Fri May 25 16:58:05 2001 | |
103 | @@ -200,15 +200,15 @@ | |
104 | ||
105 | moc/moc_ConfigFile.o: moc/moc_ConfigFile.cpp \ | |
106 | ConfigFile.h | |
107 | - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc/moc_ConfigFile.o moc/moc_ConfigFile.cpp | |
108 | + $(CXX) -c $(CXXFLAGS) $(INCPATH) $(DEFS) -o moc/moc_ConfigFile.o moc/moc_ConfigFile.cpp | |
109 | ||
110 | moc/moc_HelpPage.o: moc/moc_HelpPage.cpp \ | |
111 | HelpPage.h | |
112 | - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc/moc_HelpPage.o moc/moc_HelpPage.cpp | |
113 | + $(CXX) -c $(CXXFLAGS) $(INCPATH) $(DEFS) -o moc/moc_HelpPage.o moc/moc_HelpPage.cpp | |
114 | ||
115 | moc/moc_HiScoreWidget.o: moc/moc_HiScoreWidget.cpp \ | |
116 | HiScoreWidget.h | |
117 | - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc/moc_HiScoreWidget.o moc/moc_HiScoreWidget.cpp | |
118 | + $(CXX) -c $(CXXFLAGS) $(INCPATH) $(DEFS) -o moc/moc_HiScoreWidget.o moc/moc_HiScoreWidget.cpp | |
119 | ||
120 | moc/moc_MainWidget.o: moc/moc_MainWidget.cpp \ | |
121 | MainWidget.h \ | |
122 | @@ -217,12 +217,12 @@ | |
123 | Audio.h \ | |
124 | ConfigFile.h \ | |
125 | HiScoreWidget.h | |
126 | - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc/moc_MainWidget.o moc/moc_MainWidget.cpp | |
127 | + $(CXX) -c $(CXXFLAGS) $(INCPATH) $(DEFS) -o moc/moc_MainWidget.o moc/moc_MainWidget.cpp | |
128 | ||
129 | moc/moc_PlayList.o: moc/moc_PlayList.cpp \ | |
130 | PlayList.h \ | |
131 | Audio.h | |
132 | - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc/moc_PlayList.o moc/moc_PlayList.cpp | |
133 | + $(CXX) -c $(CXXFLAGS) $(INCPATH) $(DEFS) -o moc/moc_PlayList.o moc/moc_PlayList.cpp | |
134 | ||
135 | moc/moc_ConfigFile.cpp: ConfigFile.h | |
136 | $(MOC) ConfigFile.h -o moc/moc_ConfigFile.cpp |