Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
PyPy
pypy
Commits
dbdcc057562b
Commit
417d47d9
authored
Jul 21, 2014
by
timfel
Browse files
fix compilation with Visual Studio 2013
parent
24db6697b691
Changes
1
Hide whitespace changes
Inline
Side-by-side
rpython/translator/platform/windows.py
View file @
dbdcc057
...
...
@@ -375,21 +375,28 @@ class MsvcPlatform(Platform):
for
rule
in
rules
:
m
.
rule
(
*
rule
)
if
len
(
headers_to_precompile
)
>
0
and
self
.
version
>=
80
:
# at least from VS2013 onwards we need to include PCH
# objects in the final link command
linkobjs
=
'stdafx.obj @<<
\n
$(OBJECTS)
\n
<<'
else
:
linkobjs
=
'@<<
\n
$(OBJECTS)
\n
<<'
if
self
.
version
<
80
:
m
.
rule
(
'$(TARGET)'
,
'$(OBJECTS)'
,
[
'$(CC_LINK) /nologo $(LDFLAGS) $(LDFLAGSEXTRA) /out:$@'
+
\
' $(LIBDIRS) $(LIBS)
@<<
\n
$(OBJECTS)
\n
<<'
,
' $(LIBDIRS) $(LIBS)
'
+
linkobjs
,
])
else
:
m
.
rule
(
'$(TARGET)'
,
'$(OBJECTS)'
,
[
'$(CC_LINK) /nologo $(LDFLAGS) $(LDFLAGSEXTRA)'
+
\
' $(LINKFILES) /out:$@ $(LIBDIRS) $(LIBS) /MANIFEST'
+
\
' /MANIFESTFILE:$*.manifest
@<<
\n
$(OBJECTS)
\n
<<'
,
' /MANIFESTFILE:$*.manifest
'
+
linkobjs
,
'mt.exe -nologo -manifest $*.manifest -outputresource:$@;1'
,
])
m
.
rule
(
'debugmode_$(TARGET)'
,
'$(OBJECTS)'
,
[
'$(CC_LINK) /nologo /DEBUG $(LDFLAGS) $(LDFLAGSEXTRA)'
+
\
' $(LINKFILES) /out:$@ $(LIBDIRS) $(LIBS)
@<<
\n
$(OBJECTS)
\n
<<'
,
' $(LINKFILES) /out:$@ $(LIBDIRS) $(LIBS)
'
+
linkobjs
,
])
if
shared
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment