diff options
-rw-r--r-- | uisimulator/x11/Makefile | 50 |
1 files changed, 31 insertions, 19 deletions
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index 853e42a5d5..9143adbede 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile | |||
@@ -46,8 +46,12 @@ $(KEYPAD) $(DISPLAY) | |||
46 | 46 | ||
47 | LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl | 47 | LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl |
48 | 48 | ||
49 | # Use this for simulator-only files | ||
49 | INCLUDES = -I. -I$(DRIVERS) -I$(COMMON) -I$(FIRMWAREDIR) -I$(APPDIR) -I$(RECDIR) | 50 | INCLUDES = -I. -I$(DRIVERS) -I$(COMMON) -I$(FIRMWAREDIR) -I$(APPDIR) -I$(RECDIR) |
50 | 51 | ||
52 | # The true Rockbox Applications should use this include path: | ||
53 | APPINCLUDES = -I$(FIRMWAREDIR)/include $(INCLUDES) | ||
54 | |||
51 | LIBS = -lpthread | 55 | LIBS = -lpthread |
52 | 56 | ||
53 | UNAME := $(shell uname) | 57 | UNAME := $(shell uname) |
@@ -67,10 +71,12 @@ endif | |||
67 | 71 | ||
68 | CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall | 72 | CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall |
69 | 73 | ||
74 | APPCFLAGS = $(DEBUG) $(DEFINES) $(APPINCLUDES) -W -Wall | ||
75 | |||
70 | FIRMSRCS = chartables.c lcd.c sprintf.c id3.c debug.c | 76 | FIRMSRCS = chartables.c lcd.c sprintf.c id3.c debug.c |
71 | 77 | ||
72 | APPS = main.c tree.c play.c menu.c credits.c main_menu.c sound_menu.c \ | 78 | APPS = main.c tree.c play.c menu.c credits.c main_menu.c sound_menu.c \ |
73 | playlist.c | 79 | playlist.c showtext.c |
74 | 80 | ||
75 | ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) | 81 | ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) |
76 | APPS += tetris.c sokoban.c bounce.c boxes.c icons.c bmp.c | 82 | APPS += tetris.c sokoban.c bounce.c boxes.c icons.c bmp.c |
@@ -136,61 +142,67 @@ $(OBJDIR)/mpegplay.o: $(PREVAPPDIR)/common/mpegplay.c | |||
136 | endif | 142 | endif |
137 | 143 | ||
138 | $(OBJDIR)/credits.o: $(APPDIR)/credits.c | 144 | $(OBJDIR)/credits.o: $(APPDIR)/credits.c |
139 | $(CC) $(CFLAGS) -c $< -o $@ | 145 | $(CC) $(APPCFLAGS) -c $< -o $@ |
140 | 146 | ||
141 | $(OBJDIR)/menu.o: $(APPDIR)/menu.c | 147 | $(OBJDIR)/menu.o: $(APPDIR)/menu.c |
142 | $(CC) $(CFLAGS) -c $< -o $@ | 148 | $(CC) $(APPCFLAGS) -c $< -o $@ |
143 | 149 | ||
144 | $(OBJDIR)/main_menu.o: $(APPDIR)/main_menu.c | 150 | $(OBJDIR)/main_menu.o: $(APPDIR)/main_menu.c |
145 | $(CC) $(CFLAGS) -c $< -o $@ | 151 | $(CC) $(APPCFLAGS) -c $< -o $@ |
146 | 152 | ||
147 | $(OBJDIR)/sound_menu.o: $(APPDIR)/sound_menu.c | 153 | $(OBJDIR)/sound_menu.o: $(APPDIR)/sound_menu.c |
148 | $(CC) $(CFLAGS) -c $< -o $@ | 154 | $(CC) $(APPCFLAGS) -c $< -o $@ |
149 | 155 | ||
150 | $(OBJDIR)/icons.o: $(RECDIR)/icons.c | 156 | $(OBJDIR)/icons.o: $(RECDIR)/icons.c |
151 | $(CC) $(CFLAGS) -c $< -o $@ | 157 | $(CC) $(APPCFLAGS) -c $< -o $@ |
152 | 158 | ||
153 | $(OBJDIR)/tetris.o: $(RECDIR)/tetris.c | 159 | $(OBJDIR)/tetris.o: $(RECDIR)/tetris.c |
154 | $(CC) $(CFLAGS) -c $< -o $@ | 160 | $(CC) $(APPCFLAGS) -c $< -o $@ |
155 | 161 | ||
156 | $(OBJDIR)/sokoban.o: $(RECDIR)/sokoban.c | 162 | $(OBJDIR)/sokoban.o: $(RECDIR)/sokoban.c |
157 | $(CC) $(CFLAGS) -c $< -o $@ | 163 | $(CC) $(APPCFLAGS) -c $< -o $@ |
158 | 164 | ||
159 | $(OBJDIR)/bounce.o: $(RECDIR)/bounce.c | 165 | $(OBJDIR)/bounce.o: $(RECDIR)/bounce.c |
160 | $(CC) $(CFLAGS) -c $< -o $@ | 166 | $(CC) $(APPCFLAGS) -c $< -o $@ |
161 | 167 | ||
162 | $(OBJDIR)/boxes.o: $(RECDIR)/boxes.c | 168 | $(OBJDIR)/boxes.o: $(RECDIR)/boxes.c |
163 | $(CC) $(CFLAGS) -c $< -o $@ | 169 | $(CC) $(APPCFLAGS) -c $< -o $@ |
164 | 170 | ||
165 | $(OBJDIR)/main.o: $(APPDIR)/main.c | 171 | $(OBJDIR)/main.o: $(APPDIR)/main.c |
166 | $(CC) $(CFLAGS) -c $< -o $@ | 172 | $(CC) $(APPCFLAGS) -c $< -o $@ |
167 | 173 | ||
168 | $(OBJDIR)/bmp.o: $(RECDIR)/bmp.c | 174 | $(OBJDIR)/bmp.o: $(RECDIR)/bmp.c |
169 | $(CC) $(CFLAGS) -c $< -o $@ | 175 | $(CC) $(APPCFLAGS) -c $< -o $@ |
170 | 176 | ||
171 | $(OBJDIR)/play.o: $(APPDIR)/play.c | 177 | $(OBJDIR)/play.o: $(APPDIR)/play.c |
172 | $(CC) $(CFLAGS) -c $< -o $@ | 178 | $(CC) $(APPCFLAGS) -c $< -o $@ |
173 | 179 | ||
174 | $(OBJDIR)/tree.o: $(APPDIR)/tree.c | 180 | $(OBJDIR)/tree.o: $(APPDIR)/tree.c |
175 | $(CC) $(CFLAGS) -c $< -o $@ | 181 | $(CC) $(APPCFLAGS) -c $< -o $@ |
176 | 182 | ||
177 | $(OBJDIR)/playlist.o: $(APPDIR)/playlist.c | 183 | $(OBJDIR)/playlist.o: $(APPDIR)/playlist.c |
178 | $(CC) $(CFLAGS) -c $< -o $@ | 184 | $(CC) $(APPCFLAGS) -c $< -o $@ |
185 | |||
186 | $(OBJDIR)/showtext.o: $(APPDIR)/showtext.c | ||
187 | $(CC) $(APPCFLAGS) -c $< -o $@ | ||
179 | 188 | ||
180 | $(OBJDIR)/lcd.o: $(DRIVERS)/lcd.c | 189 | $(OBJDIR)/lcd.o: $(DRIVERS)/lcd.c |
181 | $(CC) $(CFLAGS) -c $< -o $@ | 190 | $(CC) $(APPCFLAGS) -c $< -o $@ |
182 | 191 | ||
183 | $(OBJDIR)/chartables.o: $(FIRMWAREDIR)/chartables.c | 192 | $(OBJDIR)/chartables.o: $(FIRMWAREDIR)/chartables.c |
184 | $(CC) $(CFLAGS) -c $< -o $@ | 193 | $(CC) $(APPCFLAGS) -c $< -o $@ |
185 | 194 | ||
186 | $(OBJDIR)/id3.o: $(FIRMWAREDIR)/id3.c | 195 | $(OBJDIR)/id3.o: $(FIRMWAREDIR)/id3.c |
187 | $(CC) $(CFLAGS) -c $< -o $@ | 196 | $(CC) $(APPCFLAGS) -c $< -o $@ |
188 | 197 | ||
189 | $(OBJDIR)/debug.o: $(FIRMWAREDIR)/debug.c | 198 | $(OBJDIR)/debug.o: $(FIRMWAREDIR)/debug.c |
190 | $(CC) $(CFLAGS) -c $< -o $@ | 199 | $(CC) $(CFLAGS) -c $< -o $@ |
191 | 200 | ||
192 | $(OBJDIR)/sprintf.o: $(COMMON)/sprintf.c | 201 | $(OBJDIR)/sprintf.o: $(COMMON)/sprintf.c |
193 | $(CC) $(CFLAGS) -c $< -o $@ | 202 | $(CC) $(APPCFLAGS) -c $< -o $@ |
203 | |||
204 | |||
205 | # these ones are simulator-specific | ||
194 | 206 | ||
195 | $(OBJDIR)/%.o: %.c | 207 | $(OBJDIR)/%.o: %.c |
196 | $(CC) $(CFLAGS) -c $< -o $@ | 208 | $(CC) $(CFLAGS) -c $< -o $@ |