X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/75a0a7b7de0cb3d5645ec014b60431b5fa2c7095..f0b1ccde63c1acd9ca18847f758603f39f22cf4b:/samples/tab/makefile.wat diff --git a/samples/tab/makefile.wat b/samples/tab/makefile.wat index 583954392e..13b1a62086 100644 --- a/samples/tab/makefile.wat +++ b/samples/tab/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)\tab_tab.obj : .AUTODEPEND .\tab.cpp $(CXX) -zq -fo=$^@ $(TAB_CXXFLAGS) $< $(OBJS)\tab_tab.res : .AUTODEPEND .\tab.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)\tab.exe : $(TAB_OBJECTS) $(OBJS)\tab_tab.res @%append $(OBJS)\tab.lbc option caseexact @%append $(OBJS)\tab.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' @for %i in ($(TAB_OBJECTS)) do @%append $(OBJS)\tab.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)\tab.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)\tab.lbc library %i @%append $(OBJS)\tab.lbc option resource=$(OBJS)\tab_tab.res wlink @$(OBJS)\tab.lbc