Updated makefiles etc. for 2.5.1

[wxWidgets.git] / samples / keyboard / makefile.wat

diff --git a/samples/keyboard/makefile.wat b/samples/keyboard/makefile.wat
index 761b3f5d3a912a6f9b879b2fec4368d08de2ddd8..2327b11f4ba20b6060c7c7c6d108c95a0ae368a6 100644 (file)
--- a/samples/keyboard/makefile.wat
+++ b/samples/keyboard/makefile.wat
@@ -137,7 +137,7 @@ __RUNTIME_LIBS_5 =
 !endif
 __UNICODE_DEFINE_p =
 !ifeq UNICODE 1
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -d_UNICODE
 !endif
 __WXLIB_BASE_p =
 !ifeq MONOLITHIC 0
@@ -184,7 +184,7 @@ $(OBJS)\keyboard_keyboard.obj :  .AUTODEPEND .\keyboard.cpp
        $(CXX) -zq -fo=$^@ $(KEYBOARD_CXXFLAGS) $<
 
 $(OBJS)\keyboard_keyboard.res :  .AUTODEPEND .\keyboard.rc
-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<
+       wrc -q -ad -bt=nt -r -fo=$^@  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<
 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -200,6 +200,6 @@ $(OBJS)\keyboard.exe :  $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard.res
        @%append $(OBJS)\keyboard.lbc option caseexact
        @%append $(OBJS)\keyboard.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(KEYBOARD_OBJECTS)) do @%append $(OBJS)\keyboard.lbc file %i
-       @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\keyboard.lbc library %i
+       @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\keyboard.lbc library %i
        @%append $(OBJS)\keyboard.lbc option resource=$(OBJS)\keyboard_keyboard.res
        wlink @$(OBJS)\keyboard.lbc