Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-05 18:08:04 +03:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

minus sign in subtarget creates problems (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2016-05-01 12:37:48 +02:00
parent 4ee5dd2714
commit 4f3b0234ea
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
makefile
View File

@ -211,6 +211,9 @@ ifndef SUBTARGET
SUBTARGET := $(TARGET) SUBTARGET := $(TARGET)
endif endif
SUBTARGET_FULL := $(subst -,_,$(SUBTARGET))
CONFIG = release CONFIG = release
ifdef DEBUG ifdef DEBUG
CONFIG := debug CONFIG := debug
@ -578,8 +581,8 @@ ifdef TARGET
PARAMS += --target='$(TARGET)' PARAMS += --target='$(TARGET)'
endif endif
ifdef SUBTARGET ifdef SUBTARGET_FULL
PARAMS += --subtarget='$(SUBTARGET)' PARAMS += --subtarget='$(SUBTARGET_FULL)'
endif endif
ifdef OSD ifdef OSD
@ -757,15 +760,15 @@ SCRIPTS = scripts/genie.lua \
scripts/toolchain.lua \ scripts/toolchain.lua \
scripts/src/osd/modules.lua \ scripts/src/osd/modules.lua \
$(wildcard src/osd/$(OSD)/$(OSD).mak) \ $(wildcard src/osd/$(OSD)/$(OSD).mak) \
$(wildcard src/$(TARGET)/$(SUBTARGET).mak) $(wildcard src/$(TARGET)/$(SUBTARGET_FULL).mak)
ifeq ($(SUBTARGET),mame) ifeq ($(SUBTARGET_FULL),mame)
SCRIPTS += scripts/target/$(TARGET)/arcade.lua SCRIPTS += scripts/target/$(TARGET)/arcade.lua
SCRIPTS += scripts/target/$(TARGET)/mess.lua SCRIPTS += scripts/target/$(TARGET)/mess.lua
endif endif
ifndef SOURCES ifndef SOURCES
SCRIPTS += scripts/target/$(TARGET)/$(SUBTARGET).lua SCRIPTS += scripts/target/$(TARGET)/$(SUBTARGET_FULL).lua
endif endif
ifdef REGENIE ifdef REGENIE
@ -809,12 +812,12 @@ SRC = src
# all 3rd party sources are under the 3rdparty/ directory # all 3rd party sources are under the 3rdparty/ directory
3RDPARTY = 3rdparty 3RDPARTY = 3rdparty
ifeq ($(SUBTARGET),mame) ifeq ($(SUBTARGET_FULL),mame)
PROJECT_NAME := $(SUBTARGET) PROJECT_NAME := $(SUBTARGET_FULL)
else ifeq ($(SUBTARGET),mess) else ifeq ($(SUBTARGET_FULL),mess)
PROJECT_NAME := $(SUBTARGET) PROJECT_NAME := $(SUBTARGET_FULL)
else else
PROJECT_NAME := $(TARGET)$(SUBTARGET) PROJECT_NAME := $(TARGET)$(SUBTARGET_FULL))
endif endif
@ -892,10 +895,10 @@ endif
GENIE := 3rdparty/genie/bin/$(GENIEOS)/genie$(EXE) GENIE := 3rdparty/genie/bin/$(GENIEOS)/genie$(EXE)
ifeq ($(TARGET),$(SUBTARGET)) ifeq ($(TARGET),$(SUBTARGET_FULL))
FULLTARGET := $(TARGET) FULLTARGET := $(TARGET)
else else
FULLTARGET := $(TARGET)$(SUBTARGET) FULLTARGET := $(TARGET)$(SUBTARGET_FULL)
endif endif
PROJECTDIR := $(BUILDDIR)/projects/$(OSD)/$(FULLTARGET) PROJECTDIR := $(BUILDDIR)/projects/$(OSD)/$(FULLTARGET)
PROJECTDIR_SDL := $(BUILDDIR)/projects/sdl/$(FULLTARGET) PROJECTDIR_SDL := $(BUILDDIR)/projects/sdl/$(FULLTARGET)
@ -1433,7 +1436,7 @@ clean: genieclean
$(SILENT) $(MAKE) -C $(SRC)/devices/cpu/m68000 clean $(SILENT) $(MAKE) -C $(SRC)/devices/cpu/m68000 clean
-@rm -rf 3rdparty/bgfx/.build -@rm -rf 3rdparty/bgfx/.build
GEN_FOLDERS := $(GENDIR)/$(TARGET)/layout/ $(GENDIR)/$(TARGET)/$(SUBTARGET)/ GEN_FOLDERS := $(GENDIR)/$(TARGET)/layout/ $(GENDIR)/$(TARGET)/$(SUBTARGET_FULL)/
rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d)) rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d))
LAYOUTS=$(wildcard $(SRC)/$(TARGET)/layout/*.lay) LAYOUTS=$(wildcard $(SRC)/$(TARGET)/layout/*.lay)