mirror of
https://github.com/mamedev/mame.git
synced 2024-11-16 07:48:32 +01:00
Followup to r767:
* submit changes to makefile omitted in r767
This commit is contained in:
parent
9c460a6248
commit
504337cfb1
1 changed files with 14 additions and 0 deletions
14
makefile
14
makefile
|
@ -43,6 +43,9 @@ ifndef OSD
|
|||
OSD = windows
|
||||
endif
|
||||
|
||||
ifndef CROSS_BUILD_OSD
|
||||
CROSS_BUILD_OSD = $(OSD)
|
||||
endif
|
||||
|
||||
|
||||
#-------------------------------------------------
|
||||
|
@ -187,6 +190,10 @@ ifeq ($(TARGETOS),os2)
|
|||
EXE = .exe
|
||||
endif
|
||||
|
||||
ifndef BUILD_EXE
|
||||
BUILD_EXE = $(EXE)
|
||||
endif
|
||||
|
||||
# compiler, linker and utilities
|
||||
AR = @ar
|
||||
CC = @gcc
|
||||
|
@ -442,7 +449,13 @@ endif
|
|||
|
||||
all: maketree buildtools emulator tools
|
||||
|
||||
#-------------------------------------------------
|
||||
# defines needed by multiple make files
|
||||
#-------------------------------------------------
|
||||
|
||||
BUILDSRC = $(SRC)/build
|
||||
BUILDOBJ = $(OBJ)/build
|
||||
BUILDOUT = $(BUILDOBJ)
|
||||
|
||||
#-------------------------------------------------
|
||||
# include the various .mak files
|
||||
|
@ -456,6 +469,7 @@ include $(SRC)/$(TARGET)/$(SUBTARGET).mak
|
|||
include $(SRC)/emu/emu.mak
|
||||
include $(SRC)/lib/lib.mak
|
||||
include $(SRC)/build/build.mak
|
||||
-include $(SRC)/osd/$(CROSS_BUILD_OSD)/build.mak
|
||||
include $(SRC)/tools/tools.mak
|
||||
|
||||
# combine the various definitions to one
|
||||
|
|
Loading…
Reference in a new issue