if(){} and while(){} sometimes is not allowed for inlining (borland warning fix).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
2c9b313119
commit
999b96a4f9
@ -34,7 +34,7 @@ STCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
|
||||
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
|
||||
-I..\..\src\stc\..\..\..\include -I$(SETUPHDIR) \
|
||||
-I..\..\src\stc\..\..\include -I..\..\src\stc\scintilla\include \
|
||||
-I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
|
||||
-I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS -w-8027 \
|
||||
-DWXUSINGDLL -DWXMAKINGDLL_STC $(CPPFLAGS) $(CXXFLAGS)
|
||||
STCDLL_OBJECTS = \
|
||||
$(OBJS)\stcdll_PlatWX.obj \
|
||||
@ -114,8 +114,8 @@ STCLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
|
||||
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
|
||||
-I..\..\src\stc\..\..\..\include -I$(SETUPHDIR) \
|
||||
-I..\..\src\stc\..\..\include -I..\..\src\stc\scintilla\include \
|
||||
-I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS $(CPPFLAGS) \
|
||||
$(CXXFLAGS)
|
||||
-I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS -w-8027 \
|
||||
$(CPPFLAGS) $(CXXFLAGS)
|
||||
STCLIB_OBJECTS = \
|
||||
$(OBJS)\stclib_PlatWX.obj \
|
||||
$(OBJS)\stclib_ScintillaWX.obj \
|
||||
|
@ -95,6 +95,7 @@
|
||||
<define>SCI_LEXER</define>
|
||||
<define>LINK_LEXERS</define>
|
||||
<sources>$(STC_SRC)</sources>
|
||||
<cppflags-borland>-w-8027</cppflags-borland>
|
||||
</template>
|
||||
|
||||
<dll id="stcdll" template="wx_contrib_dll,stc_base" cond="SHARED=='1'">
|
||||
@ -105,7 +106,7 @@
|
||||
</dll>
|
||||
|
||||
<lib id="stclib" template="wx_contrib_lib,stc_base" cond="SHARED=='0'"/>
|
||||
|
||||
|
||||
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">stc=stclib+stcdll</set>
|
||||
|
||||
</makefile>
|
||||
|
Loading…
Reference in New Issue
Block a user