From: Robin Dunn Date: Thu, 27 Feb 2003 21:10:20 +0000 (+0000) Subject: Patch from David Falkinder to help building a STC dll. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/402ce7557180cb538097b84c7e3a142036dc7f98 Patch from David Falkinder to help building a STC dll. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/contrib/include/wx/stc/stc.h b/contrib/include/wx/stc/stc.h index 82cd6684ff..096949085a 100644 --- a/contrib/include/wx/stc/stc.h +++ b/contrib/include/wx/stc/stc.h @@ -24,11 +24,29 @@ #include #include -#ifdef STCISDLL -#define STCDLLEXPORT WXDLLEXPORT +#ifndef SWIG +/* + * If we're using wx in Dynamic Library format do we + * want wxStyledTextCtrl to be in DLL form as well? + */ +#if defined(WXUSINGDLL) && \ + (defined(WXMAKING_STC_DLL) || defined(WXUSING_STC_DLL)) + +#if defined(WXMAKING_STC_DLL) + // When building the DLL WXSTC_DECLSPEC exports classes +# define WXSTC_DECLSPEC WXEXPORT +#elif defined(WXUSING_STC_DLL) + // When using the DLL WXSTC_DECLSPEC imports classes +# define WXSTC_DECLSPEC WXIMPORT +#endif // defined(WXBUILD_STC_DLL) + #else -#define STCDLLEXPORT -#endif +// When building the static library nullify the effect of WXSTC_DECLSPEC +#define WXSTC_DECLSPEC +#endif // WXUSINGDLL && (WXMAKING_STC_DLL || WXUSING_STC_DLL) + +#endif // SWIG + //---------------------------------------------------------------------- @@ -908,9 +926,9 @@ class WordList; struct SCNotification; #ifndef SWIG -extern STCDLLEXPORT const wxChar* wxSTCNameStr; -class STCDLLEXPORT wxStyledTextCtrl; -class STCDLLEXPORT wxStyledTextEvent; +extern WXSTC_DECLSPEC const wxChar* wxSTCNameStr; +class WXSTC_DECLSPEC wxStyledTextCtrl; +class WXSTC_DECLSPEC wxStyledTextEvent; #endif //---------------------------------------------------------------------- diff --git a/contrib/src/stc/StcVC.dsp b/contrib/src/stc/StcVC.dsp index 97dc8f7f9f..a6c2c4ce95 100644 --- a/contrib/src/stc/StcVC.dsp +++ b/contrib/src/stc/StcVC.dsp @@ -1,34 +1,35 @@ -# Microsoft Developer Studio Project File - Name="StcVC" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="stcVC" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=StcVC - Win32 Debug +CFG=stcVC - Win32 Release DLL !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run -!MESSAGE +!MESSAGE !MESSAGE NMAKE /f "StcVC.mak". -!MESSAGE +!MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "StcVC.mak" CFG="StcVC - Win32 Debug" -!MESSAGE +!MESSAGE +!MESSAGE NMAKE /f "StcVC.mak" CFG="stcVC - Win32 Release DLL" +!MESSAGE !MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "StcVC - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "StcVC - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE +!MESSAGE +!MESSAGE "stcVC - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "stcVC - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "stcVC - Win32 Debug DLL" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "stcVC - Win32 Release DLL" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe -!IF "$(CFG)" == "StcVC - Win32 Release" +!IF "$(CFG)" == "stcVC - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -40,9 +41,11 @@ RSC=rc.exe # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" # PROP Target_Dir "" +LINK32=link.exe +CPP=cl.exe # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /I "scintilla/include" /I "scintilla/src" /I "../../../lib/msw" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /FD /c -# SUBTRACT CPP /YX +# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/msw" /I "./scintilla/include/" /I "./scintilla/src" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__HACK_MY_MSDEV40__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "SCI_LEXER" /D "LINK_LEXERS" /D "__WX__" /YX /FD /c +RSC=rc.exe # ADD BASE RSC /l 0x809 # ADD RSC /l 0x809 BSC32=bscmake.exe @@ -52,7 +55,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"..\..\..\lib\stc.lib" -!ELSEIF "$(CFG)" == "StcVC - Win32 Debug" +!ELSEIF "$(CFG)" == "stcVC - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -64,9 +67,11 @@ LIB32=link.exe -lib # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" +LINK32=link.exe +CPP=cl.exe # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../../include" /I "../../include" /I "scintilla/include" /I "scintilla/src" /I "../../../lib/mswd" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /FD /c -# SUBTRACT CPP /YX +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswd" /I "./scintilla/include/" /I "./scintilla/src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "SCI_LEXER" /D "LINK_LEXERS" /D "__WX__" /YX /FD /c +RSC=rc.exe # ADD BASE RSC /l 0x809 # ADD RSC /l 0x809 BSC32=bscmake.exe @@ -76,15 +81,85 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"..\..\..\lib\stcd.lib" -!ENDIF +!ELSEIF "$(CFG)" == "stcVC - Win32 Debug DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug_DLL" +# PROP BASE Intermediate_Dir "Debug_DLL" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\..\lib" +# PROP Intermediate_Dir "Debug_DLL" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\..\lib\stcd.lib" +# ADD LIB32 /nologo /out:"..\..\..\lib\stcd.lib" +CPP=cl.exe +# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswd" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswdlld" /I "./scintilla/include/" /I "./scintilla/src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_STC_DLL" /D "SCI_LEXER" /D "LINK_LEXERS" /D "__WX__" /YX /FD /c +# SUBTRACT CPP /u +MTL=midl.exe +RSC=rc.exe +# ADD BASE RSC /l 0x809 +# ADD RSC /l 0x809 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 /machine:IX86 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw250d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/stcdlld.dll" /libpath:"../../../lib" +# SUBTRACT LINK32 /pdb:none + +!ELSEIF "$(CFG)" == "stcVC - Win32 Release DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "stcVC___Win32_Release_DLL" +# PROP BASE Intermediate_Dir "stcVC___Win32_Release_DLL" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\..\lib" +# PROP Intermediate_Dir "Release_DLL" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\..\lib\stcd.lib" +# ADD LIB32 /nologo /out:"..\..\..\lib\stcd.lib" +CPP=cl.exe +# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswdlld" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /D "WXBUILD_STC_DLL" /YX /FD /c +# SUBTRACT BASE CPP /u +# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/mswdll" /I "./scintilla/include/" /I "./scintilla/src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_STC_DLL" /D "SCI_LEXER" /D "LINK_LEXERS" /D "__WX__" /YX /FD /c +# SUBTRACT CPP /u +MTL=midl.exe +RSC=rc.exe +# ADD BASE RSC /l 0x809 +# ADD RSC /l 0x809 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw250d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/stcdlld.dll" /libpath:"../../../lib" +# SUBTRACT BASE LINK32 /pdb:none +# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw250.lib /nologo /version:1.0 /dll /machine:IX86 /out:"../../../lib/stcdll.dll" /libpath:"../../../lib" +# SUBTRACT LINK32 /pdb:none /incremental:no /debug + +!ENDIF # Begin Target -# Name "StcVC - Win32 Release" -# Name "StcVC - Win32 Debug" -# Begin Group "Stc" +# Name "stcVC - Win32 Release" +# Name "stcVC - Win32 Debug" +# Name "stcVC - Win32 Debug DLL" +# Name "stcVC - Win32 Release DLL" +# Begin Group "wxStyledTextCtrl Src" -# PROP Default_Filter "" +# PROP Default_Filter "*.cpp" # Begin Source File SOURCE=.\PlatWX.cpp @@ -95,11 +170,23 @@ SOURCE=.\ScintillaWX.cpp # End Source File # Begin Source File +SOURCE=.\stc.cpp +# End Source File +# End Group +# Begin Group "wxStyledTextCtrl Headers" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\PlatWX.h +# End Source File +# Begin Source File + SOURCE=.\ScintillaWX.h # End Source File # Begin Source File -SOURCE=.\stc.cpp +SOURCE=..\..\include\wx\stc\stc.h # End Source File # End Group # Begin Group "Scintilla" @@ -107,6 +194,10 @@ SOURCE=.\stc.cpp # PROP Default_Filter "" # Begin Source File +SOURCE=.\scintilla\include\Accessor.h +# End Source File +# Begin Source File + SOURCE=.\scintilla\src\AutoComplete.cxx # End Source File # Begin Source File @@ -151,6 +242,10 @@ SOURCE=.\scintilla\src\DocumentAccessor.cxx # End Source File # Begin Source File +SOURCE=.\scintilla\src\DocumentAccessor.h +# End Source File +# Begin Source File + SOURCE=.\scintilla\src\Editor.cxx # End Source File # Begin Source File @@ -179,6 +274,10 @@ SOURCE=.\scintilla\src\KeyWords.cxx # End Source File # Begin Source File +SOURCE=.\scintilla\include\KeyWords.h +# End Source File +# Begin Source File + SOURCE=.\scintilla\src\LexAda.cxx # End Source File # Begin Source File @@ -263,14 +362,34 @@ SOURCE=.\scintilla\src\LineMarker.h # End Source File # Begin Source File +SOURCE=.\scintilla\include\Platform.h +# End Source File +# Begin Source File + SOURCE=.\scintilla\src\PropSet.cxx # End Source File # Begin Source File +SOURCE=.\scintilla\include\PropSet.h +# End Source File +# Begin Source File + SOURCE=.\scintilla\src\RESearch.cxx # End Source File # Begin Source File +SOURCE=.\scintilla\src\RESearch.h +# End Source File +# Begin Source File + +SOURCE=.\scintilla\include\SciLexer.h +# End Source File +# Begin Source File + +SOURCE=.\scintilla\include\Scintilla.h +# End Source File +# Begin Source File + SOURCE=.\scintilla\src\ScintillaBase.cxx # End Source File # Begin Source File @@ -279,6 +398,14 @@ SOURCE=.\scintilla\src\ScintillaBase.h # End Source File # Begin Source File +SOURCE=.\scintilla\include\ScintillaWidget.h +# End Source File +# Begin Source File + +SOURCE=.\scintilla\include\SString.h +# End Source File +# Begin Source File + SOURCE=.\scintilla\src\Style.cxx # End Source File # Begin Source File @@ -291,10 +418,22 @@ SOURCE=.\scintilla\src\StyleContext.cxx # End Source File # Begin Source File +SOURCE=.\scintilla\src\StyleContext.h +# End Source File +# Begin Source File + SOURCE=.\scintilla\src\SVector.h # End Source File # Begin Source File +SOURCE=.\scintilla\src\UniConversion.cxx +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\UniConversion.h +# End Source File +# Begin Source File + SOURCE=.\scintilla\src\ViewStyle.cxx # End Source File # Begin Source File @@ -305,6 +444,10 @@ SOURCE=.\scintilla\src\ViewStyle.h SOURCE=.\scintilla\src\WindowAccessor.cxx # End Source File +# Begin Source File + +SOURCE=.\scintilla\include\WindowAccessor.h +# End Source File # End Group # End Target # End Project diff --git a/contrib/src/stc/stc.h.in b/contrib/src/stc/stc.h.in index 0a3360359e..7a54289b2c 100644 --- a/contrib/src/stc/stc.h.in +++ b/contrib/src/stc/stc.h.in @@ -24,11 +24,29 @@ #include #include -#ifdef STCISDLL -#define STCDLLEXPORT WXDLLEXPORT +#ifndef SWIG +/* + * If we're using wx in Dynamic Library format do we + * want wxStyledTextCtrl to be in DLL form as well? + */ +#if defined(WXUSINGDLL) && \ + (defined(WXMAKING_STC_DLL) || defined(WXUSING_STC_DLL)) + +#if defined(WXMAKING_STC_DLL) + // When building the DLL WXSTC_DECLSPEC exports classes +# define WXSTC_DECLSPEC WXEXPORT +#elif defined(WXUSING_STC_DLL) + // When using the DLL WXSTC_DECLSPEC imports classes +# define WXSTC_DECLSPEC WXIMPORT +#endif // defined(WXBUILD_STC_DLL) + #else -#define STCDLLEXPORT -#endif +// When building the static library nullify the effect of WXSTC_DECLSPEC +#define WXSTC_DECLSPEC +#endif // WXUSINGDLL && (WXMAKING_STC_DLL || WXUSING_STC_DLL) + +#endif // SWIG + //---------------------------------------------------------------------- @@ -58,9 +76,9 @@ class WordList; struct SCNotification; #ifndef SWIG -extern STCDLLEXPORT const wxChar* wxSTCNameStr; -class STCDLLEXPORT wxStyledTextCtrl; -class STCDLLEXPORT wxStyledTextEvent; +extern WXSTC_DECLSPEC const wxChar* wxSTCNameStr; +class WXSTC_DECLSPEC wxStyledTextCtrl; +class WXSTC_DECLSPEC wxStyledTextEvent; #endif //---------------------------------------------------------------------- diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h index 82cd6684ff..096949085a 100644 --- a/include/wx/stc/stc.h +++ b/include/wx/stc/stc.h @@ -24,11 +24,29 @@ #include #include -#ifdef STCISDLL -#define STCDLLEXPORT WXDLLEXPORT +#ifndef SWIG +/* + * If we're using wx in Dynamic Library format do we + * want wxStyledTextCtrl to be in DLL form as well? + */ +#if defined(WXUSINGDLL) && \ + (defined(WXMAKING_STC_DLL) || defined(WXUSING_STC_DLL)) + +#if defined(WXMAKING_STC_DLL) + // When building the DLL WXSTC_DECLSPEC exports classes +# define WXSTC_DECLSPEC WXEXPORT +#elif defined(WXUSING_STC_DLL) + // When using the DLL WXSTC_DECLSPEC imports classes +# define WXSTC_DECLSPEC WXIMPORT +#endif // defined(WXBUILD_STC_DLL) + #else -#define STCDLLEXPORT -#endif +// When building the static library nullify the effect of WXSTC_DECLSPEC +#define WXSTC_DECLSPEC +#endif // WXUSINGDLL && (WXMAKING_STC_DLL || WXUSING_STC_DLL) + +#endif // SWIG + //---------------------------------------------------------------------- @@ -908,9 +926,9 @@ class WordList; struct SCNotification; #ifndef SWIG -extern STCDLLEXPORT const wxChar* wxSTCNameStr; -class STCDLLEXPORT wxStyledTextCtrl; -class STCDLLEXPORT wxStyledTextEvent; +extern WXSTC_DECLSPEC const wxChar* wxSTCNameStr; +class WXSTC_DECLSPEC wxStyledTextCtrl; +class WXSTC_DECLSPEC wxStyledTextEvent; #endif //---------------------------------------------------------------------- diff --git a/src/stc/StcVC.dsp b/src/stc/StcVC.dsp index 97dc8f7f9f..a6c2c4ce95 100644 --- a/src/stc/StcVC.dsp +++ b/src/stc/StcVC.dsp @@ -1,34 +1,35 @@ -# Microsoft Developer Studio Project File - Name="StcVC" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="stcVC" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=StcVC - Win32 Debug +CFG=stcVC - Win32 Release DLL !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run -!MESSAGE +!MESSAGE !MESSAGE NMAKE /f "StcVC.mak". -!MESSAGE +!MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "StcVC.mak" CFG="StcVC - Win32 Debug" -!MESSAGE +!MESSAGE +!MESSAGE NMAKE /f "StcVC.mak" CFG="stcVC - Win32 Release DLL" +!MESSAGE !MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "StcVC - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "StcVC - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE +!MESSAGE +!MESSAGE "stcVC - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "stcVC - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "stcVC - Win32 Debug DLL" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "stcVC - Win32 Release DLL" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe -!IF "$(CFG)" == "StcVC - Win32 Release" +!IF "$(CFG)" == "stcVC - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -40,9 +41,11 @@ RSC=rc.exe # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" # PROP Target_Dir "" +LINK32=link.exe +CPP=cl.exe # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /I "scintilla/include" /I "scintilla/src" /I "../../../lib/msw" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /FD /c -# SUBTRACT CPP /YX +# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/msw" /I "./scintilla/include/" /I "./scintilla/src" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__HACK_MY_MSDEV40__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "SCI_LEXER" /D "LINK_LEXERS" /D "__WX__" /YX /FD /c +RSC=rc.exe # ADD BASE RSC /l 0x809 # ADD RSC /l 0x809 BSC32=bscmake.exe @@ -52,7 +55,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"..\..\..\lib\stc.lib" -!ELSEIF "$(CFG)" == "StcVC - Win32 Debug" +!ELSEIF "$(CFG)" == "stcVC - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -64,9 +67,11 @@ LIB32=link.exe -lib # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" +LINK32=link.exe +CPP=cl.exe # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../../../include" /I "../../include" /I "scintilla/include" /I "scintilla/src" /I "../../../lib/mswd" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "__WX__" /D "SCI_LEXER" /D "LINK_LEXERS" /FD /c -# SUBTRACT CPP /YX +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswd" /I "./scintilla/include/" /I "./scintilla/src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "SCI_LEXER" /D "LINK_LEXERS" /D "__WX__" /YX /FD /c +RSC=rc.exe # ADD BASE RSC /l 0x809 # ADD RSC /l 0x809 BSC32=bscmake.exe @@ -76,15 +81,85 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"..\..\..\lib\stcd.lib" -!ENDIF +!ELSEIF "$(CFG)" == "stcVC - Win32 Debug DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug_DLL" +# PROP BASE Intermediate_Dir "Debug_DLL" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\..\lib" +# PROP Intermediate_Dir "Debug_DLL" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\..\lib\stcd.lib" +# ADD LIB32 /nologo /out:"..\..\..\lib\stcd.lib" +CPP=cl.exe +# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswd" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswdlld" /I "./scintilla/include/" /I "./scintilla/src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_STC_DLL" /D "SCI_LEXER" /D "LINK_LEXERS" /D "__WX__" /YX /FD /c +# SUBTRACT CPP /u +MTL=midl.exe +RSC=rc.exe +# ADD BASE RSC /l 0x809 +# ADD RSC /l 0x809 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 /machine:IX86 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw250d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/stcdlld.dll" /libpath:"../../../lib" +# SUBTRACT LINK32 /pdb:none + +!ELSEIF "$(CFG)" == "stcVC - Win32 Release DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "stcVC___Win32_Release_DLL" +# PROP BASE Intermediate_Dir "stcVC___Win32_Release_DLL" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\..\lib" +# PROP Intermediate_Dir "Release_DLL" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\..\lib\stcd.lib" +# ADD LIB32 /nologo /out:"..\..\..\lib\stcd.lib" +CPP=cl.exe +# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswdlld" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /D "WXBUILD_STC_DLL" /YX /FD /c +# SUBTRACT BASE CPP /u +# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/mswdll" /I "./scintilla/include/" /I "./scintilla/src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_STC_DLL" /D "SCI_LEXER" /D "LINK_LEXERS" /D "__WX__" /YX /FD /c +# SUBTRACT CPP /u +MTL=midl.exe +RSC=rc.exe +# ADD BASE RSC /l 0x809 +# ADD RSC /l 0x809 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw250d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/stcdlld.dll" /libpath:"../../../lib" +# SUBTRACT BASE LINK32 /pdb:none +# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw250.lib /nologo /version:1.0 /dll /machine:IX86 /out:"../../../lib/stcdll.dll" /libpath:"../../../lib" +# SUBTRACT LINK32 /pdb:none /incremental:no /debug + +!ENDIF # Begin Target -# Name "StcVC - Win32 Release" -# Name "StcVC - Win32 Debug" -# Begin Group "Stc" +# Name "stcVC - Win32 Release" +# Name "stcVC - Win32 Debug" +# Name "stcVC - Win32 Debug DLL" +# Name "stcVC - Win32 Release DLL" +# Begin Group "wxStyledTextCtrl Src" -# PROP Default_Filter "" +# PROP Default_Filter "*.cpp" # Begin Source File SOURCE=.\PlatWX.cpp @@ -95,11 +170,23 @@ SOURCE=.\ScintillaWX.cpp # End Source File # Begin Source File +SOURCE=.\stc.cpp +# End Source File +# End Group +# Begin Group "wxStyledTextCtrl Headers" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\PlatWX.h +# End Source File +# Begin Source File + SOURCE=.\ScintillaWX.h # End Source File # Begin Source File -SOURCE=.\stc.cpp +SOURCE=..\..\include\wx\stc\stc.h # End Source File # End Group # Begin Group "Scintilla" @@ -107,6 +194,10 @@ SOURCE=.\stc.cpp # PROP Default_Filter "" # Begin Source File +SOURCE=.\scintilla\include\Accessor.h +# End Source File +# Begin Source File + SOURCE=.\scintilla\src\AutoComplete.cxx # End Source File # Begin Source File @@ -151,6 +242,10 @@ SOURCE=.\scintilla\src\DocumentAccessor.cxx # End Source File # Begin Source File +SOURCE=.\scintilla\src\DocumentAccessor.h +# End Source File +# Begin Source File + SOURCE=.\scintilla\src\Editor.cxx # End Source File # Begin Source File @@ -179,6 +274,10 @@ SOURCE=.\scintilla\src\KeyWords.cxx # End Source File # Begin Source File +SOURCE=.\scintilla\include\KeyWords.h +# End Source File +# Begin Source File + SOURCE=.\scintilla\src\LexAda.cxx # End Source File # Begin Source File @@ -263,14 +362,34 @@ SOURCE=.\scintilla\src\LineMarker.h # End Source File # Begin Source File +SOURCE=.\scintilla\include\Platform.h +# End Source File +# Begin Source File + SOURCE=.\scintilla\src\PropSet.cxx # End Source File # Begin Source File +SOURCE=.\scintilla\include\PropSet.h +# End Source File +# Begin Source File + SOURCE=.\scintilla\src\RESearch.cxx # End Source File # Begin Source File +SOURCE=.\scintilla\src\RESearch.h +# End Source File +# Begin Source File + +SOURCE=.\scintilla\include\SciLexer.h +# End Source File +# Begin Source File + +SOURCE=.\scintilla\include\Scintilla.h +# End Source File +# Begin Source File + SOURCE=.\scintilla\src\ScintillaBase.cxx # End Source File # Begin Source File @@ -279,6 +398,14 @@ SOURCE=.\scintilla\src\ScintillaBase.h # End Source File # Begin Source File +SOURCE=.\scintilla\include\ScintillaWidget.h +# End Source File +# Begin Source File + +SOURCE=.\scintilla\include\SString.h +# End Source File +# Begin Source File + SOURCE=.\scintilla\src\Style.cxx # End Source File # Begin Source File @@ -291,10 +418,22 @@ SOURCE=.\scintilla\src\StyleContext.cxx # End Source File # Begin Source File +SOURCE=.\scintilla\src\StyleContext.h +# End Source File +# Begin Source File + SOURCE=.\scintilla\src\SVector.h # End Source File # Begin Source File +SOURCE=.\scintilla\src\UniConversion.cxx +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\UniConversion.h +# End Source File +# Begin Source File + SOURCE=.\scintilla\src\ViewStyle.cxx # End Source File # Begin Source File @@ -305,6 +444,10 @@ SOURCE=.\scintilla\src\ViewStyle.h SOURCE=.\scintilla\src\WindowAccessor.cxx # End Source File +# Begin Source File + +SOURCE=.\scintilla\include\WindowAccessor.h +# End Source File # End Group # End Target # End Project diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in index 0a3360359e..7a54289b2c 100644 --- a/src/stc/stc.h.in +++ b/src/stc/stc.h.in @@ -24,11 +24,29 @@ #include #include -#ifdef STCISDLL -#define STCDLLEXPORT WXDLLEXPORT +#ifndef SWIG +/* + * If we're using wx in Dynamic Library format do we + * want wxStyledTextCtrl to be in DLL form as well? + */ +#if defined(WXUSINGDLL) && \ + (defined(WXMAKING_STC_DLL) || defined(WXUSING_STC_DLL)) + +#if defined(WXMAKING_STC_DLL) + // When building the DLL WXSTC_DECLSPEC exports classes +# define WXSTC_DECLSPEC WXEXPORT +#elif defined(WXUSING_STC_DLL) + // When using the DLL WXSTC_DECLSPEC imports classes +# define WXSTC_DECLSPEC WXIMPORT +#endif // defined(WXBUILD_STC_DLL) + #else -#define STCDLLEXPORT -#endif +// When building the static library nullify the effect of WXSTC_DECLSPEC +#define WXSTC_DECLSPEC +#endif // WXUSINGDLL && (WXMAKING_STC_DLL || WXUSING_STC_DLL) + +#endif // SWIG + //---------------------------------------------------------------------- @@ -58,9 +76,9 @@ class WordList; struct SCNotification; #ifndef SWIG -extern STCDLLEXPORT const wxChar* wxSTCNameStr; -class STCDLLEXPORT wxStyledTextCtrl; -class STCDLLEXPORT wxStyledTextEvent; +extern WXSTC_DECLSPEC const wxChar* wxSTCNameStr; +class WXSTC_DECLSPEC wxStyledTextCtrl; +class WXSTC_DECLSPEC wxStyledTextEvent; #endif //----------------------------------------------------------------------