[pypy-svn] r75583 - pypy/trunk/pypy/translator/platform
afa at codespeak.net
afa at codespeak.net
Fri Jun 25 13:31:16 CEST 2010
Author: afa
Date: Fri Jun 25 13:31:14 2010
New Revision: 75583
Modified:
pypy/trunk/pypy/translator/platform/windows.py
Log:
Visual Studio 2010 requires the /MANIFEST option to generate manifest files
Modified: pypy/trunk/pypy/translator/platform/windows.py
==============================================================================
--- pypy/trunk/pypy/translator/platform/windows.py (original)
+++ pypy/trunk/pypy/translator/platform/windows.py Fri Jun 25 13:31:14 2010
@@ -168,7 +168,7 @@
# Tell the linker to generate a manifest file
temp_manifest = ofile.dirpath().join(
ofile.purebasename + '.manifest')
- args += ["/MANIFESTFILE:%s" % (temp_manifest,)]
+ args += ["/MANIFEST", "/MANIFESTFILE:%s" % (temp_manifest,)]
self._execute_c_compiler(self.link, args, exe_name)
@@ -277,7 +277,7 @@
'$(CC_LINK) /nologo $(LDFLAGS) $(LDFLAGSEXTRA) $(OBJECTS) /out:$@ $(LIBDIRS) $(LIBS)')
else:
m.rule('$(TARGET)', '$(OBJECTS)',
- ['$(CC_LINK) /nologo $(LDFLAGS) $(LDFLAGSEXTRA) $(OBJECTS) $(LINKFILES) /out:$@ $(LIBDIRS) $(LIBS) /MANIFESTFILE:$*.manifest',
+ ['$(CC_LINK) /nologo $(LDFLAGS) $(LDFLAGSEXTRA) $(OBJECTS) $(LINKFILES) /out:$@ $(LIBDIRS) $(LIBS) /MANIFEST /MANIFESTFILE:$*.manifest',
'mt.exe -nologo -manifest $*.manifest -outputresource:$@;1',
])
@@ -290,7 +290,7 @@
'int main(int argc, char* argv[]) '
'{ return $(PYPY_MAIN_FUNCTION)(argc, argv); } > $@')
m.rule('$(DEFAULT_TARGET)', ['$(TARGET)', 'main.obj'],
- ['$(CC_LINK) /nologo main.obj $(SHARED_IMPORT_LIB) /out:$@ /MANIFESTFILE:$*.manifest',
+ ['$(CC_LINK) /nologo main.obj $(SHARED_IMPORT_LIB) /out:$@ /MANIFEST /MANIFESTFILE:$*.manifest',
'mt.exe -nologo -manifest $*.manifest -outputresource:$@;1',
])
More information about the Pypy-commit
mailing list