-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 | |||
@@ -6,7 +6,7 @@ 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) |
@@ -14,7 +14,7 @@ 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 |
@@ -135,7 +135,7 @@ canvascard.o: canvascard.cpp \ | |||
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 |
@@ -154,11 +154,11 @@ cardgamelayout.o: cardgamelayout.cpp \ | |||
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 \ |
@@ -173,9 +173,9 @@ canvascardgame.o: canvascardgame.cpp \ | |||
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 \ |
@@ -188,9 +188,9 @@ freecellcardgame.o: freecellcardgame.cpp \ | |||
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 \ |
@@ -202,9 +202,9 @@ patiencecardgame.o: patiencecardgame.cpp \ | |||
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 \ |
@@ -217,14 +217,14 @@ canvascardwindow.o: canvascardwindow.cpp \ | |||
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 |
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,7 +1,7 @@ | |||
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 | ||
@@ -9,8 +9,8 @@ SOURCES = canvascard.cpp canvasshapes.cpp cardgame.cpp cardgamelayout.cpp cardp | |||
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 |