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

allow stc to build with universal headers

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@23931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2003-09-26 14:52:46 +00:00
parent 99eda4214e
commit fe42ee5dac
2 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
contrib/src/stc/makefile.b32
View File

@@ -17,10 +17,27 @@ SCINTILLA=.\scintilla
S=$(SCINTILLA)\src S=$(SCINTILLA)\src
STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(SCINTILLA)/include -I$(S)
LIBTARGET=$(WXDIR)\lib\stc.lib LIBTARGET=$(WXDIR)\lib\stc.lib
!if "$(WXUSINGUNIV)" == "1"
USE_UNIV="UNIV"
CFG=$(CFG)v
WXLIBNAME=$(WXLIBNAME)v
ARCHINCDIR=$(ARCHINCDIR)v
SETUPSRCDIR=$(WXDIR)\include\wx\univ
PORT=__WXUNIVERSAL__
STCEXTRACPPFLAGS=-D__WX__ -D__WXUNIVERSAL__ -DSCI_LEXER -DLINK_LEXERS -I$(SCINTILLA)/include -I$(S)
STCCFG = stcu.cfg
!else
USE_UNIV=""
PORT=__WXMSW__
SETUPSRCDIR=$(WXDIR)\include\wx\msw
STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(SCINTILLA)/include -I$(S)
STCCFG = stc.cfg
!endif
OBJECTS = \ OBJECTS = \
AutoComplete.obj \ AutoComplete.obj \
CallTip.obj \ CallTip.obj \
@@ -77,7 +94,7 @@ OBJECTS = \
stc.obj \ stc.obj \
STCCFG = stc.cfg
STCCPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(STCCFG) STCCPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(STCCFG)
default: $(STCCFG) $(LIBTARGET) default: $(STCCFG) $(LIBTARGET)

21
src/stc/makefile.b32
View File

@@ -17,10 +17,27 @@ SCINTILLA=.\scintilla
S=$(SCINTILLA)\src S=$(SCINTILLA)\src
STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(SCINTILLA)/include -I$(S)
LIBTARGET=$(WXDIR)\lib\stc.lib LIBTARGET=$(WXDIR)\lib\stc.lib
!if "$(WXUSINGUNIV)" == "1"
USE_UNIV="UNIV"
CFG=$(CFG)v
WXLIBNAME=$(WXLIBNAME)v
ARCHINCDIR=$(ARCHINCDIR)v
SETUPSRCDIR=$(WXDIR)\include\wx\univ
PORT=__WXUNIVERSAL__
STCEXTRACPPFLAGS=-D__WX__ -D__WXUNIVERSAL__ -DSCI_LEXER -DLINK_LEXERS -I$(SCINTILLA)/include -I$(S)
STCCFG = stcu.cfg
!else
USE_UNIV=""
PORT=__WXMSW__
SETUPSRCDIR=$(WXDIR)\include\wx\msw
STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(SCINTILLA)/include -I$(S)
STCCFG = stc.cfg
!endif
OBJECTS = \ OBJECTS = \
AutoComplete.obj \ AutoComplete.obj \
CallTip.obj \ CallTip.obj \
@@ -77,7 +94,7 @@ OBJECTS = \
stc.obj \ stc.obj \
STCCFG = stc.cfg
STCCPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(STCCFG) STCCPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(STCCFG)
default: $(STCCFG) $(LIBTARGET) default: $(STCCFG) $(LIBTARGET)