Rebake after MSLU and other changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -30,7 +30,7 @@ SETUPHDIR = \
|
||||
PLOTDLL_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\plot\..\..\..\include -I$(SETUPHDIR) \
|
||||
-I..\..\src\plot\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_PLOT -Hu \
|
||||
-H=$(OBJS)\wxprec_plotdll.csm $(CPPFLAGS) $(CXXFLAGS)
|
||||
@@ -40,7 +40,7 @@ PLOTDLL_OBJECTS = \
|
||||
PLOTLIB_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\plot\..\..\..\include -I$(SETUPHDIR) \
|
||||
-I..\..\src\plot\..\..\include -Hu -H=$(OBJS)\wxprec_plotlib.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)\plotdll_dummy.obj: ../../src/plot\..\..\..\src\msw\dummy.cpp
|
||||
$(CXX) -q -c -P -o$@ $(PLOTDLL_CXXFLAGS) -H $**
|
||||
|
||||
$(OBJS)\plotdll_version.res: ../../src/plot\..\..\..\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\plot\..\..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_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\plot\..\..\..\include -i$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_bcc$(VENDORTAG) $**
|
||||
|
||||
$(OBJS)\plotdll_plot.obj: ../../src/plot\plot.cpp
|
||||
$(CXX) -q -c -P -o$@ $(PLOTDLL_CXXFLAGS) $**
|
||||
|
Reference in New Issue
Block a user