regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -24,12 +24,12 @@ OBJS = \
|
||||
bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
SETUPHDIR = \
|
||||
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
|
||||
STCDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
|
||||
$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_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 \
|
||||
-DWXUSINGDLL -DWXMAKINGDLL_STC $(CXXFLAGS)
|
||||
STCDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
|
||||
$(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__DEBUG_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 -DWXUSINGDLL -DWXMAKINGDLL_STC $(CXXFLAGS)
|
||||
STCDLL_OBJECTS = \
|
||||
$(OBJS)\stcdll_PlatWX.obj \
|
||||
$(OBJS)\stcdll_ScintillaWX.obj \
|
||||
@@ -80,11 +80,12 @@ STCDLL_OBJECTS = \
|
||||
$(OBJS)\stcdll_ViewStyle.obj \
|
||||
$(OBJS)\stcdll_WindowAccessor.obj \
|
||||
$(OBJS)\stcdll_XPM.obj
|
||||
STCLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
|
||||
$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_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 $(CXXFLAGS)
|
||||
STCLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
|
||||
$(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__DEBUG_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 $(CXXFLAGS)
|
||||
STCLIB_OBJECTS = \
|
||||
$(OBJS)\stclib_PlatWX.obj \
|
||||
$(OBJS)\stclib_ScintillaWX.obj \
|
||||
@@ -557,7 +558,7 @@ clean:
|
||||
|
||||
!if "$(SHARED)" == "1"
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_bcc$(VENDORTAG).dll: $(STCDLL_OBJECTS)
|
||||
ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
|
||||
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
|
||||
c0d32.obj $(STCDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
|
||||
|
|
||||
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc $@
|
||||
|
Reference in New Issue
Block a user