X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0cf3e587a2ec542ba1eb6e03a84c54edefae1881..2ada746fb47bf68c9f2dab6399a6cd5510320984:/samples/widgets/makefile.bcc diff --git a/samples/widgets/makefile.bcc b/samples/widgets/makefile.bcc index 2e4f4b690b..42a094c78b 100644 --- a/samples/widgets/makefile.bcc +++ b/samples/widgets/makefile.bcc @@ -163,9 +163,15 @@ __THREAD_DEFINE_p = -DwxNO_THREADS !if "$(USE_THREADS)" == "0" __THREAD_DEFINE_p_1 = -dwxNO_THREADS !endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -D_UNICODE !endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0 +!endif !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p_1 = -d_UNICODE !endif @@ -261,7 +267,7 @@ clean: $(OBJS)\widgets.exe: $(WIDGETS_OBJECTS) $(OBJS)\widgets_sample.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| - c0w32.obj $(WIDGETS_OBJECTS),$@,, $(__WXLIB_XML_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_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) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\widgets_sample.res + c0w32.obj $(WIDGETS_OBJECTS),$@,, $(__WXLIB_XML_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_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) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\widgets_sample.res | $(OBJS)\widgets_bmpcombobox.obj: .\bmpcombobox.cpp