diff options
author | Björn Stenberg <bjorn@haxx.se> | 2004-09-16 14:36:08 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2004-09-16 14:36:08 +0000 |
commit | 8b6950493bb281e8aac996219d33188c482b1d67 (patch) | |
tree | 3b907795bc72dd61934c5ea6f4f790e047e3f83c /uisimulator/x11/Makefile | |
parent | 82e9438e2e87887c0c917fddf2fa4971261ff83d (diff) | |
download | rockbox-8b6950493bb281e8aac996219d33188c482b1d67.tar.gz rockbox-8b6950493bb281e8aac996219d33188c482b1d67.zip |
Moved LCD_WIDHT/HEIGHT from lcd driver to config file.
Simulators now use conig-xxx.h.
Added Iriver H100 to tools/configure.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5081 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator/x11/Makefile')
-rw-r--r-- | uisimulator/x11/Makefile | 88 |
1 files changed, 50 insertions, 38 deletions
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index 6534425933..785e590623 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile | |||
@@ -23,13 +23,11 @@ PLAYDIR = $(APPDIR)/player | |||
23 | PLUGINDIR = $(APPDIR)/plugins | 23 | PLUGINDIR = $(APPDIR)/plugins |
24 | SIMCOMMON = ../common | 24 | SIMCOMMON = ../common |
25 | 25 | ||
26 | ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) | 26 | ISPLAYER := $(findstring PLAYER, $(TARGET)) |
27 | MACHINEDIR = $(RECDIR) | 27 | ifeq ($(ISPLAYER), PLAYER) |
28 | # not very nice to set config stuff like this, but... | ||
29 | RTC += -DHAVE_RTC | ||
30 | RADIO += -DHAVE_FMRADIO | ||
31 | else | ||
32 | MACHINEDIR = $(PLAYDIR) | 28 | MACHINEDIR = $(PLAYDIR) |
29 | else | ||
30 | MACHINEDIR = $(RECDIR) | ||
33 | endif | 31 | endif |
34 | 32 | ||
35 | PREVAPPDIR= .. | 33 | PREVAPPDIR= .. |
@@ -60,9 +58,8 @@ LANGUAGE = english | |||
60 | 58 | ||
61 | TARGET = $(OBJDIR)/rockboxui | 59 | TARGET = $(OBJDIR)/rockboxui |
62 | 60 | ||
63 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ | 61 | DEFINES := -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ |
64 | $(KEYPAD) $(DISPLAY) -DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) \ | 62 | $(TARGET) -DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) |
65 | $(RTC) $(RADIO) | ||
66 | 63 | ||
67 | # Use this for simulator-only files | 64 | # Use this for simulator-only files |
68 | INCLUDES = -I. -I$(EXPORT) -I$(APPDIR) -I$(MACHINEDIR) -I$(SIMCOMMON) -I$(OBJDIR) -I$(PLUGINDIR)/lib | 65 | INCLUDES = -I. -I$(EXPORT) -I$(APPDIR) -I$(MACHINEDIR) -I$(SIMCOMMON) -I$(OBJDIR) -I$(PLUGINDIR)/lib |
@@ -82,6 +79,7 @@ CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall | |||
82 | APPCFLAGS = $(DEBUG) $(DEFINES) $(APPINCLUDES) -W -Wall | 79 | APPCFLAGS = $(DEBUG) $(DEFINES) $(APPINCLUDES) -W -Wall |
83 | 80 | ||
84 | UNAME := $(shell uname|sed -e "s/CYGWIN.*/CYGWIN/") | 81 | UNAME := $(shell uname|sed -e "s/CYGWIN.*/CYGWIN/") |
82 | EXEFILE = $(OBJDIR)/rockboxui | ||
85 | ifeq ($(UNAME),Linux) | 83 | ifeq ($(UNAME),Linux) |
86 | LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl -ldl | 84 | LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl -ldl |
87 | INCLUDES += -I/usr/X11R6/include | 85 | INCLUDES += -I/usr/X11R6/include |
@@ -93,7 +91,7 @@ ifeq ($(UNAME),CYGWIN) | |||
93 | INCLUDES += -I/usr/X11R6/include | 91 | INCLUDES += -I/usr/X11R6/include |
94 | LIBDIRS = -L/usr/X11R6/lib | 92 | LIBDIRS = -L/usr/X11R6/lib |
95 | DEFINES += -DHAVE_OSS -D_SSIZE_T_ | 93 | DEFINES += -DHAVE_OSS -D_SSIZE_T_ |
96 | TARGET = $(OBJDIR)/rockboxui.exe | 94 | EXEFILE = $(OBJDIR)/rockboxui.exe |
97 | else | 95 | else |
98 | ifeq ($(UNAME),FreeBSD) | 96 | ifeq ($(UNAME),FreeBSD) |
99 | LIBS = -pthread | 97 | LIBS = -pthread |
@@ -117,10 +115,10 @@ else | |||
117 | SOUNDSRC = | 115 | SOUNDSRC = |
118 | endif | 116 | endif |
119 | 117 | ||
120 | ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) | 118 | ifeq ($(ISPLAYER), PLAYER) |
121 | LCDSRSC = lcd-recorder.c sysfont.c font.c | ||
122 | else | ||
123 | LCDSRSC = lcd-playersim.c lcd-player.c lcd-player-charset.c font-player.c | 119 | LCDSRSC = lcd-playersim.c lcd-player.c lcd-player-charset.c font-player.c |
120 | else | ||
121 | LCDSRSC = lcd-recorder.c sysfont.c font.c | ||
124 | endif | 122 | endif |
125 | COMMONSRCS = io.c stubs.c lcd-common.c sim_icons.c fmradio.c | 123 | COMMONSRCS = io.c stubs.c lcd-common.c sim_icons.c fmradio.c |
126 | 124 | ||
@@ -134,7 +132,7 @@ APPS = main.c tree.c menu.c credits.c main_menu.c icons.c language.c \ | |||
134 | misc.c plugin.c playlist_viewer.c bookmark.c filetypes.c \ | 132 | misc.c plugin.c playlist_viewer.c bookmark.c filetypes.c \ |
135 | settings_menu.c sound_menu.c playlist_menu.c | 133 | settings_menu.c sound_menu.c playlist_menu.c |
136 | 134 | ||
137 | ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) | 135 | ifneq ($(ISPLAYER), PLAYER) |
138 | APPS += peakmeter.c bmp.c widgets.c radio.c | 136 | APPS += peakmeter.c bmp.c widgets.c radio.c |
139 | endif | 137 | endif |
140 | 138 | ||
@@ -147,7 +145,7 @@ OBJS := $(OBJDIR)/lang.o $(SRCS:%.c=$(OBJDIR)/%.o) | |||
147 | ROCKS := $(patsubst $(PLUGINDIR)/%.c,$(OBJDIR)/%.rock,$(wildcard $(PLUGINDIR)/*.c)) | 145 | ROCKS := $(patsubst $(PLUGINDIR)/%.c,$(OBJDIR)/%.rock,$(wildcard $(PLUGINDIR)/*.c)) |
148 | PLUGINLIBOBJS := $(patsubst $(PLUGINDIR)/lib/%.c,$(OBJDIR)/%.o,$(wildcard $(PLUGINDIR)/lib/*.c)) | 146 | PLUGINLIBOBJS := $(patsubst $(PLUGINDIR)/lib/%.c,$(OBJDIR)/%.o,$(wildcard $(PLUGINDIR)/lib/*.c)) |
149 | 147 | ||
150 | all: $(TOOLSDIR)/convbdf $(TARGET) $(ROCKS) | 148 | all: $(TOOLSDIR)/convbdf $(EXEFILE) $(ROCKS) |
151 | 149 | ||
152 | $(ROCKS): $(OBJDIR)/libplugin.a | 150 | $(ROCKS): $(OBJDIR)/libplugin.a |
153 | 151 | ||
@@ -155,7 +153,7 @@ $(TOOLSDIR)/convbdf: | |||
155 | $(MAKE) -C $(TOOLSDIR) | 153 | $(MAKE) -C $(TOOLSDIR) |
156 | 154 | ||
157 | clean: | 155 | clean: |
158 | $(RM) $(OBJS) *~ core $(TARGET) $(CLIENTS) $(OBJDIR)/lang.[cho] \ | 156 | $(RM) $(OBJS) *~ core $(EXEFILE) $(CLIENTS) $(OBJDIR)/lang.[cho] \ |
159 | $(OBJDIR)/build.lang $(OBJDIR)/*.o $(OBJDIR)/sysfont.c \ | 157 | $(OBJDIR)/build.lang $(OBJDIR)/*.o $(OBJDIR)/sysfont.c \ |
160 | $(ROCKS) $(OBJDIR)/credits.raw | 158 | $(ROCKS) $(OBJDIR)/credits.raw |
161 | $(RM) -r $(DEPS) | 159 | $(RM) -r $(DEPS) |
@@ -173,50 +171,62 @@ $(OBJDIR)/credits.o: $(APPDIR)/credits.c $(APPDIR)/credits.h $(OBJDIR)/credits.r | |||
173 | $(OBJDIR)/thread.o: ./thread.c | 171 | $(OBJDIR)/thread.o: ./thread.c |
174 | $(OBJDIR)/plugin.o: $(APPDIR)/plugin.c | 172 | $(OBJDIR)/plugin.o: $(APPDIR)/plugin.c |
175 | $(OBJDIR)/build.lang: $(APPDIR)/lang/$(LANGUAGE).lang | 173 | $(OBJDIR)/build.lang: $(APPDIR)/lang/$(LANGUAGE).lang |
176 | perl $(TOOLSDIR)/uplang $(APPDIR)/lang/english.lang $< > $@ | 174 | @echo "UPLANG" |
175 | @perl $(TOOLSDIR)/uplang $(APPDIR)/lang/english.lang $< > $@ | ||
177 | 176 | ||
178 | $(OBJDIR)/lang.o: $(OBJDIR)/build.lang | 177 | $(OBJDIR)/lang.o: $(OBJDIR)/build.lang |
179 | perl -s $(TOOLSDIR)/genlang -p=$(OBJDIR)/lang $< | 178 | @echo GENLANG |
180 | $(CC) $(CFLAGS) -c $(OBJDIR)/lang.c -o $@ | 179 | @perl -s $(TOOLSDIR)/genlang -p=$(OBJDIR)/lang $< |
180 | @echo "CC lang.c" | ||
181 | @$(CC) $(CFLAGS) -c $(OBJDIR)/lang.c -o $@ | ||
181 | 182 | ||
182 | $(OBJDIR)/sysfont.o: $(FIRMWAREDIR)/fonts/clR6x8.bdf | 183 | $(OBJDIR)/sysfont.o: $(FIRMWAREDIR)/fonts/clR6x8.bdf |
183 | $(TOOLSDIR)/convbdf -c -o $(OBJDIR)/sysfont.c $< | 184 | @echo CC $< |
184 | $(CC) $(APPCFLAGS) -c $(OBJDIR)/sysfont.c -o $@ | 185 | @$(TOOLSDIR)/convbdf -c -o $(OBJDIR)/sysfont.c $< |
186 | @$(CC) $(APPCFLAGS) -c $(OBJDIR)/sysfont.c -o $@ | ||
185 | 187 | ||
186 | ################## Plugins ################## | 188 | ################## Plugins ################## |
187 | $(OBJDIR)/libplugin.a: $(PLUGINLIBOBJS) | 189 | $(OBJDIR)/libplugin.a: $(PLUGINLIBOBJS) |
188 | $(AR) ruv $@ $+ | 190 | @echo AR $< |
191 | @$(AR) ru $@ $+ | ||
189 | 192 | ||
190 | $(OBJDIR)/%.o: $(PLUGINDIR)/lib/%.c | 193 | $(OBJDIR)/%.o: $(PLUGINDIR)/lib/%.c |
191 | $(CC) $(CFLAGS) -DPLUGIN -c $< -o $@ | 194 | @echo CC $< |
195 | @$(CC) $(CFLAGS) -DPLUGIN -c $< -o $@ | ||
192 | 196 | ||
193 | $(OBJDIR)/%.rock: $(APPDIR)/plugins/%.c $(APPDIR)/plugin.h | 197 | $(OBJDIR)/%.rock: $(APPDIR)/plugins/%.c $(APPDIR)/plugin.h |
194 | $(CC) $(APPCFLAGS) -DPLUGIN -L$(OBJDIR) -lplugin -shared $< -o $@ | 198 | @echo CC $< |
199 | @$(CC) $(APPCFLAGS) -DPLUGIN -L$(OBJDIR) -lplugin -shared $< -o $@ | ||
200 | @chmod -x $@ | ||
195 | 201 | ||
196 | ################## Patterns for building objects ################## | 202 | ################## Patterns for building objects ################## |
197 | $(OBJDIR)/%.o: ../x11/%.c | 203 | $(OBJDIR)/%.o: ../x11/%.c |
198 | echo x11 | 204 | @echo CC $< |
199 | $(CC) $(CFLAGS) -c $< -o $@ | 205 | @$(CC) $(CFLAGS) -c $< -o $@ |
200 | 206 | ||
201 | $(OBJDIR)/%.o: $(SIMCOMMON)/%.c | 207 | $(OBJDIR)/%.o: $(SIMCOMMON)/%.c |
202 | echo simcommon | 208 | @echo CC $< |
203 | $(CC) $(APPCFLAGS) -c $< -o $@ | 209 | @$(CC) $(APPCFLAGS) -c $< -o $@ |
204 | 210 | ||
205 | $(OBJDIR)/%.o: $(MACHINEDIR)/%.c | 211 | $(OBJDIR)/%.o: $(MACHINEDIR)/%.c |
206 | $(CC) $(APPCFLAGS) -c $< -o $@ | 212 | @echo CC $< |
213 | @$(CC) $(APPCFLAGS) -c $< -o $@ | ||
207 | 214 | ||
208 | $(OBJDIR)/%.o: $(DRIVERS)/%.c | 215 | $(OBJDIR)/%.o: $(DRIVERS)/%.c |
209 | $(CC) $(APPCFLAGS) -c $< -o $@ | 216 | @echo CC $< |
217 | @$(CC) $(APPCFLAGS) -c $< -o $@ | ||
210 | 218 | ||
211 | $(OBJDIR)/%.o: $(FIRMWAREDIR)/%.c | 219 | $(OBJDIR)/%.o: $(FIRMWAREDIR)/%.c |
212 | echo firmware $< | 220 | @echo CC $< |
213 | $(CC) $(APPCFLAGS) -c $< -o $@ | 221 | @$(CC) $(APPCFLAGS) -c $< -o $@ |
214 | 222 | ||
215 | $(OBJDIR)/%.o: $(COMMON)/%.c | 223 | $(OBJDIR)/%.o: $(COMMON)/%.c |
216 | $(CC) $(APPCFLAGS) -c $< -o $@ | 224 | @echo CC $< |
225 | @$(CC) $(APPCFLAGS) -c $< -o $@ | ||
217 | 226 | ||
218 | $(OBJDIR)/%.o: $(APPDIR)/%.c | 227 | $(OBJDIR)/%.o: $(APPDIR)/%.c |
219 | $(CC) $(APPCFLAGS) -c $< -o $@ | 228 | @echo CC $< |
229 | @$(CC) $(APPCFLAGS) -c $< -o $@ | ||
220 | 230 | ||
221 | 231 | ||
222 | ################## Auto-dependencies ################## | 232 | ################## Auto-dependencies ################## |
@@ -239,11 +249,13 @@ $(OBJDIR)/%.o: %.c | |||
239 | $(CC) $(CFLAGS) -c $< -o $@ | 249 | $(CC) $(CFLAGS) -c $< -o $@ |
240 | 250 | ||
241 | ifeq ($(UNAME),CYGWIN) | 251 | ifeq ($(UNAME),CYGWIN) |
242 | $(TARGET): $(OBJS) $(OBJDIR)/libplugin.a | 252 | $(EXEFILE): $(OBJS) $(OBJDIR)/libplugin.a |
243 | $(CC) -g -o $(TARGET) $(OBJS) $(LIBDIRS) $(LDFLAGS) $(LIBS) | 253 | @echo LD $@ |
254 | @$(CC) -g -o $(EXEFILE) $(OBJS) $(LIBDIRS) $(LDFLAGS) $(LIBS) | ||
244 | else | 255 | else |
245 | $(TARGET): $(OBJS) $(OBJDIR)/libplugin.a | 256 | $(EXEFILE): $(OBJS) $(OBJDIR)/libplugin.a |
246 | $(CC) -g -o $(TARGET) $(LIBDIRS) $(LDFLAGS) $(OBJS) $(LIBS) | 257 | @echo LD $@ |
258 | @$(CC) -g -o $(EXEFILE) $(LIBDIRS) $(LDFLAGS) $(OBJS) $(LIBS) | ||
247 | endif | 259 | endif |
248 | 260 | ||
249 | tags: | 261 | tags: |