Some fixes to project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@21011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -111,7 +111,7 @@ BSC32=bscmake.exe
|
||||
# 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"
|
||||
# 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 wxmsw24d.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"
|
||||
@@ -129,10 +129,10 @@ LINK32=link.exe
|
||||
# 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"
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\..\lib\stc.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\..\lib\stc.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
|
||||
# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswdll" /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
|
||||
@@ -144,9 +144,9 @@ 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"
|
||||
# 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 wxmsw24.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"
|
||||
# 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 wxmsw24.lib /nologo /version:1.0 /dll /machine:IX86 /out:"../../../lib/stcdll.dll" /libpath:"../../../lib"
|
||||
# SUBTRACT LINK32 /pdb:none /incremental:no /debug
|
||||
|
||||
!ENDIF
|
||||
|
@@ -259,7 +259,7 @@ gsocket.c MSW Socket,Base
|
||||
gsockmsw.c MSW Socket,Base
|
||||
accel.cpp MSW
|
||||
app.cpp MSW LowLevel
|
||||
automtn.cpp MSW OLE,LowLevel
|
||||
automtn.cpp MSW OLE
|
||||
bitmap.cpp MSW LowLevel
|
||||
bmpbuttn.cpp MSW
|
||||
brush.cpp MSW LowLevel
|
||||
@@ -276,7 +276,7 @@ control.cpp MSW
|
||||
curico.cpp MSW
|
||||
cursor.cpp MSW LowLevel
|
||||
data.cpp MSW LowLevel
|
||||
dataobj.cpp MSW OLE,LowLevel
|
||||
dataobj.cpp MSW OLE
|
||||
dc.cpp MSW LowLevel
|
||||
dcclient.cpp MSW LowLevel
|
||||
dcmemory.cpp MSW LowLevel
|
||||
@@ -290,8 +290,8 @@ dibutils.cpp MSW
|
||||
dir.cpp MSW Base
|
||||
dirdlg.cpp MSW Win32Only,LowLevel
|
||||
dragimag.cpp MSW
|
||||
dropsrc.cpp MSW OLE,LowLevel
|
||||
droptgt.cpp MSW OLE,LowLevel
|
||||
dropsrc.cpp MSW OLE
|
||||
droptgt.cpp MSW OLE
|
||||
enhmeta.cpp MSW Win32Only,LowLevel
|
||||
helpbest.cpp MSW Win32Only,LowLevel
|
||||
evtloop.cpp MSW LowLevel
|
||||
@@ -328,7 +328,7 @@ msgdlg.cpp MSW
|
||||
mslu.cpp MSW
|
||||
nativdlg.cpp MSW
|
||||
notebook.cpp MSW Win32Only
|
||||
oleutils.cpp MSW OLE,LowLevel
|
||||
oleutils.cpp MSW OLE
|
||||
ownerdrw.cpp MSW
|
||||
palette.cpp MSW LowLevel
|
||||
pen.cpp MSW LowLevel
|
||||
@@ -366,7 +366,7 @@ toplevel.cpp MSW LowLevel
|
||||
treectrl.cpp MSW Win32Only
|
||||
utils.cpp MSW Base,LowLevel
|
||||
utilsexc.cpp MSW Base,LowLevel
|
||||
uuid.cpp MSW OLE,LowLevel
|
||||
uuid.cpp MSW OLE
|
||||
uxtheme.cpp MSW
|
||||
volume.cpp MSW Base
|
||||
wave.cpp MSW LowLevel
|
||||
|
@@ -111,7 +111,7 @@ BSC32=bscmake.exe
|
||||
# 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"
|
||||
# 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 wxmsw24d.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"
|
||||
@@ -129,10 +129,10 @@ LINK32=link.exe
|
||||
# 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"
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\..\lib\stc.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\..\lib\stc.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
|
||||
# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswdll" /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
|
||||
@@ -144,9 +144,9 @@ 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"
|
||||
# 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 wxmsw24.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"
|
||||
# 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 wxmsw24.lib /nologo /version:1.0 /dll /machine:IX86 /out:"../../../lib/stcdll.dll" /libpath:"../../../lib"
|
||||
# SUBTRACT LINK32 /pdb:none /incremental:no /debug
|
||||
|
||||
!ENDIF
|
||||
|
@@ -896,7 +896,7 @@ SOURCE=.\msw\app.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\msw\automtn.cpp
|
||||
SOURCE=.\msw\ole\automtn.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@@ -928,7 +928,7 @@ SOURCE=.\msw\data.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\msw\dataobj.cpp
|
||||
SOURCE=.\msw\ole\dataobj.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@@ -972,11 +972,11 @@ SOURCE=.\msw\dirdlg.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\msw\dropsrc.cpp
|
||||
SOURCE=.\msw\ole\dropsrc.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\msw\droptgt.cpp
|
||||
SOURCE=.\msw\ole\droptgt.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@@ -1040,7 +1040,7 @@ SOURCE=.\msw\mimetype.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\msw\oleutils.cpp
|
||||
SOURCE=.\msw\ole\oleutils.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@@ -1104,7 +1104,7 @@ SOURCE=.\msw\utilsexc.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\msw\uuid.cpp
|
||||
SOURCE=.\msw\ole\uuid.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
|
Reference in New Issue
Block a user