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