diff options
-rw-r--r-- | uisimulator/win32/Makefile | 42 | ||||
-rw-r--r-- | uisimulator/win32/lcd-win32.c | 2 | ||||
-rw-r--r-- | uisimulator/win32/panic-win32.c | 2 | ||||
-rw-r--r-- | uisimulator/win32/sprintf.h | 2 | ||||
-rw-r--r-- | uisimulator/win32/uisw32.c | 1 |
5 files changed, 37 insertions, 12 deletions
diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile index c81b88c809..05c2729ff6 100644 --- a/uisimulator/win32/Makefile +++ b/uisimulator/win32/Makefile | |||
@@ -41,8 +41,6 @@ EXPORT = $(FIRMWAREDIR)/export | |||
41 | TOOLSDIR = ../../tools | 41 | TOOLSDIR = ../../tools |
42 | DOCSDIR = ../../docs | 42 | DOCSDIR = ../../docs |
43 | 43 | ||
44 | CC = i386-mingw32msvc-gcc | ||
45 | WINDRES = i386-mingw32msvc-windres | ||
46 | RM = rm -f | 44 | RM = rm -f |
47 | DEBUG = -g | 45 | DEBUG = -g |
48 | 46 | ||
@@ -52,10 +50,10 @@ LANGUAGE = english | |||
52 | 50 | ||
53 | TARGET = $(OBJDIR)/uisw32.exe | 51 | TARGET = $(OBJDIR)/uisw32.exe |
54 | 52 | ||
55 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ | 53 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR -DNOCYGWIN \ |
56 | $(KEYPAD) $(DISPLAY) -DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) $(RTC) | 54 | $(KEYPAD) $(DISPLAY) -DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) $(RTC) |
57 | 55 | ||
58 | LDFLAGS = -lgdi32 -luser32 -mwindows | 56 | LDFLAGS = -lgdi32 -luser32 |
59 | 57 | ||
60 | # Use this for simulator-only files | 58 | # Use this for simulator-only files |
61 | INCLUDES = -I. -I$(EXPORT) -I$(APPDIR) -I$(MACHINEDIR) -I../common -I$(MACHINEDIR) -I$(OBJDIR) | 59 | INCLUDES = -I. -I$(EXPORT) -I$(APPDIR) -I$(MACHINEDIR) -I../common -I$(MACHINEDIR) -I$(OBJDIR) |
@@ -65,17 +63,32 @@ APPINCLUDES = $(INCLUDES) | |||
65 | 63 | ||
66 | DEFINES += -DWIN32 | 64 | DEFINES += -DWIN32 |
67 | 65 | ||
68 | CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall -mwindows | 66 | CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall -mno-cygwin |
69 | 67 | ||
70 | APPCFLAGS = $(DEBUG) $(DEFINES) $(APPINCLUDES) -W -Wall -mwindows | 68 | APPCFLAGS = $(DEBUG) $(DEFINES) $(APPINCLUDES) -W -Wall -mno-cygwin |
69 | |||
70 | UNAME := $(shell uname) | ||
71 | ifeq ($(UNAME),CYGWIN_NT-5.1) | ||
72 | CC = gcc | ||
73 | WINDRES = windres | ||
74 | DEFINES += -DNOCYGWIN | ||
75 | CFLAGS += -mno-cygwin | ||
76 | LDFLAGS += -mno-cygwin | ||
77 | APPCFLAGS += -mno-cygwin | ||
78 | else | ||
79 | CC = i386-mingw32msvc-gcc | ||
80 | WINDRES = i386-mingw32msvc-windres | ||
81 | CFLAGS += -mwindows | ||
82 | LDFLAGS += -mwindows | ||
83 | APPCFLAGS += -mwindows | ||
84 | endif | ||
71 | 85 | ||
72 | ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) | 86 | ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) |
73 | LCDSRSC = lcd-recorder.c | 87 | LCDSRSC = lcd-recorder.c sysfont.c font.c |
74 | else | 88 | else |
75 | LCDSRSC = lcd-playersim.c lcd-player.c | 89 | LCDSRSC = lcd-playersim.c lcd-player.c lcd-player-charset.c font-player.c |
76 | endif | 90 | endif |
77 | FIRMSRCS = $(LCDSRSC) power.c sprintf.c id3.c usb.c \ | 91 | FIRMSRCS = $(LCDSRSC) id3.c usb.c mpeg.c powermgmt.c power.c |
78 | mpeg.c powermgmt.c font.c sysfont.c | ||
79 | 92 | ||
80 | APPS = main.c tree.c menu.c credits.c main_menu.c icons.c language.c \ | 93 | APPS = main.c tree.c menu.c credits.c main_menu.c icons.c language.c \ |
81 | playlist.c wps.c wps-display.c settings.c status.c \ | 94 | playlist.c wps.c wps-display.c settings.c status.c \ |
@@ -205,9 +218,15 @@ $(OBJDIR)/power.o: $(DRIVERS)/power.c | |||
205 | $(OBJDIR)/usb.o: $(FIRMWAREDIR)/usb.c | 218 | $(OBJDIR)/usb.o: $(FIRMWAREDIR)/usb.c |
206 | $(CC) $(APPCFLAGS) -c $< -o $@ | 219 | $(CC) $(APPCFLAGS) -c $< -o $@ |
207 | 220 | ||
221 | $(OBJDIR)/panic.o: $(FIRMWAREDIR)/panic.c | ||
222 | $(CC) $(APPCFLAGS) -c $< -o $@ | ||
223 | |||
208 | $(OBJDIR)/powermgmt.o: $(FIRMWAREDIR)/powermgmt.c | 224 | $(OBJDIR)/powermgmt.o: $(FIRMWAREDIR)/powermgmt.c |
209 | $(CC) $(APPCFLAGS) -c $< -o $@ | 225 | $(CC) $(APPCFLAGS) -c $< -o $@ |
210 | 226 | ||
227 | $(OBJDIR)/lcd-player-charset.o: $(DRIVERS)/lcd-player-charset.c | ||
228 | $(CC) $(CFLAGS) -c $< -o $@ | ||
229 | |||
211 | $(OBJDIR)/settings.o: $(APPDIR)/settings.c | 230 | $(OBJDIR)/settings.o: $(APPDIR)/settings.c |
212 | $(CC) $(APPCFLAGS) -c $< -o $@ | 231 | $(CC) $(APPCFLAGS) -c $< -o $@ |
213 | 232 | ||
@@ -251,6 +270,9 @@ $(OBJDIR)/strtok.o: $(COMMON)/strtok.c | |||
251 | $(OBJDIR)/stubs.o: ../common/stubs.c | 270 | $(OBJDIR)/stubs.o: ../common/stubs.c |
252 | $(CC) $(CFLAGS) -c $< -o $@ | 271 | $(CC) $(CFLAGS) -c $< -o $@ |
253 | 272 | ||
273 | $(OBJDIR)/font-player.o: ../common/font-player.c | ||
274 | $(CC) $(CFLAGS) -c $< -o $@ | ||
275 | |||
254 | $(OBJDIR)/sim_icons.o: ../common/sim_icons.c | 276 | $(OBJDIR)/sim_icons.o: ../common/sim_icons.c |
255 | $(CC) $(CFLAGS) -c $< -o $@ | 277 | $(CC) $(CFLAGS) -c $< -o $@ |
256 | 278 | ||
diff --git a/uisimulator/win32/lcd-win32.c b/uisimulator/win32/lcd-win32.c index 6ab7df8409..0ce68572d2 100644 --- a/uisimulator/win32/lcd-win32.c +++ b/uisimulator/win32/lcd-win32.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include "uisw32.h" | 22 | #include "uisw32.h" |
23 | #include "lcd.h" | 23 | #include "lcd.h" |
24 | 24 | ||
25 | extern unsigned char lcd_framebuffer[LCD_WIDTH][LCD_HEIGHT/8]; /* the display */ | 25 | unsigned char lcd_framebuffer[LCD_WIDTH][LCD_HEIGHT/8]; /* the display */ |
26 | char bitmap[LCD_HEIGHT][LCD_WIDTH]; /* the ui display */ | 26 | char bitmap[LCD_HEIGHT][LCD_WIDTH]; /* the ui display */ |
27 | 27 | ||
28 | BITMAPINFO2 bmi = | 28 | BITMAPINFO2 bmi = |
diff --git a/uisimulator/win32/panic-win32.c b/uisimulator/win32/panic-win32.c index ff644a7761..614510f3a8 100644 --- a/uisimulator/win32/panic-win32.c +++ b/uisimulator/win32/panic-win32.c | |||
@@ -40,4 +40,4 @@ void panicf( char *fmt, ...) | |||
40 | wsprintf( panic_buf, fmt, ap ); | 40 | wsprintf( panic_buf, fmt, ap ); |
41 | va_end( ap ); | 41 | va_end( ap ); |
42 | panic( panic_buf ); | 42 | panic( panic_buf ); |
43 | } \ No newline at end of file | 43 | } |
diff --git a/uisimulator/win32/sprintf.h b/uisimulator/win32/sprintf.h index ecbbc8a419..4e4bf25fc1 100644 --- a/uisimulator/win32/sprintf.h +++ b/uisimulator/win32/sprintf.h | |||
@@ -24,6 +24,8 @@ | |||
24 | #include <stdarg.h> | 24 | #include <stdarg.h> |
25 | 25 | ||
26 | int snprintf (char *buf, size_t size, const char *fmt, ...); | 26 | int snprintf (char *buf, size_t size, const char *fmt, ...); |
27 | #ifndef NOCYGWIN | ||
27 | int vsnprintf (char *buf, int size, const char *fmt, va_list ap); | 28 | int vsnprintf (char *buf, int size, const char *fmt, va_list ap); |
29 | #endif | ||
28 | 30 | ||
29 | #endif /* __SPRINTF_H__ */ | 31 | #endif /* __SPRINTF_H__ */ |
diff --git a/uisimulator/win32/uisw32.c b/uisimulator/win32/uisw32.c index 6722422a0d..b4747b138e 100644 --- a/uisimulator/win32/uisw32.c +++ b/uisimulator/win32/uisw32.c | |||
@@ -41,6 +41,7 @@ PBYTE lpKeys; | |||
41 | bool bActive; // window active? | 41 | bool bActive; // window active? |
42 | HANDLE hGUIThread; // thread for GUI | 42 | HANDLE hGUIThread; // thread for GUI |
43 | 43 | ||
44 | bool lcd_display_redraw=true; // Used for player simulator | ||
44 | char having_new_lcd=true; // Used for player simulator | 45 | char having_new_lcd=true; // Used for player simulator |
45 | 46 | ||
46 | // GUIWndProc | 47 | // GUIWndProc |