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

The floppy plugin needs a special rule for MSVC nmake

Browse Source 
Temporarily added a voodoo plugin rule to have the iodev/display section complete.
This commit is contained in:
Volker Ruppert 2014-04-24 20:10:55 +00:00
parent be6d2668c7
commit 92b529ee75
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bochs/iodev/Makefile.in
View File

@ -56,6 +56,8 @@ GAME_LINK_OPTS = -lwinmm
GAME_LINK_OPTS_VCPP = winmm.lib
SER_LINK_OPTS = -lws2_32
SER_LINK_OPTS_VCPP = user32.lib ws2_32.lib
FDC_LINK_OPTS =
FDC_LINK_OPTS_VCPP = user32.lib
PCIDEV_CXXFLAGS = -I$(srcdir)/../host/linux/pcidev
@ -99,7 +101,7 @@ plugins: @PLUGIN_TARGET_2@
plugins_gcc: $(PLUGIN_OBJS:@PLUGIN_LIBNAME_TRANSFORMATION@)
plugins_msvc: bx_keyboard.dll bx_pit.dll bx_gameport.dll bx_serial.dll
plugins_msvc: bx_keyboard.dll bx_pit.dll bx_gameport.dll bx_serial.dll bx_floppy.dll
@echo ERROR: MSVC nmake plugin support not yet complete
@exit 1
@ -152,6 +154,9 @@ bx_gameport.dll: gameport.o
bx_serial.dll: serial.o serial_raw.o
@LINK_DLL@ serial.o serial_raw.o $(WIN32_DLL_IMPORT_LIBRARY) $(SER_LINK_OPTS@LINK_VAR@)
bx_floppy.dll: floppy.o
@LINK_DLL@ floppy.o $(WIN32_DLL_IMPORT_LIBRARY) $(FDC_LINK_OPTS@LINK_VAR@)
##### end DLL section
clean:

7
bochs/iodev/display/Makefile.in
View File

@ -70,9 +70,7 @@ plugins: @PLUGIN_TARGET_2@
plugins_gcc: $(PLUGIN_OBJS:@PLUGIN_LIBNAME_TRANSFORMATION@)
plugins_msvc: bx_vga.dll bx_svga_cirrus.dll
@echo ERROR: MSVC nmake plugin support not yet complete
@exit 1
plugins_msvc: bx_vga.dll bx_svga_cirrus.dll bx_voodoo.dll
libdisplay.a: $(NONPLUGIN_OBJS)
@RMCOMMAND@ libdisplay.a
@ -108,6 +106,9 @@ bx_vga.dll: vga.o vgacore.o
bx_svga_cirrus.dll: svga_cirrus.o vgacore.o
@LINK_DLL@ svga_cirrus.o vgacore.o $(WIN32_DLL_IMPORT_LIBRARY)
bx_voodoo.dll: voodoo.o
@LINK_DLL@ voodoo.o $(WIN32_DLL_IMPORT_LIBRARY)
##### end DLL section
clean: