1 files changed, 40 insertions, 16 deletions

diff --git a/uisimulator/win32/Makefile.vc6 b/uisimulator/win32/Makefile.vc6
index 43e6990d38..e9873c22eb 100644
--- a/uisimulator/win32/Makefile.vc6
+++ b/uisimulator/win32/Makefile.vc6
@@ -18,18 +18,21 @@
 ############################################################################
 
 
-#CHANGE THIS FIELD TO SPECIFY RECORDER OR PLAYER
+#CHANGE THIS FIELD TO SPECIFY RECORDER OR PLAYER (Player does not work very well atm)
 TARGET = RECORDER
 
 FIRMWAREDIR = ../../firmware
 DRIVERS = $(FIRMWAREDIR)/drivers
 COMMON = $(FIRMWAREDIR)/common
 APPSCOMMON = ../common
+TOOLSDIR = ..\..\tools
 SIMDIR = ../win32/
 APPDIR = ../../apps/
 PLAYERDIR = $(APPDIR)player/
 RECDIR = $(APPDIR)recorder/
 RM = del
+LANGUAGE = english
+FONT = $(FIRMWAREDIR)/fonts/clR6x8.bdf
 
 !IF ("$(TARGET)" == "RECORDER")
 DISPLAY = -DHAVE_LCD_BITMAP
@@ -44,34 +47,55 @@ MODEL_SPECIFIC_DIR = $(PLAYERDIR)
 CC = cl
 RC = rc
 LINK = link
-DEFINES = -DWIN32 -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR $(KEYPAD) $(DISPLAY) -DAPPSVERSION=\"WIN32SIM\"
+DEFINES = $(DEFINES) -DWIN32 -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR $(KEYPAD) $(DISPLAY) -DAPPSVERSION=\"WIN32SIM\"
 LDFLAGS = /OUT:uisw32.exe /SUBSYSTEM:windows /NOLOGO /MACHINE:IX86 kernel32.lib user32.lib gdi32.lib
 INCLUDES = -I$(FIRMWAREDIR) -I$(DRIVERS) -I$(COMMON) -I$(APPSCOMMON) -I$(SIMDIR) -I$(APPDIR) -I$(MODEL_SPECIFIC_DIR)
 LIBS = /DEFAULTLIB:gdi32.lib /DEFAULTLIB:user32.lib
 
 CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) /MD /Fd"Release/vc70.pdb" /c
 
-SRCS = *.c \
-        $(DRIVERS)/lcd.c $(DRIVERS)/power.c \
+SRCS =  *.c \
+        $(DRIVERS)/power.c \
         $(APPDIR)*.c \
-    $(PLAYERDIR)*.c \
-        $(APPSCOMMON)/*.c \
-        $(FIRMWAREDIR)/chartables.c $(FIRMWAREDIR)/id3.c $(FIRMWAREDIR)/usb.c $(FIRMWAREDIR)/mpeg.c \
-        $(FIRMWAREDIR)/powermgmt.c \
+        $(PLAYERDIR)*.c \
+        $(APPSCOMMON)/lcd-common.c $(APPSCOMMON)/mpegplay.c $(APPSCOMMON)/sim_icons.c $(APPSCOMMON)/stubs.c \
+        $(FIRMWAREDIR)/mpeg.c $(FIRMWAREDIR)/id3.c $(FIRMWAREDIR)/usb.c $(FIRMWAREDIR)/mpeg.c $(FIRMWAREDIR)/font.c $(FIRMWAREDIR)/powermgmt.c \
         $(COMMON)/sprintf.c $(COMMON)/strtok.c
 
 !IF ("$(DISPLAY)" == "-DHAVE_LCD_BITMAP")
-SRCS = $(SRCS) $(RECDIR)*.c
+SRCS = $(SRCS) $(RECDIR)*.c $(DRIVERS)/lcd-recorder.c
+!ELSE
+SRCS = $(SRCS) $(APPSCOMMON)/lcd-playersim.c
 !ENDIF
 
-OBJS = *.obj uisw32.res
+OBJS = lang.obj $(SRCS:.c=.obj) uisw32.res
+
+all : uisw32.exe
+
+$(APPDIR)credits.raw:
+  perl $(APPDIR)credits.pl < ../../docs/CREDITS > $(APPDIR)credits.raw
+
+kernel.obj:
+  $(CC) $(CFLAGS) *.c
+
+sysfont.c: $(FONT)
+  $(TOOLSDIR)\convbdf -c -o sysfont.c $(FONT)
 
-uisw32.exe: $(SRCS:.c=.obj)
- $(CC) $(CFLAGS) $(SRCS)
+sysfont.obj: sysfont.c
+  $(CC) $(CFLAGS) sysfont.c
+
+uisw32.exe: $(APPDIR)credits.raw $(OBJS) sysfont.obj kernel.obj
+ $(LINK) $(LIBS) $(LDFLAGS) *.obj uisw32.res
+
+uisw32.res:
  $(RC) /r uisw32.rc
- $(LINK) $(LIBS) $(LDFLAGS) $(OBJS)
+
+build.lang: $(APPDIR)/lang/$(LANGUAGE).lang
+        perl $(TOOLSDIR)/uplang $(APPDIR)/lang/english.lang $(APPDIR)/lang/$(LANGUAGE).lang > build.lang
+
+lang.obj: build.lang
+        perl -s $(TOOLSDIR)/genlang -p=lang build.lang
+        $(CC) $(CFLAGS) -c lang.c -o lang.obj
 
 clean:
- $(RM) *.obj
- $(RM) uisw32.res
- $(RM) uisw32.exe
+ $(RM) *.obj lang.c lang.h ..\..\apps\credits.raw lang.build uisw32.res uisw32.exe