mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modified linker options to build XP-compatible binaries when compiling with

Browse Source 
VS2013 nmake. In addition to this change in the Bochs code, the environment
variables for the command prompt need to be modified this way:
===
set INCLUDE=%ProgramFiles(x86)%\Microsoft SDKs\Windows\7.1A\Include;%INCLUDE%
set PATH=%ProgramFiles(x86)%\Microsoft SDKs\Windows\7.1A\Bin;%PATH%
set LIB=%ProgramFiles(x86)%\Microsoft SDKs\Windows\7.1A\Lib;%LIB%
set CL=/D_USING_V110_SDK71_;%CL%
===
This commit is contained in:
Volker Ruppert 2015-02-21 09:52:39 +00:00
parent 9493a63e7a
commit f5966efaba
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bochs/configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in 12586 2014-12-28 23:57:53Z vruppert .
# From configure.in Id: configure.in 12655 2015-02-19 20:23:08Z sshwarts .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69.
#
@ -24954,11 +24954,11 @@ case "$target" in
CFP="/Tc"
OFP="/Fo"
MAKE=nmake
MAKELIB="lib /nologo /subsystem:console /verbose /out:\$@"
MAKELIB="lib /nologo /subsystem:console,\"5.01\" /verbose /out:\$@"
RMCOMMAND="-del"
#L_OPT="/debug" # for debugging
L_OPT="" # no debug info
LINK="link $L_OPT /nologo /subsystem:console /incremental:no /out:\$@ "
LINK="link $L_OPT /nologo /subsystem:console,\"5.01\" /incremental:no /out:\$@ "
LINK_CONSOLE=$LINK
EXE=".exe"
PRIMARY_TARGET="bochs.exe"
@ -25050,7 +25050,7 @@ case $target in
PLUGIN_LIBNAME_TRANSFORMATION='%.o=bx_%.dll'
INSTALL_PLUGINS_VAR=install_dll_plugins
WIN32_DLL_IMPORT_LIB="bochs.lib"
LINK_DLL="link /dll /nologo /subsystem:console /incremental:no /out:\$@"
LINK_DLL="link /dll /nologo /subsystem:console,\"5.01\" /incremental:no /out:\$@"
LIBS="$LIBS advapi32.lib comctl32.lib comdlg32.lib gdi32.lib shell32.lib user32.lib"
PLUGIN_TARGET_2=plugins_msvc
LINK_VAR="_VCPP"
@ -25070,7 +25070,7 @@ case $target in
for i in $IODEV_DLL_LIST
do
echo -e "bx_$i.dll: $i.o" >> iodev/makeincl.vc
echo -e "\tlink /dll /nologo /subsystem:console /incremental:no /out:\$@ $i.o \$(WIN32_DLL_IMPORT_LIBRARY)\n" >> iodev/makeincl.vc
echo -e "\tlink /dll /nologo /subsystem:console,\"5.01\" /incremental:no /out:\$@ $i.o \$(WIN32_DLL_IMPORT_LIBRARY)\n" >> iodev/makeincl.vc
IODEV_DLL_TARGETS="$IODEV_DLL_TARGETS bx_$i.dll"
done
else

8
bochs/configure.in
View File

@ -2622,11 +2622,11 @@ case "$target" in
CFP="/Tc"
OFP="/Fo"
MAKE=nmake
MAKELIB="lib /nologo /subsystem:console /verbose /out:\$@"
MAKELIB="lib /nologo /subsystem:console,\"5.01\" /verbose /out:\$@"
RMCOMMAND="-del"
#L_OPT="/debug" # for debugging
L_OPT="" # no debug info
LINK="link $L_OPT /nologo /subsystem:console /incremental:no /out:\$@ "
LINK="link $L_OPT /nologo /subsystem:console,\"5.01\" /incremental:no /out:\$@ "
LINK_CONSOLE=$LINK
EXE=".exe"
PRIMARY_TARGET="bochs.exe"
@ -2706,7 +2706,7 @@ case $target in
PLUGIN_LIBNAME_TRANSFORMATION='%.o=bx_%.dll'
INSTALL_PLUGINS_VAR=install_dll_plugins
WIN32_DLL_IMPORT_LIB="bochs.lib"
LINK_DLL="link /dll /nologo /subsystem:console /incremental:no /out:\$@"
LINK_DLL="link /dll /nologo /subsystem:console,\"5.01\" /incremental:no /out:\$@"
LIBS="$LIBS advapi32.lib comctl32.lib comdlg32.lib gdi32.lib shell32.lib user32.lib"
PLUGIN_TARGET_2=plugins_msvc
LINK_VAR="_VCPP"
@ -2726,7 +2726,7 @@ case $target in
for i in $IODEV_DLL_LIST
do
echo -e "bx_$i.dll: $i.o" >> iodev/makeincl.vc
echo -e "\tlink /dll /nologo /subsystem:console /incremental:no /out:\$@ $i.o \$(WIN32_DLL_IMPORT_LIBRARY)\n" >> iodev/makeincl.vc
echo -e "\tlink /dll /nologo /subsystem:console,\"5.01\" /incremental:no /out:\$@ $i.o \$(WIN32_DLL_IMPORT_LIBRARY)\n" >> iodev/makeincl.vc
IODEV_DLL_TARGETS="$IODEV_DLL_TARGETS bx_$i.dll"
done
else