From 1641a90c3f57a629e8b89a8430558d4fc92f7984 Mon Sep 17 00:00:00 2001 From: Volker Ruppert Date: Sat, 24 May 2003 23:49:38 +0000 Subject: [PATCH] - .win32_dll_plugin_target still needs $(GUI_LINK_OPTS) since there is some gui-dependent stuff in main.cc (SDL redefines 'main', win32 console creation for SDL and wxMSW). --- bochs/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bochs/Makefile.in b/bochs/Makefile.in index 64f144b10..4f333acd1 100644 --- a/bochs/Makefile.in +++ b/bochs/Makefile.in @@ -209,7 +209,7 @@ bochs@EXE@: @IODEV_LIB_VAR@ @DEBUGGER_VAR@ \ @IODEV_LIB_VAR@ cpu/libcpu.a memory/libmemory.a gui/libgui.a \ @DEBUGGER_VAR@ @DISASM_VAR@ @INSTRUMENT_VAR@ @PLUGIN_VAR@ \ @GDBSTUB_VAR@ @FPU_VAR@ \ - @NONPLUGIN_GUI_LINK_OPTS@ \ + $(GUI_LINK_OPTS) \ $(MCH_LINK_FLAGS) \ $(SIMX86_LINK_FLAGS) \ $(READLINE_LIB) \ @@ -242,7 +242,7 @@ $(BX_OBJS): $(BX_INCLUDES) bxversion.h: $(RM) -f bxversion.h echo '/////////////////////////////////////////////////////////////////////////' > bxversion.h - echo '// $$Id: Makefile.in,v 1.149 2003-05-24 17:09:21 vruppert Exp $$' >> bxversion.h + echo '// $$Id: Makefile.in,v 1.150 2003-05-24 23:49:38 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