X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d90d6ea7a007332aa75779f90b30ed39872e494..5cf1cb1006d6b5762d96c07ee3892883607460c7:/contrib/samples/deprecated/proplist/makefile.bcc?ds=sidebyside diff --git a/contrib/samples/deprecated/proplist/makefile.bcc b/contrib/samples/deprecated/proplist/makefile.bcc index 640eb32de0..9e9805f6f7 100644 --- a/contrib/samples/deprecated/proplist/makefile.bcc +++ b/contrib/samples/deprecated/proplist/makefile.bcc @@ -21,7 +21,7 @@ BCCDIR = $(MAKEDIR)\.. ### Variables: ### -WX_RELEASE_NODOT = 26 +WX_RELEASE_NODOT = 27 OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) LIBDIRNAME = .\..\..\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG) @@ -30,9 +30,9 @@ SETUPHDIR = \ PROPLIST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \ - -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\..\samples -DNOPCH \ - -I.\..\..\..\include $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I.\..\..\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \ + -I.\..\..\..\..\samples -DNOPCH -I.\..\..\..\include $(CPPFLAGS) $(CXXFLAGS) PROPLIST_OBJECTS = \ $(OBJS)\proplist_proplist.obj @@ -143,6 +143,12 @@ __UNICODE_DEFINE_p = -D_UNICODE !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p_1 = -d_UNICODE !endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1 +!endif !if "$(SHARED)" == "1" __DLLFLAG_p = -DWXUSINGDLL !endif @@ -215,5 +221,5 @@ $(OBJS)\proplist_proplist.obj: .\proplist.cpp $(CXX) -q -c -P -o$@ $(PROPLIST_CXXFLAGS) $** $(OBJS)\proplist_proplist.res: .\proplist.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\..\..\samples -dNOPCH -i.\..\..\..\include $** + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i.\..\..\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\..\..\samples -dNOPCH -i.\..\..\..\include $**