diff options
Diffstat (limited to 'uisimulator')
-rw-r--r-- | uisimulator/win32/Makefile | 13 | ||||
-rw-r--r-- | uisimulator/x11/Makefile | 13 |
2 files changed, 14 insertions, 12 deletions
diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile index c3a585e64e..c852088588 100644 --- a/uisimulator/win32/Makefile +++ b/uisimulator/win32/Makefile | |||
@@ -40,6 +40,7 @@ DEBUG = -g | |||
40 | 40 | ||
41 | # where to put all output files | 41 | # where to put all output files |
42 | OBJDIR = . | 42 | OBJDIR = . |
43 | LANGUAGE = english | ||
43 | 44 | ||
44 | TARGET = $(OBJDIR)/uisw32.exe | 45 | TARGET = $(OBJDIR)/uisw32.exe |
45 | 46 | ||
@@ -49,7 +50,7 @@ $(KEYPAD) $(DISPLAY) -DAPPSVERSION=\"$(VERSION)\" | |||
49 | LDFLAGS = -lgdi32 -luser32 -mwindows | 50 | LDFLAGS = -lgdi32 -luser32 -mwindows |
50 | 51 | ||
51 | # Use this for simulator-only files | 52 | # Use this for simulator-only files |
52 | INCLUDES = -I. -I$(DRIVERS) -I$(COMMON) -I$(FIRMWAREDIR) -I$(APPDIR) -I$(MACHINEDIR) -I../common -I$(MACHINEDIR) | 53 | INCLUDES = -I. -I$(DRIVERS) -I$(COMMON) -I$(FIRMWAREDIR) -I$(APPDIR) -I$(MACHINEDIR) -I../common -I$(MACHINEDIR) -I$(OBJDIR) |
53 | 54 | ||
54 | # The true Rockbox Applications should use this include path: | 55 | # The true Rockbox Applications should use this include path: |
55 | APPINCLUDES = -I$(FIRMWAREDIR)/include $(INCLUDES) | 56 | APPINCLUDES = -I$(FIRMWAREDIR)/include $(INCLUDES) |
@@ -64,8 +65,7 @@ FIRMSRCS = lcd.c power.c sprintf.c id3.c usb.c \ | |||
64 | mpeg.c powermgmt.c font.c loadfont.c X5x8.c | 65 | mpeg.c powermgmt.c font.c loadfont.c X5x8.c |
65 | 66 | ||
66 | APPS = main.c tree.c menu.c credits.c main_menu.c icons.c \ | 67 | APPS = main.c tree.c menu.c credits.c main_menu.c icons.c \ |
67 | playlist.c showtext.c wps.c wps-display.c settings.c status.c \ | 68 | playlist.c showtext.c wps.c wps-display.c settings.c status.c |
68 | lang.c | ||
69 | 69 | ||
70 | MENUS = games_menu.c demo_menu.c settings_menu.c sound_menu.c | 70 | MENUS = games_menu.c demo_menu.c settings_menu.c sound_menu.c |
71 | 71 | ||
@@ -78,7 +78,7 @@ SRCS = button.c dir-win32.c lcd-win32.c panic-win32.c thread-win32.c \ | |||
78 | debug-win32.c kernel.c string-win32.c uisw32.c stubs.c \ | 78 | debug-win32.c kernel.c string-win32.c uisw32.c stubs.c \ |
79 | $(APPS) $(MENUS) $(FIRMSRCS) strtok.c sim_icons.c | 79 | $(APPS) $(MENUS) $(FIRMSRCS) strtok.c sim_icons.c |
80 | 80 | ||
81 | OBJS := $(SRCS:%.c=$(OBJDIR)/%.o) $(OBJDIR)/uisw32-res.o | 81 | OBJS := $(OBJDIR)/lang.o $(SRCS:%.c=$(OBJDIR)/%.o) $(OBJDIR)/uisw32-res.o |
82 | 82 | ||
83 | all: $(TARGET) | 83 | all: $(TARGET) |
84 | 84 | ||
@@ -161,8 +161,9 @@ $(OBJDIR)/playlist.o: $(APPDIR)/playlist.c | |||
161 | $(OBJDIR)/showtext.o: $(APPDIR)/showtext.c | 161 | $(OBJDIR)/showtext.o: $(APPDIR)/showtext.c |
162 | $(CC) $(APPCFLAGS) -c $< -o $@ | 162 | $(CC) $(APPCFLAGS) -c $< -o $@ |
163 | 163 | ||
164 | $(OBJDIR)/lang.o: $(APPDIR)/lang.c | 164 | $(OBJDIR)/lang.o: $(APPDIR)/lang/$(LANGUAGE).lang |
165 | $(CC) $(APPCFLAGS) -c $< -o $@ | 165 | $(TOOLSDIR)/genlang -p=$(OBJDIR)/lang $< |
166 | $(CC) $(CFLAGS) -c $(OBJDIR)/lang.c -o $@ | ||
166 | 167 | ||
167 | $(OBJDIR)/lcd.o: $(DRIVERS)/lcd.c | 168 | $(OBJDIR)/lcd.o: $(DRIVERS)/lcd.c |
168 | $(CC) $(APPCFLAGS) -c $< -o $@ | 169 | $(CC) $(APPCFLAGS) -c $< -o $@ |
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index 2f74394d1f..821e13553f 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile | |||
@@ -42,6 +42,7 @@ DEBUG = -g | |||
42 | OBJDIR = . | 42 | OBJDIR = . |
43 | 43 | ||
44 | TARGET = $(OBJDIR)/rockboxui | 44 | TARGET = $(OBJDIR)/rockboxui |
45 | LANGUAGE = english | ||
45 | 46 | ||
46 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ | 47 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ |
47 | $(KEYPAD) $(DISPLAY) $(EXTRA_DEFINES) | 48 | $(KEYPAD) $(DISPLAY) $(EXTRA_DEFINES) |
@@ -49,7 +50,7 @@ $(KEYPAD) $(DISPLAY) $(EXTRA_DEFINES) | |||
49 | LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl | 50 | LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl |
50 | 51 | ||
51 | # Use this for simulator-only files | 52 | # Use this for simulator-only files |
52 | INCLUDES = -I. -I$(DRIVERS) -I$(COMMON) -I$(FIRMWAREDIR) -I$(APPDIR) -I$(MACHINEDIR) -I../common | 53 | INCLUDES = -I. -I$(DRIVERS) -I$(COMMON) -I$(FIRMWAREDIR) -I$(APPDIR) -I$(MACHINEDIR) -I../common -I$(OBJDIR) |
53 | SRCDIRS = . $(DRIVERS) $(COMMON) $(FIRMWAREDIR) $(APPDIR) $(MACHINEDIR) | 54 | SRCDIRS = . $(DRIVERS) $(COMMON) $(FIRMWAREDIR) $(APPDIR) $(MACHINEDIR) |
54 | 55 | ||
55 | # The true Rockbox Applications should use this include path: | 56 | # The true Rockbox Applications should use this include path: |
@@ -80,8 +81,7 @@ FIRMSRCS = lcd.c sprintf.c id3.c debug.c usb.c mpeg.c power.c\ | |||
80 | powermgmt.c font.c X5x8.c loadfont.c panic.c | 81 | powermgmt.c font.c X5x8.c loadfont.c panic.c |
81 | 82 | ||
82 | APPS = main.c tree.c menu.c credits.c main_menu.c\ | 83 | APPS = main.c tree.c menu.c credits.c main_menu.c\ |
83 | playlist.c showtext.c wps.c wps-display.c settings.c status.c icons.c \ | 84 | playlist.c showtext.c wps.c wps-display.c settings.c status.c icons.c |
84 | lang.c | ||
85 | 85 | ||
86 | MENUS = games_menu.c demo_menu.c settings_menu.c sound_menu.c | 86 | MENUS = games_menu.c demo_menu.c settings_menu.c sound_menu.c |
87 | 87 | ||
@@ -98,7 +98,7 @@ ifdef MPEG_PLAY | |||
98 | INCLUDES += -I$(LIBMADDIR) | 98 | INCLUDES += -I$(LIBMADDIR) |
99 | endif | 99 | endif |
100 | 100 | ||
101 | OBJS := $(SRCS:%.c=$(OBJDIR)/%.o) | 101 | OBJS := $(OBJDIR)/lang.o $(SRCS:%.c=$(OBJDIR)/%.o) |
102 | 102 | ||
103 | all: $(TARGET) $(EXTRA_TARGETS) | 103 | all: $(TARGET) $(EXTRA_TARGETS) |
104 | 104 | ||
@@ -214,8 +214,9 @@ $(OBJDIR)/playlist.o: $(APPDIR)/playlist.c | |||
214 | $(OBJDIR)/showtext.o: $(APPDIR)/showtext.c | 214 | $(OBJDIR)/showtext.o: $(APPDIR)/showtext.c |
215 | $(CC) $(APPCFLAGS) -c $< -o $@ | 215 | $(CC) $(APPCFLAGS) -c $< -o $@ |
216 | 216 | ||
217 | $(OBJDIR)/lang.o: $(APPDIR)/lang.c | 217 | $(OBJDIR)/lang.o: $(APPDIR)/lang/$(LANGUAGE).lang |
218 | $(CC) $(APPCFLAGS) -c $< -o $@ | 218 | $(TOOLSDIR)/genlang -p=$(OBJDIR)/lang $< |
219 | $(CC) $(CFLAGS) -c $(OBJDIR)/lang.c -o $@ | ||
219 | 220 | ||
220 | $(OBJDIR)/lcd.o: $(DRIVERS)/lcd.c | 221 | $(OBJDIR)/lcd.o: $(DRIVERS)/lcd.c |
221 | $(CC) $(CFLAGS) -c $< -o $@ | 222 | $(CC) $(CFLAGS) -c $< -o $@ |