Added separate target for MSVC plugins (causing an error for now)

This commit is contained in:
Volker Ruppert 2014-04-06 07:22:16 +00:00
parent 777fcd8372
commit 2777ac0dc5
8 changed files with 57 additions and 12 deletions

View File

@ -447,6 +447,7 @@ if test "$bx_plugins" = 1; then
fi
fi
PLUGIN_TARGET=bochs_plugins
PLUGIN_TARGET_2=plugins_gcc
INSTALL_PLUGINS_VAR=install_libtool_plugins
NONPLUGIN_GUI_LINK_OPTS=''
else
@ -2533,6 +2534,7 @@ case $target in
PLUGIN_LIBNAME_TRANSFORMATION='%.o=bx_%.dll'
INSTALL_PLUGINS_VAR=install_dll_plugins
LIBS="$LIBS advapi32.lib comctl32.lib comdlg32.lib gdi32.lib shell32.lib user32.lib"
PLUGIN_TARGET_2=plugins_msvc
else
if test "$with_win32" != yes; then
LIBS="$LIBS comctl32.lib"
@ -2915,6 +2917,7 @@ AC_SUBST(IODEV_EXT_PLUGIN_OBJS)
AC_SUBST(PLUGIN_VAR)
AC_SUBST(PLUGIN_LIB)
AC_SUBST(PLUGIN_TARGET)
AC_SUBST(PLUGIN_TARGET_2)
AC_SUBST(INSTALL_PLUGINS_VAR)
AC_PATH_PROG(GZIP, gzip)

View File

@ -1,4 +1,4 @@
# Copyright (C) 2001-2013 The Bochs Project
# Copyright (C) 2001-2014 The Bochs Project
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@ -94,7 +94,13 @@ PLUGIN_OBJS = @GUI_PLUGIN_OBJS@
all: libgui.a
plugins: $(PLUGIN_OBJS:@PLUGIN_LIBNAME_TRANSFORMATION@)
plugins: @PLUGIN_TARGET_2@
plugins_gcc: $(PLUGIN_OBJS:@PLUGIN_LIBNAME_TRANSFORMATION@)
plugins_msvc:
@echo ERROR: MSVC nmake plugins not yet supported
@exit 1
libgui.a: $(NONPLUGIN_OBJS)
@RMCOMMAND@ libgui.a

View File

@ -90,7 +90,13 @@ PLUGIN_OBJS = @IODEV_PLUGIN_OBJS@
all: libiodev.a
plugins: $(PLUGIN_OBJS:@PLUGIN_LIBNAME_TRANSFORMATION@)
plugins: @PLUGIN_TARGET_2@
plugins_gcc: $(PLUGIN_OBJS:@PLUGIN_LIBNAME_TRANSFORMATION@)
plugins_msvc:
@echo ERROR: MSVC nmake plugins not yet supported
@exit 1
libiodev.a: $(NONPLUGIN_OBJS)
@RMCOMMAND@ libiodev.a

View File

@ -1,4 +1,4 @@
# Copyright (C) 2012-2013 The Bochs Project
# Copyright (C) 2012-2014 The Bochs Project
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@ -66,7 +66,13 @@ PLUGIN_OBJS = @IODEV_EXT_PLUGIN_OBJS@
all: libdisplay.a
plugins: $(PLUGIN_OBJS:@PLUGIN_LIBNAME_TRANSFORMATION@)
plugins: @PLUGIN_TARGET_2@
plugins_gcc: $(PLUGIN_OBJS:@PLUGIN_LIBNAME_TRANSFORMATION@)
plugins_msvc:
@echo ERROR: MSVC nmake plugins not yet supported
@exit 1
libdisplay.a: $(NONPLUGIN_OBJS)
@RMCOMMAND@ libdisplay.a

View File

@ -1,4 +1,4 @@
# Copyright (C) 2012-2013 The Bochs Project
# Copyright (C) 2012-2014 The Bochs Project
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@ -69,7 +69,13 @@ PLUGIN_OBJS = @IODEV_EXT_PLUGIN_OBJS@
all: libhdimage.a
plugins: $(PLUGIN_OBJS:@PLUGIN_LIBNAME_TRANSFORMATION@)
plugins: @PLUGIN_TARGET_2@
plugins_gcc: $(PLUGIN_OBJS:@PLUGIN_LIBNAME_TRANSFORMATION@)
plugins_msvc:
@echo ERROR: MSVC nmake plugins not yet supported
@exit 1
libhdimage.a: $(NONPLUGIN_OBJS)
@RMCOMMAND@ libhdimage.a

View File

@ -88,7 +88,13 @@ PLUGIN_OBJS = @IODEV_EXT_PLUGIN_OBJS@
all: libnetwork.a
plugins: $(PLUGIN_OBJS:@PLUGIN_LIBNAME_TRANSFORMATION@)
plugins: @PLUGIN_TARGET_2@
plugins_gcc: $(PLUGIN_OBJS:@PLUGIN_LIBNAME_TRANSFORMATION@)
plugins_msvc:
@echo ERROR: MSVC nmake plugins not yet supported
@exit 1
libnetwork.a: $(NONPLUGIN_OBJS)
@RMCOMMAND@ libnetwork.a

View File

@ -1,4 +1,4 @@
# Copyright (C) 2012-2013 The Bochs Project
# Copyright (C) 2012-2014 The Bochs Project
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@ -67,7 +67,13 @@ SOUND_LINK_OPTS = @SOUND_LINK_OPTS@
all: libsound.a
plugins: $(PLUGIN_OBJS:@PLUGIN_LIBNAME_TRANSFORMATION@)
plugins: @PLUGIN_TARGET_2@
plugins_gcc: $(PLUGIN_OBJS:@PLUGIN_LIBNAME_TRANSFORMATION@)
plugins_msvc:
@echo ERROR: MSVC nmake plugins not yet supported
@exit 1
libsound.a: $(NONPLUGIN_OBJS)
@RMCOMMAND@ libsound.a

View File

@ -1,4 +1,4 @@
# Copyright (C) 2012-2013 The Bochs Project
# Copyright (C) 2012-2014 The Bochs Project
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@ -68,7 +68,13 @@ PLUGIN_OBJS = @IODEV_EXT_PLUGIN_OBJS@
all: libusb.a
plugins: $(PLUGIN_OBJS:@PLUGIN_LIBNAME_TRANSFORMATION@)
plugins: @PLUGIN_TARGET_2@
plugins_gcc: $(PLUGIN_OBJS:@PLUGIN_LIBNAME_TRANSFORMATION@)
plugins_msvc:
@echo ERROR: MSVC nmake plugins not yet supported
@exit 1
libusb.a: $(NONPLUGIN_OBJS)
@RMCOMMAND@ libusb.a