- the option -export-dynamic is not needed for the win32 non-plugin version
(MSVC doesn't understand this argument) - exporting dll symbols is only needed for the win32 plugin version
This commit is contained in:
Volker Ruppert
parent
2f4a3367e4
commit
785662517c
@ -182,7 +182,7 @@ bochs@EXE@: @IODEV_LIB_VAR@ @DEBUGGER_VAR@ \
|
||||
cpu/libcpu.a memory/libmemory.a gui/libgui.a \
|
||||
@DISASM_VAR@ @INSTRUMENT_VAR@ $(BX_OBJS) \
|
||||
$(SIMX86_OBJS) @FPU_VAR@ @GDBSTUB_VAR@ @PLUGIN_VAR@
|
||||
@LINK@ -export-dynamic $(BX_OBJS) $(SIMX86_OBJS) \
|
||||
@LINK@ @EXPORT_DYNAMIC@ $(BX_OBJS) $(SIMX86_OBJS) \
|
||||
iodev/libiodev.a cpu/libcpu.a memory/libmemory.a gui/libgui.a \
|
||||
@DEBUGGER_VAR@ @DISASM_VAR@ @INSTRUMENT_VAR@ @PLUGIN_VAR@ \
|
||||
@GDBSTUB_VAR@ @FPU_VAR@ \
|
||||
@ -248,7 +248,7 @@ $(BX_OBJS): $(BX_INCLUDES)
|
||||
bxversion.h:
|
||||
$(RM) -f bxversion.h
|
||||
echo '/////////////////////////////////////////////////////////////////////////' > bxversion.h
|
||||
echo '// $$Id: Makefile.in,v 1.173 2005-06-13 15:56:57 vruppert Exp $$' >> bxversion.h
|
||||
echo '// $$Id: Makefile.in,v 1.174 2005-06-13 20:26:53 vruppert Exp $$' >> bxversion.h
|
||||
echo '/////////////////////////////////////////////////////////////////////////' >> bxversion.h
|
||||
echo '// This file is generated by "make bxversion.h"' >> bxversion.h
|
||||
echo "#define VER_STRING \"$(VER_STRING)\"" >> bxversion.h
|
||||
|
||||
@ -407,7 +407,7 @@
|
||||
# if BX_PLUGINS && defined(BX_PLUGGABLE)
|
||||
// #warning I will import DLL symbols from Bochs main program.
|
||||
# define BOCHSAPI __declspec(dllimport)
|
||||
# else
|
||||
# elif BX_PLUGINS
|
||||
// #warning I will export DLL symbols.
|
||||
# define BOCHSAPI __declspec(dllexport)
|
||||
# endif
|
||||
|
||||
20
bochs/configure
vendored
20
bochs/configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in,v 1.288 2005/06/05 18:42:50 vruppert Exp .
|
||||
# From configure.in Id: configure.in,v 1.289 2005/06/13 20:26:55 vruppert Exp .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.59.
|
||||
#
|
||||
@ -464,7 +464,7 @@ ac_includes_default="\
|
||||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX SET_MAKE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBADD_DL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS BX_USE_NEW_PIT BX_USE_IDLE_HACK DEFINE_PLUGIN_PATH NONPLUGIN_GUI_LINK_OPTS OBJS64 IOAPIC_OBJS APIC_OBJS BX_COMPRESSED_HD_SUPPORT NE2K_OBJS PCI_OBJ KERNELDIR LSMOD INSMOD RMMOD DEPMOD PCIDEV_MODULE_MAKE_ALL KERNEL_MODULE_SUFFIX NETLOW_OBJS SUFFIX_LINE CPP_SUFFIX DEBUGGER_VAR BX_EXTERNAL_DEBUGGER BX_MAGIC_BREAKPOINT DISASM_VAR READLINE_LIB INSTRUMENT_DIR INSTRUMENT_VAR FPU_VAR FPU_GLUE_OBJ CDROM_OBJS SB16_OBJS SOUNDLOW_OBJS GAME_OBJS GDBSTUB_VAR IODEBUG_OBJS DOCBOOK2HTML BUILD_DOCBOOK_VAR INSTALL_DOCBOOK_VAR IODEV_LIB_VAR EXTRA_BX_OBJS NONINLINE_VAR INLINE_VAR EXTERNAL_DEPENDENCY EXT_DEBUG_OBJS RC_CMD WX_CONFIG XPM_LIB GUI_CFLAGS GUI_CXXFLAGS WX_CFLAGS WX_CXXFLAGS DIALOG_OBJS PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS INSTALL_TARGET INSTALL_LIST_FOR_PLATFORM RFB_LIBS GUI_OBJS DEVICE_LINK_OPTS GUI_LINK_OPTS GUI_LINK_OPTS_TERM GUI_LINK_OPTS_WX BXIMAGE_LINK_OPTS DASH SLASH CXXFP CFP OFP MAKELIB RMCOMMAND LINK LINK_CONSOLE EXE PRIMARY_TARGET PLUGIN_LIBNAME_TRANSFORMATION COMMAND_SEPARATOR CD_UP_ONE CD_UP_TWO CD_UP_THREE VERSION VER_STRING REL_STRING EXTRA_LINK_OPTS GUI_NON_PLUGIN_OBJS GUI_PLUGIN_OBJS IODEV_NON_PLUGIN_OBJS IODEV_PLUGIN_OBJS PLUGIN_VAR PLUGIN_TARGET INSTALL_PLUGINS_VAR GZIP TAR LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX SET_MAKE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBADD_DL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS BX_USE_NEW_PIT BX_USE_IDLE_HACK DEFINE_PLUGIN_PATH NONPLUGIN_GUI_LINK_OPTS OBJS64 IOAPIC_OBJS APIC_OBJS BX_COMPRESSED_HD_SUPPORT NE2K_OBJS PCI_OBJ KERNELDIR LSMOD INSMOD RMMOD DEPMOD PCIDEV_MODULE_MAKE_ALL KERNEL_MODULE_SUFFIX NETLOW_OBJS SUFFIX_LINE CPP_SUFFIX DEBUGGER_VAR BX_EXTERNAL_DEBUGGER BX_MAGIC_BREAKPOINT DISASM_VAR READLINE_LIB INSTRUMENT_DIR INSTRUMENT_VAR FPU_VAR FPU_GLUE_OBJ CDROM_OBJS SB16_OBJS SOUNDLOW_OBJS GAME_OBJS GDBSTUB_VAR IODEBUG_OBJS DOCBOOK2HTML BUILD_DOCBOOK_VAR INSTALL_DOCBOOK_VAR IODEV_LIB_VAR EXTRA_BX_OBJS NONINLINE_VAR INLINE_VAR EXTERNAL_DEPENDENCY EXT_DEBUG_OBJS RC_CMD WX_CONFIG XPM_LIB GUI_CFLAGS GUI_CXXFLAGS WX_CFLAGS WX_CXXFLAGS DIALOG_OBJS EXPORT_DYNAMIC PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS INSTALL_TARGET INSTALL_LIST_FOR_PLATFORM RFB_LIBS GUI_OBJS DEVICE_LINK_OPTS GUI_LINK_OPTS GUI_LINK_OPTS_TERM GUI_LINK_OPTS_WX BXIMAGE_LINK_OPTS DASH SLASH CXXFP CFP OFP MAKELIB RMCOMMAND LINK LINK_CONSOLE EXE PRIMARY_TARGET PLUGIN_LIBNAME_TRANSFORMATION COMMAND_SEPARATOR CD_UP_ONE CD_UP_TWO CD_UP_THREE VERSION VER_STRING REL_STRING EXTRA_LINK_OPTS GUI_NON_PLUGIN_OBJS GUI_PLUGIN_OBJS IODEV_NON_PLUGIN_OBJS IODEV_PLUGIN_OBJS PLUGIN_VAR PLUGIN_TARGET INSTALL_PLUGINS_VAR GZIP TAR LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
@ -37712,10 +37712,11 @@ _ACEOF
|
||||
esac
|
||||
|
||||
DIALOG_OBJS=""
|
||||
EXPORT_DYNAMIC="-export-dynamic"
|
||||
case $target in
|
||||
*-pc-windows* | *-pc-winnt* | *-cygwin* | *-mingw*)
|
||||
if test "$bx_plugins" = 1; then
|
||||
echo "$as_me:$LINENO: checking for opendir in -lmingwex" >&5
|
||||
if test "$bx_plugins" = 1; then
|
||||
echo "$as_me:$LINENO: checking for opendir in -lmingwex" >&5
|
||||
echo $ECHO_N "checking for opendir in -lmingwex... $ECHO_C" >&6
|
||||
if test "${ac_cv_lib_mingwex_opendir+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
@ -37783,16 +37784,18 @@ if test $ac_cv_lib_mingwex_opendir = yes; then
|
||||
LIBS="$LIBS -lmingwex"
|
||||
fi
|
||||
|
||||
# set variables for building DLL plugins
|
||||
PRIMARY_TARGET=".win32_dll_plugin_target"
|
||||
PLUGIN_LIBNAME_TRANSFORMATION='%.o=bx_%.dll'
|
||||
# set variables for building DLL plugins
|
||||
PRIMARY_TARGET=".win32_dll_plugin_target"
|
||||
PLUGIN_LIBNAME_TRANSFORMATION='%.o=bx_%.dll'
|
||||
INSTALL_PLUGINS_VAR=install_dll_plugins
|
||||
fi
|
||||
fi
|
||||
DIALOG_OBJS="win32dialog.o"
|
||||
EXPORT_DYNAMIC=""
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
|
||||
if test "$use_curses" = yes -a "$cross_configure" = 0; then
|
||||
echo "$as_me:$LINENO: checking for mvaddch in -lcurses" >&5
|
||||
echo $ECHO_N "checking for mvaddch in -lcurses... $ECHO_C" >&6
|
||||
@ -40027,6 +40030,7 @@ s,@GUI_CXXFLAGS@,$GUI_CXXFLAGS,;t t
|
||||
s,@WX_CFLAGS@,$WX_CFLAGS,;t t
|
||||
s,@WX_CXXFLAGS@,$WX_CXXFLAGS,;t t
|
||||
s,@DIALOG_OBJS@,$DIALOG_OBJS,;t t
|
||||
s,@EXPORT_DYNAMIC@,$EXPORT_DYNAMIC,;t t
|
||||
s,@PTHREAD_CC@,$PTHREAD_CC,;t t
|
||||
s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t
|
||||
s,@PTHREAD_CFLAGS@,$PTHREAD_CFLAGS,;t t
|
||||
|
||||
@ -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.288 2005-06-05 18:42:50 vruppert Exp $]])
|
||||
AC_REVISION([[$Id: configure.in,v 1.289 2005-06-13 20:26:55 vruppert Exp $]])
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
AC_CONFIG_HEADER(ltdlconf.h)
|
||||
|
||||
@ -2445,19 +2445,22 @@ case "$target" in
|
||||
esac
|
||||
|
||||
DIALOG_OBJS=""
|
||||
EXPORT_DYNAMIC="-export-dynamic"
|
||||
case $target in
|
||||
*-pc-windows* | *-pc-winnt* | *-cygwin* | *-mingw*)
|
||||
if test "$bx_plugins" = 1; then
|
||||
AC_CHECK_LIB(mingwex, opendir, LIBS="$LIBS -lmingwex")
|
||||
# set variables for building DLL plugins
|
||||
PRIMARY_TARGET=".win32_dll_plugin_target"
|
||||
PLUGIN_LIBNAME_TRANSFORMATION='%.o=bx_%.dll'
|
||||
if test "$bx_plugins" = 1; then
|
||||
AC_CHECK_LIB(mingwex, opendir, LIBS="$LIBS -lmingwex")
|
||||
# set variables for building DLL plugins
|
||||
PRIMARY_TARGET=".win32_dll_plugin_target"
|
||||
PLUGIN_LIBNAME_TRANSFORMATION='%.o=bx_%.dll'
|
||||
INSTALL_PLUGINS_VAR=install_dll_plugins
|
||||
fi
|
||||
fi
|
||||
DIALOG_OBJS="win32dialog.o"
|
||||
EXPORT_DYNAMIC=""
|
||||
;;
|
||||
esac
|
||||
AC_SUBST(DIALOG_OBJS)
|
||||
AC_SUBST(EXPORT_DYNAMIC)
|
||||
|
||||
if test "$use_curses" = yes -a "$cross_configure" = 0; then
|
||||
AC_CHECK_LIB(curses, mvaddch, GUI_LINK_OPTS_TERM='-lcurses')
|
||||
|
||||
Loading…
Reference in New Issue
Block a user