Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-02 02:49:44 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

From: Atari Ace [mailto:atari_ace@verizon.net]

Browse Source 
Subject: [patch] make MSVC_BUILD=1 -j<n> build fix

Hi mamedev,

The following build tweak fixes make MSVC_BUILD=1 -j2.  It also fixes
an oversight in the cross-build support.

~aa
This commit is contained in:
Aaron Giles 2008-06-26 15:27:12 +00:00
parent 661cf76098
commit ba2fb8554b
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/build/build.mak
View File

@ -22,8 +22,6 @@ FILE2STR = $(BUILDOUT)/file2str$(BUILD_EXE)
PNG2BDC = $(BUILDOUT)/png2bdc$(BUILD_EXE)
VERINFO = $(BUILDOUT)/verinfo$(BUILD_EXE)
VERINFO = $(BUILDOUT)/verinfo$(EXE)
ifneq ($(CROSS_BUILD),1)
BUILD += \
$(FILE2STR) \

4
src/emu/cpu/cpu.mak
View File

@ -1066,12 +1066,12 @@ M68KMAKE = $(BUILDOUT)/m68kmake$(BUILD_EXE)
endif
# when we compile source files we need to include generated files from the OBJ directory
$(CPUOBJ)/m68000/%.o: $(CPUSRC)/m68000/%.c
$(CPUOBJ)/m68000/%.o: $(CPUSRC)/m68000/%.c | $(OSPREBUILD)
@echo Compiling $<...
$(CC) $(CDEFS) $(CFLAGS) -I$(CPUOBJ)/m68000 -c $< -o $@
# when we compile generated files we need to include stuff from the src directory
$(CPUOBJ)/m68000/%.o: $(CPUOBJ)/m68000/%.c
$(CPUOBJ)/m68000/%.o: $(CPUOBJ)/m68000/%.c | $(OSPREBUILD)
@echo Compiling $<...
$(CC) $(CDEFS) $(CFLAGS) -I$(CPUSRC)/m68000 -c $< -o $@

2
src/osd/windows/windows.mak
View File

@ -133,7 +133,7 @@ endif
DEFS += -D_CRT_SECURE_NO_DEPRECATE -DXML_STATIC -D__inline__=__inline -Dsnprintf=_snprintf
# make msvcprep into a pre-build step
# OSPREBUILD = $(VCONV)
OSPREBUILD = $(VCONV)
ifneq ($(CROSS_BUILD),1)
# add VCONV to the build tools