1 files changed, 20 insertions, 77 deletions

diff --git a/uisimulator/win32/makefile b/uisimulator/win32/makefile
index 11f16b3006..cbd2298f6e 100644
--- a/uisimulator/win32/makefile
+++ b/uisimulator/win32/makefile
@@ -27,93 +27,36 @@ APPDIR = ../../apps/
 RECDIR = $(APPDIR)recorder/
 RM = del
 
-#DISPLAY = -DHAVE_LCD_CHARCELLS
-DISPLAY = -DHAVE_LCD_BITMAP
+DISPLAY = -DHAVE_LCD_CHARCELLS
+#DISPLAY = -DHAVE_LCD_BITMAP
 
-#KEYPAD = -DHAVE_PLAYER_KEYPAD
-KEYPAD = -DHAVE_RECORDER_KEYPAD
+KEYPAD = -DHAVE_PLAYER_KEYPAD
+#KEYPAD = -DHAVE_RECORDER_KEYPAD
 
 CC = cl
-DEFINES = -DWIN32 -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR   \
-$(KEYPAD) $(DISPLAY)
-LDFLAGS = /ouisw32.exe /link -subsystem:windows
+LINK = link
+DEFINES = -DWIN32 -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR $(KEYPAD) $(DISPLAY)
+LDFLAGS = /OUT:uisw32.exe /SUBSYSTEM:windows
 INCLUDES = -I$(FIRMWAREDIR) -I$(DRIVERS) -I$(COMMON) -I$(SIMDIR) -I$(APPDIR) -I$(RECDIR)
-LIBS = gdi32.lib user32.lib
+LIBS = /DEFAULTLIB:gdi32.lib /DEFAULTLIB:user32.lib
 
+CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) /MD /Fd"Release/vc70.pdb" /c
 
-CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) /MD /Fd"Release/vc70.pdb"
-
-SRCS = lcd-win32.c uisw32.c lcd.c button.c tree.c main.c \
-  chartables.c kernel.c uisw32.res dir-win32.c main_menu.c \
-  play.c debug-win32.c menu.c credits.c sound_menu.c mpeg.c \
-  id3.c settings.c sprintf.c thread-win32.c playlist.c string-win32.c
+SRCS = *.c \
+        $(DRIVERS)/lcd.c \
+        $(APPDIR)*.c \
+        $(FIRMWAREDIR)/chartables.c $(FIRMWAREDIR)/id3.c $(FIRMWAREDIR)/settings.c $(FIRMWAREDIR)/backlight.c \
+        $(COMMON)/sprintf.c $(COMMON)/strtok.c
 
 !IF ("$(DISPLAY)" == "-DHAVE_LCD_BITMAP")
-SRCS = $(SRCS) tetris.c boxes.c bounce.c sokoban.c icons.c bmp.c
+SRCS = $(SRCS) $(RECDIR)*.c
 !ENDIF
 
-OBJS = $(SRCS:.c=.obj)
-
-uisw32.exe: $(OBJS)
- $(CC) $(CFLAGS) $(LIBS) $(LDFLAGS) $(OBJS)
- 
-lcd.obj: $(DRIVERS)/lcd.c
- $(CC) $(CFLAGS) -c $(DRIVERS)/lcd.c -olcd.obj
- 
-chartables.obj: $(FIRMWAREDIR)/chartables.c
- $(CC) $(CFLAGS) -c $(FIRMWAREDIR)/chartables.c -ochartables.obj
-
-tetris.obj: ../../apps/recorder/tetris.c
- $(CC) $(CFLAGS) -c ../../apps/recorder/tetris.c -otetris.obj
-
-tree.obj: ../../apps/tree.c
- $(CC) $(CFLAGS) -c ../../apps/tree.c -otree.obj
-
-main.obj: ../../apps/main.c
- $(CC) $(CFLAGS) -c ../../apps/main.c -omain.obj
- 
-main_menu.obj: ../../apps/main_menu.c
- $(CC) $(CFLAGS) -c ../../apps/main_menu.c -omain_menu.obj
-
-play.obj: ../../apps/play.c
- $(CC) $(CFLAGS) -c ../../apps/play.c -oplay.obj
-
-bmp.obj: ../../apps/recorder/bmp.c
- $(CC) $(CFLAGS) -c ../../apps/recorder/bmp.c -obmp.obj
-
-bounce.obj: ../../apps/recorder/bounce.c
- $(CC) $(CFLAGS) -c ../../apps/recorder/bounce.c -obounce.obj
-
-sokoban.obj: ../../apps/recorder/sokoban.c
- $(CC) $(CFLAGS) -c ../../apps/recorder/sokoban.c -osokoban.obj
+OBJS = *.obj uisw32.res
 
-boxes.obj: ../../apps/recorder/boxes.c
- $(CC) $(CFLAGS) -c ../../apps/recorder/boxes.c -oboxes.obj
-
-menu.obj: ../../apps/menu.c
- $(CC) $(CFLAGS) -c ../../apps/menu.c -omenu.obj
-
-credits.obj: ../../apps/credits.c
- $(CC) $(CFLAGS) -c ../../apps/credits.c -ocredits.obj
-
-icons.obj: ../../apps/recorder/icons.c
- $(CC) $(CFLAGS) -c ../../apps/recorder/icons.c -oicons.obj
-
-sound_menu.obj: ../../apps/sound_menu.c
- $(CC) $(CFLAGS) -c ../../apps/sound_menu.c -osound_menu.obj
-
-id3.obj: $(FIRMWAREDIR)/id3.c
- $(CC) $(CFLAGS) -c $(FIRMWAREDIR)/id3.c -oid3.obj
-
-settings.obj: $(FIRMWAREDIR)/settings.c
- $(CC) $(CFLAGS) -c $(FIRMWAREDIR)/settings.c -osettings.obj
-
-sprintf.obj: $(FIRMWAREDIR)/common/sprintf.c
- $(CC) $(CFLAGS) -c $(FIRMWAREDIR)/common/sprintf.c -osprintf.obj
-
-playlist.obj: ../../apps/playlist.c
- $(CC) $(CFLAGS) -c ../../apps/playlist.c -oplaylist.obj
+uisw32.exe: $(SRCS:.c=.obj)
+ $(CC) $(CFLAGS) $(SRCS)
+ $(LINK) $(LIBS) $(LDFLAGS) $(OBJS)
 
 clean:
- $(RM) *.obj
-
+ $(RM) *.obj
\ No newline at end of file