From 88940550a1471d89b47bd07fca039bcf00b8851a Mon Sep 17 00:00:00 2001 From: Couriersud Date: Tue, 5 Feb 2008 22:32:11 +0000 Subject: [PATCH] makefiles: * move verinfo.c to src/build * move rules for verinfo to src/build/build.mak --- .gitattributes | 2 +- src/build/build.mak | 14 +++++++++++++- src/{osd/windows => build}/verinfo.c | 0 src/osd/windows/windows.mak | 9 --------- 4 files changed, 14 insertions(+), 11 deletions(-) rename src/{osd/windows => build}/verinfo.c (100%) diff --git a/.gitattributes b/.gitattributes index 33f6b5ce30d..01c152b479c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,6 +8,7 @@ docs/windows.txt svneol=native#text/plain src/build/build.mak svneol=native#text/plain src/build/file2str.c svneol=native#text/plain src/build/png2bdc.c svneol=native#text/plain +src/build/verinfo.c svneol=native#text/plain src/emu/attotime.c svneol=native#text/plain src/emu/attotime.h svneol=native#text/plain src/emu/audio/generic.c svneol=native#text/plain @@ -3293,7 +3294,6 @@ src/osd/windows/sound.h svneol=native#text/plain src/osd/windows/strconv.c svneol=native#text/plain src/osd/windows/strconv.h svneol=native#text/plain src/osd/windows/vconv.c svneol=native#text/plain -src/osd/windows/verinfo.c svneol=native#text/plain src/osd/windows/video.c svneol=native#text/plain src/osd/windows/video.h svneol=native#text/plain src/osd/windows/winalloc.c svneol=native#text/plain diff --git a/src/build/build.mak b/src/build/build.mak index a69ed7be99e..beab1a9949e 100644 --- a/src/build/build.mak +++ b/src/build/build.mak @@ -57,5 +57,17 @@ $(PNG2BDC): $(PNG2BDCOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT) @echo Linking $@... $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ -endif +#------------------------------------------------- +# rule for making the verinfo tool +#------------------------------------------------- +VERINFO = $(BUILDOBJ)/verinfo$(EXE) + +VERINFOOBJS = \ + $(BUILDOBJ)/verinfo.o + +$(VERINFO): $(VERINFOOBJS) $(LIBOCORE) + @echo Linking $@... + $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ + +endif diff --git a/src/osd/windows/verinfo.c b/src/build/verinfo.c similarity index 100% rename from src/osd/windows/verinfo.c rename to src/build/verinfo.c diff --git a/src/osd/windows/windows.mak b/src/osd/windows/windows.mak index 837519c9d3f..eeb38cfe8e1 100644 --- a/src/osd/windows/windows.mak +++ b/src/osd/windows/windows.mak @@ -289,17 +289,8 @@ $(LEDUTIL): $(LEDUTILOBJS) $(LIBOCORE) # rule for making the verinfo tool #------------------------------------------------- -VERINFO = $(WINOBJ)/verinfo$(EXE) - ifneq ($(CROSS_BUILD),1) BUILD += $(VERINFO) - -VERINFOOBJS = \ - $(WINOBJ)/verinfo.o - -$(VERINFO): $(VERINFOOBJS) $(LIBOCORE) - @echo Linking $@... - $(LD) $(LDFLAGS) $^ $(LIBS) -o $@ endif