diff options
-rw-r--r-- | apps/Makefile | 5 | ||||
-rw-r--r-- | firmware/Makefile | 10 | ||||
-rwxr-xr-x | tools/configure | 8 | ||||
-rw-r--r-- | uisimulator/win32/Makefile | 7 | ||||
-rw-r--r-- | uisimulator/x11/Makefile | 10 |
5 files changed, 11 insertions, 29 deletions
diff --git a/apps/Makefile b/apps/Makefile index 8ec3b0a581..07b093eb40 100644 --- a/apps/Makefile +++ b/apps/Makefile | |||
@@ -17,11 +17,6 @@ FIRMWARE := ../firmware | |||
17 | 17 | ||
18 | INCLUDES= -I$(FIRMWARE)/include -I$(FIRMWARE) -I$(FIRMWARE)/common -I$(FIRMWARE)/drivers -I$(FIRMWARE)/malloc -I. | 18 | INCLUDES= -I$(FIRMWARE)/include -I$(FIRMWARE) -I$(FIRMWARE)/common -I$(FIRMWARE)/drivers -I$(FIRMWARE)/malloc -I. |
19 | 19 | ||
20 | # Pick a target to build for | ||
21 | #TARGET = -DARCHOS_PLAYER=1 | ||
22 | TARGET = -DARCHOS_PLAYER_OLD=1 | ||
23 | #TARGET = -DARCHOS_RECORDER=1 | ||
24 | |||
25 | # store output files in this directory: | 20 | # store output files in this directory: |
26 | OBJDIR = . | 21 | OBJDIR = . |
27 | 22 | ||
diff --git a/firmware/Makefile b/firmware/Makefile index aab5249b25..252b1ea70b 100644 --- a/firmware/Makefile +++ b/firmware/Makefile | |||
@@ -17,11 +17,6 @@ INCLUDES=-Iinclude -I. -Icommon -Idrivers | |||
17 | 17 | ||
18 | SYSTEM_FONT = fonts/alt6x10.bdf | 18 | SYSTEM_FONT = fonts/alt6x10.bdf |
19 | 19 | ||
20 | # Pick a target to build for | ||
21 | TARGET = -DARCHOS_PLAYER=1 | ||
22 | #TARGET = -DARCHOS_PLAYER_OLD=1 | ||
23 | #TARGET = -DARCHOS_RECORDER=1 | ||
24 | |||
25 | # store output files in this directory: | 20 | # store output files in this directory: |
26 | OBJDIR = . | 21 | OBJDIR = . |
27 | 22 | ||
@@ -43,8 +38,13 @@ DIRS = $(subst $(DEPS),".",$(DEPDIRS)) | |||
43 | 38 | ||
44 | OUTPUT = $(OBJDIR)/librockbox.a | 39 | OUTPUT = $(OBJDIR)/librockbox.a |
45 | 40 | ||
41 | |||
46 | ifeq (LOADABLE_FONTS,$(findstring LOADABLE_FONTS, $(CFLAGS))) | 42 | ifeq (LOADABLE_FONTS,$(findstring LOADABLE_FONTS, $(CFLAGS))) |
47 | EXTRA_TARGETS = $(OBJDIR)/system.ajf | 43 | EXTRA_TARGETS = $(OBJDIR)/system.ajf |
44 | else | ||
45 | ifeq ($(TARGET),-DARCHOS_RECORDER) | ||
46 | CFLAGS += -DLCD_PROPFONTS | ||
47 | endif | ||
48 | endif | 48 | endif |
49 | 49 | ||
50 | all: $(OUTPUT) $(EXTRA_TARGETS) | 50 | all: $(OUTPUT) $(EXTRA_TARGETS) |
diff --git a/tools/configure b/tools/configure index e2c3bd53f9..cc13e94268 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -190,13 +190,7 @@ if [ "-" = "$extra_defines" ]; then | |||
190 | extra_defines="-DLOADABLE_FONTS" | 190 | extra_defines="-DLOADABLE_FONTS" |
191 | echo "*** Remember to copy the 'system.ajf' file to the root of your Archos!" | 191 | echo "*** Remember to copy the 'system.ajf' file to the root of your Archos!" |
192 | else | 192 | else |
193 | echo "Proportional font support? (N)" | 193 | extra_defines="" |
194 | getit=`input`; | ||
195 | if [ "y" = "$getit" -o "Y" = "$getit" ] ; then | ||
196 | extra_defines="-DLCD_PROPFONTS" | ||
197 | else | ||
198 | extra_defines="" | ||
199 | fi | ||
200 | fi | 194 | fi |
201 | else | 195 | else |
202 | extra_defines="" | 196 | extra_defines="" |
diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile index 7282afdc24..a45a4a6be6 100644 --- a/uisimulator/win32/Makefile +++ b/uisimulator/win32/Makefile | |||
@@ -36,12 +36,6 @@ OBJDIR = . | |||
36 | 36 | ||
37 | TARGET = $(OBJDIR)/uisw32.exe | 37 | TARGET = $(OBJDIR)/uisw32.exe |
38 | 38 | ||
39 | #DISPLAY = -DHAVE_LCD_CHARCELLS | ||
40 | DISPLAY = -DHAVE_LCD_BITMAP | ||
41 | |||
42 | #KEYPAD = -DHAVE_PLAYER_KEYPAD | ||
43 | KEYPAD = -DHAVE_RECORDER_KEYPAD | ||
44 | |||
45 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ | 39 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ |
46 | $(KEYPAD) $(DISPLAY) -DAPPSVERSION=\"$(VERSION)\" | 40 | $(KEYPAD) $(DISPLAY) -DAPPSVERSION=\"$(VERSION)\" |
47 | 41 | ||
@@ -68,6 +62,7 @@ APPS = main.c tree.c menu.c credits.c main_menu.c\ | |||
68 | MENUS = games_menu.c screensavers_menu.c settings_menu.c sound_menu.c | 62 | MENUS = games_menu.c screensavers_menu.c settings_menu.c sound_menu.c |
69 | 63 | ||
70 | ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) | 64 | ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) |
65 | DEFINES += -DLCD_PROPFONTS | ||
71 | APPS += tetris.c sokoban.c blank.c bounce.c boxes.c icons.c bmp.c \ | 66 | APPS += tetris.c sokoban.c blank.c bounce.c boxes.c icons.c bmp.c \ |
72 | widgets.c wormlet.c | 67 | widgets.c wormlet.c |
73 | endif | 68 | endif |
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index 7a61c50ed3..f5856aa65b 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile | |||
@@ -36,12 +36,6 @@ OBJDIR = . | |||
36 | 36 | ||
37 | TARGET = $(OBJDIR)/rockboxui | 37 | TARGET = $(OBJDIR)/rockboxui |
38 | 38 | ||
39 | #DISPLAY = -DHAVE_LCD_CHARCELLS | ||
40 | DISPLAY = -DHAVE_LCD_BITMAP | ||
41 | |||
42 | #KEYPAD = -DHAVE_PLAYER_KEYPAD | ||
43 | KEYPAD = -DHAVE_RECORDER_KEYPAD | ||
44 | |||
45 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ | 39 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ |
46 | $(KEYPAD) $(DISPLAY) $(EXTRA_DEFINES) | 40 | $(KEYPAD) $(DISPLAY) $(EXTRA_DEFINES) |
47 | 41 | ||
@@ -81,6 +75,10 @@ ifeq (LOADABLE_FONTS,$(findstring LOADABLE_FONTS, $(DEFINES))) | |||
81 | FIRMSRCS += unicode.c ajf.c panic.c | 75 | FIRMSRCS += unicode.c ajf.c panic.c |
82 | EXTRA_TARGETS = $(OBJDIR)/archos/system.ajf | 76 | EXTRA_TARGETS = $(OBJDIR)/archos/system.ajf |
83 | SYSTEM_FONT = $(FIRMWAREDIR)/fonts/alt6x10.bdf | 77 | SYSTEM_FONT = $(FIRMWAREDIR)/fonts/alt6x10.bdf |
78 | else | ||
79 | ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) | ||
80 | DEFINES += -DLCD_PROPFONTS | ||
81 | endif | ||
84 | endif | 82 | endif |
85 | 83 | ||
86 | APPS = main.c tree.c menu.c credits.c main_menu.c\ | 84 | APPS = main.c tree.c menu.c credits.c main_menu.c\ |