diff options
author | Mark Hammond <mhammond@skippinet.com.au> | 2002-07-23 06:31:15 (GMT) |
---|---|---|
committer | Mark Hammond <mhammond@skippinet.com.au> | 2002-07-23 06:31:15 (GMT) |
commit | 62b1ab1b314653c09757c533883447eda437306f (patch) | |
tree | 0aaf9538469559756f9129c5da8b09abc4903c04 /PCbuild/pyexpat.dsp | |
parent | 92825a9a525c268b9797b8be28dbd959b64a821d (diff) | |
download | cpython-62b1ab1b314653c09757c533883447eda437306f.zip cpython-62b1ab1b314653c09757c533883447eda437306f.tar.gz cpython-62b1ab1b314653c09757c533883447eda437306f.tar.bz2 |
Replace DL_IMPORT with PyMODINIT_FUNC and remove "/export:init..." link
command line for Windows builds. This should allow MSVC to import and
build the Python MSVC6 project files without error.
Diffstat (limited to 'PCbuild/pyexpat.dsp')
-rwxr-xr-x | PCbuild/pyexpat.dsp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/PCbuild/pyexpat.dsp b/PCbuild/pyexpat.dsp index 35fe95a..6785de0 100755 --- a/PCbuild/pyexpat.dsp +++ b/PCbuild/pyexpat.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=pyexpat - Win32 Alpha Release
+CFG=pyexpat - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,7 +13,7 @@ CFG=pyexpat - Win32 Alpha Release !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 "pyexpat.mak" CFG="pyexpat - Win32 Alpha Release"
+!MESSAGE NMAKE /f "pyexpat.mak" CFG="pyexpat - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1D100000" /subsystem:windows /dll /debug /machine:I386 /out:"./pyexpat.pyd" /export:initpyexpat
+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1D100000" /subsystem:windows /dll /debug /machine:I386 /out:"./pyexpat.pyd"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "pyexpat - Win32 Debug"
@@ -82,7 +82,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1D100000" /subsystem:windows /dll /debug /machine:I386 /out:"./pyexpat_d.pyd" /pdbtype:sept /export:initpyexpat
+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1D100000" /subsystem:windows /dll /debug /machine:I386 /out:"./pyexpat_d.pyd" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
!ENDIF
|