- fix stupidity that I added in 1.109. It was putting bximage.o into the
source directory instead of the build directory.
This commit is contained in:
parent
26e07e1ac4
commit
1fec3f065e
@ -224,12 +224,12 @@ bochs_plugins:
|
||||
cd gui && $(MAKE) plugins
|
||||
cd iodev && $(MAKE) plugins
|
||||
|
||||
bximage@EXE@: $(srcdir)/misc/bximage.o
|
||||
@LINK_CONSOLE@ $(srcdir)/misc/bximage.o
|
||||
bximage@EXE@: misc/bximage.o
|
||||
@LINK_CONSOLE@ misc/bximage.o
|
||||
|
||||
# compile with console CXXFLAGS, not gui CXXFLAGS
|
||||
misc/bximage.o: misc/bximage.c
|
||||
$(CC) @DASH@c $(BX_INCDIRS) $(CFLAGS_CONSOLE) @CXXFP@misc/bximage.c @OFP@$@
|
||||
misc/bximage.o: $(srcdir)/misc/bximage.c
|
||||
$(CC) @DASH@c $(BX_INCDIRS) $(CFLAGS_CONSOLE) @CXXFP@$(srcdir)/misc/bximage.c @OFP@$@
|
||||
|
||||
niclist@EXE@: misc/niclist.o
|
||||
@LINK@ misc/niclist.o
|
||||
@ -239,7 +239,7 @@ $(BX_OBJS): $(BX_INCLUDES)
|
||||
bxversion.h:
|
||||
$(RM) -f bxversion.h
|
||||
echo '/////////////////////////////////////////////////////////////////////////' > bxversion.h
|
||||
echo '// $$Id: Makefile.in,v 1.123 2002-12-05 18:12:35 bdenney Exp $$' >> bxversion.h
|
||||
echo '// $$Id: Makefile.in,v 1.124 2002-12-06 19:45:49 bdenney 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
|
||||
|
Loading…
Reference in New Issue
Block a user