-rw-r--r-- | noncore/games/solitaire/Makefile.in | 36 | ||||
-rwxr-xr-x | noncore/games/solitaire/solitaire.pro | 6 |
2 files changed, 21 insertions, 21 deletions
diff --git a/noncore/games/solitaire/Makefile.in b/noncore/games/solitaire/Makefile.in index 3c50345..a0a64fb 100644 --- a/noncore/games/solitaire/Makefile.in +++ b/noncore/games/solitaire/Makefile.in | |||
@@ -1,41 +1,41 @@ | |||
1 | ############################################################################# | 1 | ############################################################################# |
2 | 2 | ||
3 | ####### Compiler, tools and options | 3 | ####### Compiler, tools and options |
4 | 4 | ||
5 | CXX =$(SYSCONF_CXX) $(QT_CXX_MT) | 5 | CXX =$(SYSCONF_CXX) $(QT_CXX_MT) |
6 | CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) | 6 | CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) |
7 | CC =$(SYSCONF_CC) $(QT_C_MT) | 7 | CC =$(SYSCONF_CC) $(QT_C_MT) |
8 | CFLAGS =$(SYSCONF_CFLAGS) | 8 | CFLAGS =$(SYSCONF_CFLAGS) |
9 | INCPATH =-I$(QPEDIR)/include | 9 | INCPATH =-I$(OPIEDIR)/include |
10 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) | 10 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) |
11 | LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) | 11 | LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) |
12 | MOC =$(SYSCONF_MOC) | 12 | MOC =$(SYSCONF_MOC) |
13 | UIC =$(SYSCONF_UIC) | 13 | UIC =$(SYSCONF_UIC) |
14 | 14 | ||
15 | ####### Target | 15 | ####### Target |
16 | 16 | ||
17 | DESTDIR = $(QPEDIR)/bin/ | 17 | DESTDIR = $(OPIEDIR)/bin/ |
18 | VER_MAJ = 1 | 18 | VER_MAJ = 1 |
19 | VER_MIN = 0 | 19 | VER_MIN = 0 |
20 | VER_PATCH = 0 | 20 | VER_PATCH = 0 |
21 | TARGET= patience | 21 | TARGET= patience |
22 | TARGET1 = lib$(TARGET).so.$(VER_MAJ) | 22 | TARGET1 = lib$(TARGET).so.$(VER_MAJ) |
23 | 23 | ||
24 | ####### Files | 24 | ####### Files |
25 | 25 | ||
26 | HEADERS =canvascard.h \ | 26 | HEADERS =canvascard.h \ |
27 | canvasshapes.h \ | 27 | canvasshapes.h \ |
28 | cardgame.h \ | 28 | cardgame.h \ |
29 | cardgamelayout.h \ | 29 | cardgamelayout.h \ |
30 | cardpile.h \ | 30 | cardpile.h \ |
31 | card.h \ | 31 | card.h \ |
32 | carddeck.h \ | 32 | carddeck.h \ |
33 | canvascardgame.h \ | 33 | canvascardgame.h \ |
34 | freecellcardgame.h \ | 34 | freecellcardgame.h \ |
35 | patiencecardgame.h \ | 35 | patiencecardgame.h \ |
36 | canvascardwindow.h | 36 | canvascardwindow.h |
37 | SOURCES =canvascard.cpp \ | 37 | SOURCES =canvascard.cpp \ |
38 | canvasshapes.cpp \ | 38 | canvasshapes.cpp \ |
39 | cardgame.cpp \ | 39 | cardgame.cpp \ |
40 | cardgamelayout.cpp \ | 40 | cardgamelayout.cpp \ |
41 | cardpile.cpp \ | 41 | cardpile.cpp \ |
@@ -114,122 +114,122 @@ listaddonpromodules: | |||
114 | @echo | 114 | @echo |
115 | 115 | ||
116 | listaddonentmodules: | 116 | listaddonentmodules: |
117 | @echo | 117 | @echo |
118 | 118 | ||
119 | 119 | ||
120 | REQUIRES=patience | 120 | REQUIRES=patience |
121 | 121 | ||
122 | ####### Sub-libraries | 122 | ####### Sub-libraries |
123 | 123 | ||
124 | 124 | ||
125 | ###### Combined headers | 125 | ###### Combined headers |
126 | 126 | ||
127 | 127 | ||
128 | 128 | ||
129 | ####### Compile | 129 | ####### Compile |
130 | 130 | ||
131 | canvascard.o: canvascard.cpp \ | 131 | canvascard.o: canvascard.cpp \ |
132 | cardgame.h \ | 132 | cardgame.h \ |
133 | card.h \ | 133 | card.h \ |
134 | cardpile.h \ | 134 | cardpile.h \ |
135 | carddeck.h \ | 135 | carddeck.h \ |
136 | cardgamelayout.h \ | 136 | cardgamelayout.h \ |
137 | canvascard.h \ | 137 | canvascard.h \ |
138 | $(QPEDIR)/include/qpe/resource.h | 138 | $(OPIEDIR)/include/qpe/resource.h |
139 | 139 | ||
140 | canvasshapes.o: canvasshapes.cpp \ | 140 | canvasshapes.o: canvasshapes.cpp \ |
141 | canvasshapes.h | 141 | canvasshapes.h |
142 | 142 | ||
143 | cardgame.o: cardgame.cpp \ | 143 | cardgame.o: cardgame.cpp \ |
144 | cardgame.h \ | 144 | cardgame.h \ |
145 | card.h \ | 145 | card.h \ |
146 | cardpile.h \ | 146 | cardpile.h \ |
147 | carddeck.h \ | 147 | carddeck.h \ |
148 | cardgamelayout.h | 148 | cardgamelayout.h |
149 | 149 | ||
150 | cardgamelayout.o: cardgamelayout.cpp \ | 150 | cardgamelayout.o: cardgamelayout.cpp \ |
151 | cardgamelayout.h \ | 151 | cardgamelayout.h \ |
152 | cardpile.h | 152 | cardpile.h |
153 | 153 | ||
154 | cardpile.o: cardpile.cpp \ | 154 | cardpile.o: cardpile.cpp \ |
155 | cardpile.h \ | 155 | cardpile.h \ |
156 | card.h \ | 156 | card.h \ |
157 | $(QPEDIR)/include/qpe/config.h | 157 | $(OPIEDIR)/include/qpe/config.h |
158 | 158 | ||
159 | card.o: card.cpp \ | 159 | card.o: card.cpp \ |
160 | card.h \ | 160 | card.h \ |
161 | $(QPEDIR)/include/qpe/config.h | 161 | $(OPIEDIR)/include/qpe/config.h |
162 | 162 | ||
163 | carddeck.o: carddeck.cpp \ | 163 | carddeck.o: carddeck.cpp \ |
164 | card.h \ | 164 | card.h \ |
165 | carddeck.h | 165 | carddeck.h |
166 | 166 | ||
167 | canvascardgame.o: canvascardgame.cpp \ | 167 | canvascardgame.o: canvascardgame.cpp \ |
168 | cardgame.h \ | 168 | cardgame.h \ |
169 | card.h \ | 169 | card.h \ |
170 | cardpile.h \ | 170 | cardpile.h \ |
171 | carddeck.h \ | 171 | carddeck.h \ |
172 | cardgamelayout.h \ | 172 | cardgamelayout.h \ |
173 | canvasshapes.h \ | 173 | canvasshapes.h \ |
174 | canvascard.h \ | 174 | canvascard.h \ |
175 | canvascardgame.h \ | 175 | canvascardgame.h \ |
176 | $(QPEDIR)/include/qpe/resource.h \ | 176 | $(OPIEDIR)/include/qpe/resource.h \ |
177 | $(QPEDIR)/include/qpe/config.h \ | 177 | $(OPIEDIR)/include/qpe/config.h \ |
178 | $(QPEDIR)/include/qpe/qpemenubar.h | 178 | $(OPIEDIR)/include/qpe/qpemenubar.h |
179 | 179 | ||
180 | freecellcardgame.o: freecellcardgame.cpp \ | 180 | freecellcardgame.o: freecellcardgame.cpp \ |
181 | freecellcardgame.h \ | 181 | freecellcardgame.h \ |
182 | patiencecardgame.h \ | 182 | patiencecardgame.h \ |
183 | canvascardgame.h \ | 183 | canvascardgame.h \ |
184 | cardgame.h \ | 184 | cardgame.h \ |
185 | card.h \ | 185 | card.h \ |
186 | cardpile.h \ | 186 | cardpile.h \ |
187 | carddeck.h \ | 187 | carddeck.h \ |
188 | cardgamelayout.h \ | 188 | cardgamelayout.h \ |
189 | canvasshapes.h \ | 189 | canvasshapes.h \ |
190 | canvascard.h \ | 190 | canvascard.h \ |
191 | $(QPEDIR)/include/qpe/resource.h \ | 191 | $(OPIEDIR)/include/qpe/resource.h \ |
192 | $(QPEDIR)/include/qpe/config.h \ | 192 | $(OPIEDIR)/include/qpe/config.h \ |
193 | $(QPEDIR)/include/qpe/qpemenubar.h | 193 | $(OPIEDIR)/include/qpe/qpemenubar.h |
194 | 194 | ||
195 | patiencecardgame.o: patiencecardgame.cpp \ | 195 | patiencecardgame.o: patiencecardgame.cpp \ |
196 | patiencecardgame.h \ | 196 | patiencecardgame.h \ |
197 | canvascardgame.h \ | 197 | canvascardgame.h \ |
198 | cardgame.h \ | 198 | cardgame.h \ |
199 | card.h \ | 199 | card.h \ |
200 | cardpile.h \ | 200 | cardpile.h \ |
201 | carddeck.h \ | 201 | carddeck.h \ |
202 | cardgamelayout.h \ | 202 | cardgamelayout.h \ |
203 | canvasshapes.h \ | 203 | canvasshapes.h \ |
204 | canvascard.h \ | 204 | canvascard.h \ |
205 | $(QPEDIR)/include/qpe/resource.h \ | 205 | $(OPIEDIR)/include/qpe/resource.h \ |
206 | $(QPEDIR)/include/qpe/config.h \ | 206 | $(OPIEDIR)/include/qpe/config.h \ |
207 | $(QPEDIR)/include/qpe/qpemenubar.h | 207 | $(OPIEDIR)/include/qpe/qpemenubar.h |
208 | 208 | ||
209 | canvascardwindow.o: canvascardwindow.cpp \ | 209 | canvascardwindow.o: canvascardwindow.cpp \ |
210 | canvascardwindow.h \ | 210 | canvascardwindow.h \ |
211 | patiencecardgame.h \ | 211 | patiencecardgame.h \ |
212 | canvascardgame.h \ | 212 | canvascardgame.h \ |
213 | cardgame.h \ | 213 | cardgame.h \ |
214 | card.h \ | 214 | card.h \ |
215 | cardpile.h \ | 215 | cardpile.h \ |
216 | carddeck.h \ | 216 | carddeck.h \ |
217 | cardgamelayout.h \ | 217 | cardgamelayout.h \ |
218 | canvasshapes.h \ | 218 | canvasshapes.h \ |
219 | canvascard.h \ | 219 | canvascard.h \ |
220 | $(QPEDIR)/include/qpe/resource.h \ | 220 | $(OPIEDIR)/include/qpe/resource.h \ |
221 | $(QPEDIR)/include/qpe/config.h \ | 221 | $(OPIEDIR)/include/qpe/config.h \ |
222 | $(QPEDIR)/include/qpe/qpemenubar.h \ | 222 | $(OPIEDIR)/include/qpe/qpemenubar.h \ |
223 | freecellcardgame.h | 223 | freecellcardgame.h |
224 | 224 | ||
225 | main.o: main.cpp \ | 225 | main.o: main.cpp \ |
226 | canvascardwindow.h \ | 226 | canvascardwindow.h \ |
227 | $(QPEDIR)/include/qpe/qpeapplication.h | 227 | $(OPIEDIR)/include/qpe/qpeapplication.h |
228 | 228 | ||
229 | moc_canvascardwindow.o: moc_canvascardwindow.cpp \ | 229 | moc_canvascardwindow.o: moc_canvascardwindow.cpp \ |
230 | canvascardwindow.h | 230 | canvascardwindow.h |
231 | 231 | ||
232 | moc_canvascardwindow.cpp: canvascardwindow.h | 232 | moc_canvascardwindow.cpp: canvascardwindow.h |
233 | $(MOC) canvascardwindow.h -o moc_canvascardwindow.cpp | 233 | $(MOC) canvascardwindow.h -o moc_canvascardwindow.cpp |
234 | 234 | ||
235 | 235 | ||
diff --git a/noncore/games/solitaire/solitaire.pro b/noncore/games/solitaire/solitaire.pro index 8617cab..1c90c94 100755 --- a/noncore/games/solitaire/solitaire.pro +++ b/noncore/games/solitaire/solitaire.pro | |||
@@ -1,18 +1,18 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | 2 | ||
3 | CONFIG += qt warn_on release | 3 | CONFIG += qt warn_on release |
4 | DESTDIR = $(QPEDIR)/bin | 4 | DESTDIR = $(OPIEDIR)/bin |
5 | 5 | ||
6 | HEADERS = canvascard.h canvasshapes.h cardgame.h cardgamelayout.h cardpile.h card.h carddeck.h canvascardgame.h freecellcardgame.h patiencecardgame.h canvascardwindow.h | 6 | HEADERS = canvascard.h canvasshapes.h cardgame.h cardgamelayout.h cardpile.h card.h carddeck.h canvascardgame.h freecellcardgame.h patiencecardgame.h canvascardwindow.h |
7 | 7 | ||
8 | SOURCES = canvascard.cpp canvasshapes.cpp cardgame.cpp cardgamelayout.cpp cardpile.cpp card.cpp carddeck.cpp canvascardgame.cpp freecellcardgame.cpp patiencecardgame.cpp canvascardwindow.cpp main.cpp | 8 | SOURCES = canvascard.cpp canvasshapes.cpp cardgame.cpp cardgamelayout.cpp cardpile.cpp card.cpp carddeck.cpp canvascardgame.cpp freecellcardgame.cpp patiencecardgame.cpp canvascardwindow.cpp main.cpp |
9 | 9 | ||
10 | TARGET = patience | 10 | TARGET = patience |
11 | 11 | ||
12 | INCLUDEPATH += $(QPEDIR)/include | 12 | INCLUDEPATH += $(OPIEDIR)/include |
13 | DEPENDPATH+= $(QPEDIR)/include | 13 | DEPENDPATH+= $(OPIEDIR)/include |
14 | LIBS += -lqpe | 14 | LIBS += -lqpe |
15 | 15 | ||
16 | REQUIRES= patience | 16 | REQUIRES= patience |
17 | 17 | ||
18 | TRANSLATIONS = ../i18n/de/patience.ts | 18 | TRANSLATIONS = ../i18n/de/patience.ts |