X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d90d6ea7a007332aa75779f90b30ed39872e494..9d309aad760620724b39063dde671342a32e5b8d:/contrib/samples/gizmos/dynsash_switch/makefile.bcc diff --git a/contrib/samples/gizmos/dynsash_switch/makefile.bcc b/contrib/samples/gizmos/dynsash_switch/makefile.bcc index b935c771fe..f1fefbe97d 100644 --- a/contrib/samples/gizmos/dynsash_switch/makefile.bcc +++ b/contrib/samples/gizmos/dynsash_switch/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) @@ -31,7 +31,7 @@ DYNSASH_SWITCH_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) \ + $(__MSLU_DEFINE_p) -I.\..\..\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \ -I.\..\..\..\..\samples -DNOPCH -I.\..\..\..\include $(CPPFLAGS) $(CXXFLAGS) DYNSASH_SWITCH_OBJECTS = \ $(OBJS)\dynsash_switch_dynsash_switch.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 @@ -212,7 +218,7 @@ $(OBJS)\dynsash_switch.exe: $(DYNSASH_SWITCH_OBJECTS) $(OBJS)\dynsash_switch_sa | $(OBJS)\dynsash_switch_sample.res: .\..\..\..\..\samples\sample.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 $** + 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 $** $(OBJS)\dynsash_switch_dynsash_switch.obj: .\dynsash_switch.cpp $(CXX) -q -c -P -o$@ $(DYNSASH_SWITCH_CXXFLAGS) $**