- fixes for compilation with NMAKE

This commit is contained in:
Volker Ruppert 2005-06-05 18:46:30 +00:00
parent b6fc5768fa
commit 3c331b1250
3 changed files with 8 additions and 10 deletions

View File

@ -2,9 +2,6 @@
set echo
#export CC=cl
#export CXX=cl
./configure --target=pentium-windows \
--enable-cdrom \
--enable-sb16 \
@ -16,7 +13,8 @@ set echo
--enable-pci \
--enable-clgd54xx \
--disable-readline \
--without-x
--without-x \
--enable-cpp
unset echo

6
bochs/configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in,v 1.287 2005/06/03 15:54:35 vruppert Exp .
# From configure.in Id: configure.in,v 1.288 2005/06/05 18:42:50 vruppert Exp .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59.
#
@ -37612,12 +37612,12 @@ _ACEOF
CFP="/Tc"
OFP="/Fo"
MAKE=nmake
MAKELIB="lib.exe /nologo /subsystem:console /machine:I386 /verbose /out:\$@"
MAKELIB="lib /nologo /subsystem:console /machine:I386 /verbose /out:\$@"
RMCOMMAND="-del"
RANLIB="echo"
#L_OPT="/debug" # for debugging
L_OPT="" # no debug info
LINK="link $L_OPT /nologo /subsystem:console /incremental:no /machine:I386 /out:\$@ BINMODE.OBJ"
LINK="link $L_OPT /nologo /subsystem:console /incremental:no /machine:I386 /out:\$@ "
LINK_CONSOLE=$LINK
EXE=".exe"
PRIMARY_TARGET="bochs.exe"

View File

@ -2,7 +2,7 @@ dnl // Process this file with autoconf to produce a configure script.
AC_PREREQ(2.50)
AC_INIT(bochs.h)
AC_REVISION([[$Id: configure.in,v 1.287 2005-06-03 15:54:35 vruppert Exp $]])
AC_REVISION([[$Id: configure.in,v 1.288 2005-06-05 18:42:50 vruppert Exp $]])
AC_CONFIG_HEADER(config.h)
AC_CONFIG_HEADER(ltdlconf.h)
@ -2390,12 +2390,12 @@ case "$target" in
CFP="/Tc"
OFP="/Fo"
MAKE=nmake
MAKELIB="lib.exe /nologo /subsystem:console /machine:I386 /verbose /out:\$@"
MAKELIB="lib /nologo /subsystem:console /machine:I386 /verbose /out:\$@"
RMCOMMAND="-del"
RANLIB="echo"
#L_OPT="/debug" # for debugging
L_OPT="" # no debug info
LINK="link $L_OPT /nologo /subsystem:console /incremental:no /machine:I386 /out:\$@ BINMODE.OBJ"
LINK="link $L_OPT /nologo /subsystem:console /incremental:no /machine:I386 /out:\$@ "
LINK_CONSOLE=$LINK
EXE=".exe"
PRIMARY_TARGET="bochs.exe"