summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Couriersud <couriersud@users.noreply.github.com>2008-01-27 20:19:32 +0000
committer Couriersud <couriersud@users.noreply.github.com>2008-01-27 20:19:32 +0000
commit06cf28a0e69c57c4288e74d317633934b3d54e8d (patch)
tree6a0c017ff6ede4900475bfd765e9058956ab5a3c /src
parent65444cb34f7fcf0cc225ff36ff206708f4f93610 (diff)
build environment:
* added checks for CROSS_BUILD=1 to omit building m68kmake.exe, verinfo.exe, png2bdc.exe and file2str * enables building mame using mingw on linux
Diffstat (limited to 'src')
-rw-r--r--src/build/build.mak4
-rw-r--r--src/emu/cpu/cpu.mak9
-rw-r--r--src/osd/windows/windows.mak4
3 files changed, 13 insertions, 4 deletions
diff --git a/src/build/build.mak b/src/build/build.mak
index 9f2dc800142..a69ed7be99e 100644
--- a/src/build/build.mak
+++ b/src/build/build.mak
@@ -26,6 +26,7 @@ OBJDIRS += \
FILE2STR = $(BUILDOUT)/file2str$(EXE)
PNG2BDC = $(BUILDOUT)/png2bdc$(EXE)
+ifneq ($(CROSS_BUILD),1)
BUILD += \
$(FILE2STR) \
$(PNG2BDC) \
@@ -55,3 +56,6 @@ PNG2BDCOBJS = \
$(PNG2BDC): $(PNG2BDCOBJS) $(LIBUTIL) $(LIBOCORE) $(ZLIB) $(EXPAT)
@echo Linking $@...
$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
+
+endif
+
diff --git a/src/emu/cpu/cpu.mak b/src/emu/cpu/cpu.mak
index e788f0a9582..00db798e9d4 100644
--- a/src/emu/cpu/cpu.mak
+++ b/src/emu/cpu/cpu.mak
@@ -1019,6 +1019,7 @@ OBJDIRS += $(CPUOBJ)/m68000
CPUOBJS += $(CPUOBJ)/m68000/m68kcpu.o $(CPUOBJ)/m68000/m68kmame.o $(CPUOBJ)/m68000/m68kops.o
DBGOBJS += $(CPUOBJ)/m68000/m68kdasm.o
endif
+M68KMAKE = $(CPUOBJ)/m68000/m68kmake$(EXE)
# when we compile source files we need to include generated files from the OBJ directory
$(CPUOBJ)/m68000/%.o: $(CPUSRC)/m68000/%.c
@@ -1031,14 +1032,16 @@ $(CPUOBJ)/m68000/%.o: $(CPUOBJ)/m68000/%.c
$(CC) $(CDEFS) $(CFLAGS) -I$(CPUSRC)/m68000 -c $< -o $@
# rule to generate the C files
-$(CPUOBJ)/m68000/m68kops.c: $(CPUOBJ)/m68000/m68kmake$(EXE) $(CPUSRC)/m68000/m68k_in.c
+$(CPUOBJ)/m68000/m68kops.c: $(M68KMAKE) $(CPUSRC)/m68000/m68k_in.c
@echo Generating M68K source files...
- $(CPUOBJ)/m68000/m68kmake$(EXE) $(CPUOBJ)/m68000 $(CPUSRC)/m68000/m68k_in.c
+ $(M68KMAKE) $(CPUOBJ)/m68000 $(CPUSRC)/m68000/m68k_in.c
# rule to build the generator
-$(CPUOBJ)/m68000/m68kmake$(EXE): $(CPUOBJ)/m68000/m68kmake.o $(LIBOCORE)
+ifneq ($(CROSS_BUILD),1)
+$(M68KMAKE): $(CPUOBJ)/m68000/m68kmake.o $(LIBOCORE)
@echo Linking $@...
$(LD) $(LDFLAGS) $(OSDBGLDFLAGS) $^ $(LIBS) -o $@
+endif
# rule to ensure we build the header before building the core CPU file
$(CPUOBJ)/m68000/m68kcpu.o: $(CPUOBJ)/m68000/m68kops.c
diff --git a/src/osd/windows/windows.mak b/src/osd/windows/windows.mak
index 7e981958af7..b108c6479e1 100644
--- a/src/osd/windows/windows.mak
+++ b/src/osd/windows/windows.mak
@@ -290,6 +290,8 @@ $(LEDUTIL): $(LEDUTILOBJS) $(LIBOCORE)
#-------------------------------------------------
VERINFO = $(WINOBJ)/verinfo$(EXE)
+
+ifneq ($(CROSS_BUILD),1)
BUILD += $(VERINFO)
VERINFOOBJS = \
@@ -298,7 +300,7 @@ VERINFOOBJS = \
$(VERINFO): $(VERINFOOBJS) $(LIBOCORE)
@echo Linking $@...
$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
-
+endif