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

- don't link twice with COMCTL32.DLL if win32 gui is enabled

Browse Source
This commit is contained in:
Volker Ruppert 2005-10-20 17:25:38 +00:00
parent 64ba97210b
commit 0bf7095fa9
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bochs/configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in,v 1.297 2005/10/09 10:33:52 vruppert Exp .
# From configure.in Id: configure.in,v 1.300 2005/10/20 17:24:47 vruppert Exp .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59.
#
@ -35867,18 +35867,6 @@ _ACEOF
fi
else
if test "$bx_cpu_level" -ge 5; then
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\_ACEOF
#define BX_SUPPORT_VME 0
_ACEOF
fi
fi;
echo "$as_me:$LINENO: checking for MMX support" >&5
@ -37846,7 +37834,9 @@ fi
PLUGIN_LIBNAME_TRANSFORMATION='%.o=bx_%.dll'
INSTALL_PLUGINS_VAR=install_dll_plugins
else
LIBS="$LIBS -lcomctl32"
if test "$with_win32" != yes; then
LIBS="$LIBS -lcomctl32"
fi
fi
DIALOG_OBJS="win32dialog.o"
EXPORT_DYNAMIC=""

6
bochs/configure.in
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.299 2005-10-17 13:06:08 sshwarts Exp $]])
AC_REVISION([[$Id: configure.in,v 1.300 2005-10-20 17:24:47 vruppert Exp $]])
AC_CONFIG_HEADER(config.h)
AC_CONFIG_HEADER(ltdlconf.h)
@ -2460,7 +2460,9 @@ case $target in
PLUGIN_LIBNAME_TRANSFORMATION='%.o=bx_%.dll'
INSTALL_PLUGINS_VAR=install_dll_plugins
else
LIBS="$LIBS -lcomctl32"
if test "$with_win32" != yes; then
LIBS="$LIBS -lcomctl32"
fi
fi
DIALOG_OBJS="win32dialog.o"
EXPORT_DYNAMIC=""