Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

if(){} and while(){} sometimes is not allowed for inlining (borland warning fix).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-03-31 16:37:48 +00:00
parent 2c9b313119
commit 999b96a4f9
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/build/stc/makefile.bcc
View File

@@ -34,7 +34,7 @@ STCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-I..\..\src\stc\..\..\..\include -I$(SETUPHDIR) \ -I..\..\src\stc\..\..\..\include -I$(SETUPHDIR) \
-I..\..\src\stc\..\..\include -I..\..\src\stc\scintilla\include \ -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) -DWXUSINGDLL -DWXMAKINGDLL_STC $(CPPFLAGS) $(CXXFLAGS)
STCDLL_OBJECTS = \ STCDLL_OBJECTS = \
$(OBJS)\stcdll_PlatWX.obj \ $(OBJS)\stcdll_PlatWX.obj \
@@ -114,8 +114,8 @@ STCLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
-I..\..\src\stc\..\..\..\include -I$(SETUPHDIR) \ -I..\..\src\stc\..\..\..\include -I$(SETUPHDIR) \
-I..\..\src\stc\..\..\include -I..\..\src\stc\scintilla\include \ -I..\..\src\stc\..\..\include -I..\..\src\stc\scintilla\include \
-I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS $(CPPFLAGS) \ -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS -w-8027 \
$(CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
STCLIB_OBJECTS = \ STCLIB_OBJECTS = \
$(OBJS)\stclib_PlatWX.obj \ $(OBJS)\stclib_PlatWX.obj \
$(OBJS)\stclib_ScintillaWX.obj \ $(OBJS)\stclib_ScintillaWX.obj \

3
contrib/build/stc/stc.bkl
View File

@@ -95,6 +95,7 @@
<define>SCI_LEXER</define> <define>SCI_LEXER</define>
<define>LINK_LEXERS</define> <define>LINK_LEXERS</define>
<sources>$(STC_SRC)</sources> <sources>$(STC_SRC)</sources>
<cppflags-borland>-w-8027</cppflags-borland>
</template> </template>
<dll id="stcdll" template="wx_contrib_dll,stc_base" cond="SHARED=='1'"> <dll id="stcdll" template="wx_contrib_dll,stc_base" cond="SHARED=='1'">
@@ -105,7 +106,7 @@
</dll> </dll>
<lib id="stclib" template="wx_contrib_lib,stc_base" cond="SHARED=='0'"/> <lib id="stclib" template="wx_contrib_lib,stc_base" cond="SHARED=='0'"/>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">stc=stclib+stcdll</set> <set var="MSVC6PRJ_MERGED_TARGETS" append="1">stc=stclib+stcdll</set>
</makefile> </makefile>