X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/75a0a7b7de0cb3d5645ec014b60431b5fa2c7095..3527f29c8769e09d796c547c0c309f8b86407012:/contrib/build/stc/makefile.vc diff --git a/contrib/build/stc/makefile.vc b/contrib/build/stc/makefile.vc index 0f73fa144d..6d3ca3490b 100644 --- a/contrib/build/stc/makefile.vc +++ b/contrib/build/stc/makefile.vc @@ -17,13 +17,15 @@ OBJS = \ SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) STCDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_2) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /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) + $(__DEBUGINFO) \ + /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).pdb \ + $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + /I..\..\src\stc\..\..\..\include /I$(SETUPHDIR) /W4 \ + /I..\..\src\stc\..\..\include /I..\..\src\stc\scintilla\include \ + /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \ + /DWXUSINGDLL /DWXMAKINGDLL_STC $(CXXFLAGS) $(__EXCEPTIONSFLAG_0) \ + $(__EXCEPTIONSFLAG) STCDLL_OBJECTS = \ $(OBJS)\stcdll_PlatWX.obj \ $(OBJS)\stcdll_ScintillaWX.obj \ @@ -55,14 +57,18 @@ STCDLL_OBJECTS = \ $(OBJS)\stcdll_LexLisp.obj \ $(OBJS)\stcdll_LexLout.obj \ $(OBJS)\stcdll_LexLua.obj \ + $(OBJS)\stcdll_LexMMIXAL.obj \ $(OBJS)\stcdll_LexMatlab.obj \ + $(OBJS)\stcdll_LexNsis.obj \ $(OBJS)\stcdll_LexOthers.obj \ $(OBJS)\stcdll_LexPOV.obj \ + $(OBJS)\stcdll_LexPS.obj \ $(OBJS)\stcdll_LexPascal.obj \ $(OBJS)\stcdll_LexPerl.obj \ $(OBJS)\stcdll_LexPython.obj \ $(OBJS)\stcdll_LexRuby.obj \ $(OBJS)\stcdll_LexSQL.obj \ + $(OBJS)\stcdll_LexScriptol.obj \ $(OBJS)\stcdll_LexVB.obj \ $(OBJS)\stcdll_LineMarker.obj \ $(OBJS)\stcdll_PropSet.obj \ @@ -74,14 +80,15 @@ STCDLL_OBJECTS = \ $(OBJS)\stcdll_ViewStyle.obj \ $(OBJS)\stcdll_WindowAccessor.obj \ $(OBJS)\stcdll_XPM.obj -STCLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_11) /DWIN32 \ - $(__DEBUGINFO_2) \ +STCLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_14) /DWIN32 \ + $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.pdb \ - $(____DEBUGRUNTIME_10_p) $(__OPTIMIZEFLAG) /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) + $(____DEBUGRUNTIME_13_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ + /I..\..\src\stc\..\..\..\include /I$(SETUPHDIR) /W4 \ + /I..\..\src\stc\..\..\include /I..\..\src\stc\scintilla\include \ + /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS $(CXXFLAGS) \ + $(__EXCEPTIONSFLAG_0) $(__EXCEPTIONSFLAG) STCLIB_OBJECTS = \ $(OBJS)\stclib_PlatWX.obj \ $(OBJS)\stclib_ScintillaWX.obj \ @@ -113,14 +120,18 @@ STCLIB_OBJECTS = \ $(OBJS)\stclib_LexLisp.obj \ $(OBJS)\stclib_LexLout.obj \ $(OBJS)\stclib_LexLua.obj \ + $(OBJS)\stclib_LexMMIXAL.obj \ $(OBJS)\stclib_LexMatlab.obj \ + $(OBJS)\stclib_LexNsis.obj \ $(OBJS)\stclib_LexOthers.obj \ $(OBJS)\stclib_LexPOV.obj \ + $(OBJS)\stclib_LexPS.obj \ $(OBJS)\stclib_LexPascal.obj \ $(OBJS)\stclib_LexPerl.obj \ $(OBJS)\stclib_LexPython.obj \ $(OBJS)\stclib_LexRuby.obj \ $(OBJS)\stclib_LexSQL.obj \ + $(OBJS)\stclib_LexScriptol.obj \ $(OBJS)\stclib_LexVB.obj \ $(OBJS)\stclib_LineMarker.obj \ $(OBJS)\stclib_PropSet.obj \ @@ -169,7 +180,7 @@ WXUNICODEFLAG = u WXUNIVNAME = univ !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = d +__DEBUGINFO = /Zi !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" __DEBUGINFO = @@ -178,7 +189,7 @@ __DEBUGINFO = __DEBUGINFO = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO = d +__DEBUGINFO = /Zi !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_1 = /DEBUG @@ -193,7 +204,7 @@ __DEBUGINFO_1 = __DEBUGINFO_1 = /DEBUG !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_2 = /Zi +__DEBUGINFO_2 = d !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_2 = @@ -202,16 +213,16 @@ __DEBUGINFO_2 = __DEBUGINFO_2 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_2 = /Zi +__DEBUGINFO_2 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_11 = +__DEBUGRUNTIME_14 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_11 = d +__DEBUGRUNTIME_14 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_11 = $(__DEBUGINFO) +__DEBUGRUNTIME_14 = $(__DEBUGINFO_2) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" __DEBUGRUNTIME_3 = @@ -220,7 +231,7 @@ __DEBUGRUNTIME_3 = __DEBUGRUNTIME_3 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = $(__DEBUGINFO) +__DEBUGRUNTIME_3 = $(__DEBUGINFO_2) !endif !if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" __DEBUG_DEFINE_p = /D__WXDEBUG__ @@ -228,6 +239,18 @@ __DEBUG_DEFINE_p = /D__WXDEBUG__ !if "$(DEBUG_FLAG)" == "1" __DEBUG_DEFINE_p = /D__WXDEBUG__ !endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG = /GX +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_0 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_0 = /GR +!endif !if "$(USE_GUI)" == "1" __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib !endif @@ -237,6 +260,12 @@ __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !if "$(USE_GUI)" == "1" __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG = /Od !endif @@ -250,7 +279,7 @@ __RUNTIME_LIBS = D __RUNTIME_LIBS = T !endif !if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 +__UNICODE_DEFINE_p = /D_UNICODE !endif !if "$(MSLU)" == "1" __UNICOWS_LIB_p = unicows.lib @@ -282,13 +311,13 @@ ____DEBUGINFO = ____DEBUGINFO = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_10_p = +____DEBUGRUNTIME_13_p = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_10_p = /D_DEBUG +____DEBUGRUNTIME_13_p = /D_DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_10_p = $(____DEBUGINFO) +____DEBUGRUNTIME_13_p = $(____DEBUGINFO) !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" ____DEBUGRUNTIME_2_p = @@ -301,7 +330,7 @@ ____DEBUGRUNTIME_2_p = $(____DEBUGINFO) !endif !if "$(SHARED)" == "1" __stcdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).dll + $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).dll !endif !if "$(SHARED)" == "0" __stclib___depname = \ @@ -398,15 +427,24 @@ $(OBJS)\stcdll_LexLout.obj: ../../src/stc\scintilla\src\LexLout.cxx $(OBJS)\stcdll_LexLua.obj: ../../src/stc\scintilla\src\LexLua.cxx $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** +$(OBJS)\stcdll_LexMMIXAL.obj: ../../src/stc\scintilla\src\LexMMIXAL.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + $(OBJS)\stcdll_LexMatlab.obj: ../../src/stc\scintilla\src\LexMatlab.cxx $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** +$(OBJS)\stcdll_LexNsis.obj: ../../src/stc\scintilla\src\LexNsis.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + $(OBJS)\stcdll_LexOthers.obj: ../../src/stc\scintilla\src\LexOthers.cxx $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** $(OBJS)\stcdll_LexPOV.obj: ../../src/stc\scintilla\src\LexPOV.cxx $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** +$(OBJS)\stcdll_LexPS.obj: ../../src/stc\scintilla\src\LexPS.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + $(OBJS)\stcdll_LexPascal.obj: ../../src/stc\scintilla\src\LexPascal.cxx $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** @@ -422,6 +460,9 @@ $(OBJS)\stcdll_LexRuby.obj: ../../src/stc\scintilla\src\LexRuby.cxx $(OBJS)\stcdll_LexSQL.obj: ../../src/stc\scintilla\src\LexSQL.cxx $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** +$(OBJS)\stcdll_LexScriptol.obj: ../../src/stc\scintilla\src\LexScriptol.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** + $(OBJS)\stcdll_LexVB.obj: ../../src/stc\scintilla\src\LexVB.cxx $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) $** @@ -545,15 +586,24 @@ $(OBJS)\stclib_LexLout.obj: ../../src/stc\scintilla\src\LexLout.cxx $(OBJS)\stclib_LexLua.obj: ../../src/stc\scintilla\src\LexLua.cxx $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** +$(OBJS)\stclib_LexMMIXAL.obj: ../../src/stc\scintilla\src\LexMMIXAL.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + $(OBJS)\stclib_LexMatlab.obj: ../../src/stc\scintilla\src\LexMatlab.cxx $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** +$(OBJS)\stclib_LexNsis.obj: ../../src/stc\scintilla\src\LexNsis.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + $(OBJS)\stclib_LexOthers.obj: ../../src/stc\scintilla\src\LexOthers.cxx $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** $(OBJS)\stclib_LexPOV.obj: ../../src/stc\scintilla\src\LexPOV.cxx $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** +$(OBJS)\stclib_LexPS.obj: ../../src/stc\scintilla\src\LexPS.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + $(OBJS)\stclib_LexPascal.obj: ../../src/stc\scintilla\src\LexPascal.cxx $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** @@ -569,6 +619,9 @@ $(OBJS)\stclib_LexRuby.obj: ../../src/stc\scintilla\src\LexRuby.cxx $(OBJS)\stclib_LexSQL.obj: ../../src/stc\scintilla\src\LexSQL.cxx $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** +$(OBJS)\stclib_LexScriptol.obj: ../../src/stc\scintilla\src\LexScriptol.cxx + $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** + $(OBJS)\stclib_LexVB.obj: ../../src/stc\scintilla\src\LexVB.cxx $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) $** @@ -614,14 +667,16 @@ $(OBJS)\stclib_stc.obj: ../../src/stc\stc.cpp clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).dll + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).ilk + -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).pdb -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib !if "$(SHARED)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).dll: $(STCDLL_OBJECTS) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc_vc$(VENDORTAG).dll: $(STCDLL_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) @<< - $(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) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib + $(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) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc.lib << !endif