regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -21,7 +21,8 @@ STCDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
|
||||
$(__UNICODE_DEFINE_p) -I..\..\src\stc\..\..\..\include -I$(SETUPHDIR) -Wall \
|
||||
-I..\..\src\stc\..\..\include -I..\..\src\stc\scintilla\include \
|
||||
-I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
|
||||
-DWXUSINGDLL -DWXMAKINGDLL_STC $(CXXFLAGS)
|
||||
-DWXUSINGDLL -DWXMAKINGDLL_STC $(CXXFLAGS) $(__EXCEPTIONSFLAG) \
|
||||
$(__EXCEPTIONSFLAG_0)
|
||||
STCDLL_OBJECTS = \
|
||||
$(OBJS)\stcdll_PlatWX.o \
|
||||
$(OBJS)\stcdll_ScintillaWX.o \
|
||||
@@ -80,7 +81,8 @@ STCLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
|
||||
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
|
||||
$(__UNICODE_DEFINE_p) -I..\..\src\stc\..\..\..\include -I$(SETUPHDIR) -Wall \
|
||||
-I..\..\src\stc\..\..\include -I..\..\src\stc\scintilla\include \
|
||||
-I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS $(CXXFLAGS)
|
||||
-I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS $(CXXFLAGS) \
|
||||
$(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0)
|
||||
STCLIB_OBJECTS = \
|
||||
$(OBJS)\stclib_PlatWX.o \
|
||||
$(OBJS)\stclib_ScintillaWX.o \
|
||||
@@ -200,6 +202,18 @@ endif
|
||||
ifeq ($(DEBUG_FLAG),1)
|
||||
__DEBUG_DEFINE_p = -D__WXDEBUG__
|
||||
endif
|
||||
ifeq ($(USE_EXCEPTIONS),0)
|
||||
__EXCEPTIONSFLAG = -fno-rtti
|
||||
endif
|
||||
ifeq ($(USE_EXCEPTIONS),1)
|
||||
__EXCEPTIONSFLAG =
|
||||
endif
|
||||
ifeq ($(USE_EXCEPTIONS),0)
|
||||
__EXCEPTIONSFLAG_0 = -fno-exceptions
|
||||
endif
|
||||
ifeq ($(USE_EXCEPTIONS),1)
|
||||
__EXCEPTIONSFLAG_0 =
|
||||
endif
|
||||
ifeq ($(USE_GUI),1)
|
||||
__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
|
||||
endif
|
||||
|
Reference in New Issue
Block a user