Only define WXUSINGDLL in DLL configurations when building wxscintilla.
WXUSINGDLL shouldn't be defined in static build configurations, this results in warnings and might explain errors in MinGW build. Closes #11966. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -180,8 +180,8 @@ WXEXPAT_OBJECTS = \
|
||||
WXSCINTILLA_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
|
||||
$(GCCFLAGS) -DHAVE_W32API_H -DNDEBUG -I..\..\src\stc\scintilla\include \
|
||||
-I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
|
||||
-I$(SETUPHDIR) -I..\..\include -DWXUSINGDLL -D__WXMSW__ $(__RTTIFLAG) \
|
||||
$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
|
||||
-I$(SETUPHDIR) -I..\..\include $(__wxscintilla_usingdll_p) -D__WXMSW__ \
|
||||
$(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
|
||||
WXSCINTILLA_OBJECTS = \
|
||||
$(OBJS)\wxscintilla_AutoComplete.o \
|
||||
$(OBJS)\wxscintilla_CallTip.o \
|
||||
@@ -1525,6 +1525,9 @@ endif
|
||||
ifeq ($(USE_GUI),1)
|
||||
__wxtiff___depname = $(LIBDIRNAME)\libwxtiff$(WXDEBUGFLAG).a
|
||||
endif
|
||||
ifeq ($(SHARED),1)
|
||||
__wxscintilla_usingdll_p = -DWXUSINGDLL
|
||||
endif
|
||||
ifeq ($(MONOLITHIC),0)
|
||||
EXTRALIBS_FOR_BASE =
|
||||
endif
|
||||
|
Reference in New Issue
Block a user