Rebake after MSLU and other changes

[wxWidgets.git] / contrib / build / animate / makefile.bcc

diff --git a/contrib/build/animate/makefile.bcc b/contrib/build/animate/makefile.bcc
index 6db4c93320af3dc1278fab61ad30bb513b3afbc1..ef6bd3864baf9e8c30a1f53477e6014726df9295 100644 (file)
--- a/contrib/build/animate/makefile.bcc
+++ b/contrib/build/animate/makefile.bcc
@@ -30,7 +30,7 @@ SETUPHDIR = \
 ANIMATEDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
        -I..\..\src\animate\..\..\..\include -I$(SETUPHDIR) \
        -I..\..\src\animate\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_ANIMATE -Hu \
        -H=$(OBJS)\wxprec_animatedll.csm $(CPPFLAGS) $(CXXFLAGS)
@@ -40,7 +40,7 @@ ANIMATEDLL_OBJECTS =  \
 ANIMATELIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
        -I..\..\src\animate\..\..\..\include -I$(SETUPHDIR) \
        -I..\..\src\animate\..\..\include -Hu -H=$(OBJS)\wxprec_animatelib.csm \
        $(CPPFLAGS) $(CXXFLAGS)
@@ -126,6 +126,9 @@ __THREAD_DEFINE_p_1 = -dwxNO_THREADS
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -d_UNICODE
 !endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
 !if "$(MONOLITHIC)" == "1"
 __WXLIB_MONO_p = \
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
@@ -205,6 +208,9 @@ __THREAD_DEFINE_p = -DwxNO_THREADS
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -D_UNICODE
 !endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
 
 
 all: $(OBJS)
@@ -248,7 +254,7 @@ $(OBJS)\animatedll_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp
        $(CXX) -q -c -P -o$@ $(ANIMATEDLL_CXXFLAGS) -H $**
 
 $(OBJS)\animatedll_version.res: ../../src/animate\..\..\..\src\msw\version.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..\..\src\animate\..\..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate_bcc$(VENDORTAG) $**
+       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..\..\src\animate\..\..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_animate_bcc$(VENDORTAG) $**
 
 $(OBJS)\animatedll_animate.obj: ../../src/animate\animate.cpp
        $(CXX) -q -c -P -o$@ $(ANIMATEDLL_CXXFLAGS) $**