X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/444833b32388f4901ab5bc092b210b28230bebbd..747d7d7c159a57015d7aa9d844f834b78f613272:/samples/richtext/makefile.wat diff --git a/samples/richtext/makefile.wat b/samples/richtext/makefile.wat index 3c918a7a1c..d6c3b0908b 100644 --- a/samples/richtext/makefile.wat +++ b/samples/richtext/makefile.wat @@ -215,6 +215,9 @@ __THREAD_DEFINE_p = __THREAD_DEFINE_p = -dwxNO_THREADS !endif __UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif !ifeq UNICODE 1 __UNICODE_DEFINE_p = -d_UNICODE !endif @@ -270,7 +273,7 @@ $(OBJS)\richtext.exe : $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample.res @%append $(OBJS)\richtext.lbc option caseexact @%append $(OBJS)\richtext.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' @for %i in ($(RICHTEXT_OBJECTS)) do @%append $(OBJS)\richtext.lbc file %i - @for %i in ( $(__WXLIB_RICHTEXT_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append $(OBJS)\richtext.lbc library %i + @for %i in ( $(__WXLIB_RICHTEXT_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\richtext.lbc library %i @%append $(OBJS)\richtext.lbc option resource=$(OBJS)\richtext_sample.res @for %i in () do @%append $(OBJS)\richtext.lbc option stack=%i wlink @$(OBJS)\richtext.lbc