mirror of
https://github.com/holub/mame
synced 2025-04-17 22:13:04 +03:00
changed .build to build to be visible (nw)
This commit is contained in:
parent
c9dec81990
commit
53340a5f89
2
.gitignore
vendored
2
.gitignore
vendored
@ -17,4 +17,4 @@ src/regtests/chdman/temp
|
||||
src/regtests/jedutil/output
|
||||
/sta
|
||||
*.pyc
|
||||
/.build
|
||||
/build
|
40
makefile
40
makefile
@ -158,7 +158,7 @@ else
|
||||
COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))"
|
||||
endif
|
||||
|
||||
GENDIR = .build/generated
|
||||
GENDIR = build/generated
|
||||
|
||||
PYTHON = @python
|
||||
CC = @gcc
|
||||
@ -201,7 +201,7 @@ endif
|
||||
ifndef COMPILE
|
||||
$(SILENT) $(GENIE) $(PARAMS) --gcc=mingw64-gcc --targetos=windows --osd=$(OSD) --gcc_version=$(GCC_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
|
||||
endif
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-mingw64-gcc config=$(CONFIG)64 WINDRES=$(WINDRES)
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-mingw64-gcc config=$(CONFIG)64 WINDRES=$(WINDRES)
|
||||
|
||||
windows_x86: generate
|
||||
ifndef MINGW32
|
||||
@ -210,7 +210,7 @@ endif
|
||||
ifndef COMPILE
|
||||
$(SILENT) $(GENIE) $(PARAMS) --gcc=mingw32-gcc --targetos=windows --osd=$(OSD) --gcc_version=$(GCC_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
|
||||
endif
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-mingw32-gcc config=$(CONFIG)32 WINDRES=$(WINDRES)
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-mingw32-gcc config=$(CONFIG)32 WINDRES=$(WINDRES)
|
||||
|
||||
windows_x64_clang: generate
|
||||
ifndef CLANG
|
||||
@ -219,7 +219,7 @@ endif
|
||||
ifndef COMPILE
|
||||
$(SILENT) $(GENIE) $(PARAMS) --gcc=mingw-clang --targetos=windows --osd=$(OSD) --gcc_version=$(CLANG_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
|
||||
endif
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-mingw-clang config=$(CONFIG)64 WINDRES=$(WINDRES)
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-mingw-clang config=$(CONFIG)64 WINDRES=$(WINDRES)
|
||||
|
||||
windows_x86_clang: generate
|
||||
ifndef CLANG
|
||||
@ -228,7 +228,7 @@ endif
|
||||
ifndef COMPILE
|
||||
$(SILENT) $(GENIE) $(PARAMS) --gcc=mingw-clang --targetos=windows --osd=$(OSD) --gcc_version=$(CLANG_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
|
||||
endif
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-mingw-clang config=$(CONFIG)32 WINDRES=$(WINDRES)
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-mingw-clang config=$(CONFIG)32 WINDRES=$(WINDRES)
|
||||
|
||||
vs2010: generate
|
||||
$(SILENT) $(GENIE) $(PARAMS) --targetos=$(TARGETOS) --osd=windows --target=$(TARGET) --subtarget=$(SUBTARGET) vs2010
|
||||
@ -264,7 +264,7 @@ endif
|
||||
ifndef COMPILE
|
||||
$(SILENT) $(GENIE) --gcc=android-arm --osd=osdmini --target=$(TARGET) --gcc_version=4.8 --subtarget=$(SUBTARGET) gmake
|
||||
endif
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-android-arm config=$(CONFIG)
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-android-arm config=$(CONFIG)
|
||||
|
||||
android-mips: generate
|
||||
ifndef ANDROID_NDK_MIPS
|
||||
@ -276,7 +276,7 @@ endif
|
||||
ifndef COMPILE
|
||||
$(SILENT) $(GENIE) --gcc=android-mips --osd=osdmini --target=$(TARGET) --gcc_version=4.8 --subtarget=$(SUBTARGET) gmake
|
||||
endif
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-android-mips config=$(CONFIG)
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-android-mips config=$(CONFIG)
|
||||
|
||||
android-x86: generate
|
||||
ifndef ANDROID_NDK_X86
|
||||
@ -288,7 +288,7 @@ endif
|
||||
ifndef COMPILE
|
||||
$(SILENT) $(GENIE) --gcc=android-x86 --osd=osdmini --target=$(TARGET) --gcc_version=4.8 --subtarget=$(SUBTARGET) gmake
|
||||
endif
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-android-x86 config=$(CONFIG)
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-android-x86 config=$(CONFIG)
|
||||
|
||||
asmjs: generate
|
||||
ifndef EMSCRIPTEN
|
||||
@ -297,7 +297,7 @@ endif
|
||||
ifndef COMPILE
|
||||
$(SILENT) $(GENIE) --gcc=asmjs --gcc_version=4.8 --osd=osdmini --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
|
||||
endif
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-asmjs config=$(CONFIG)
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-asmjs config=$(CONFIG)
|
||||
|
||||
nacl_x64: generate
|
||||
ifndef NACL_SDK_ROOT
|
||||
@ -306,7 +306,7 @@ endif
|
||||
ifndef COMPILE
|
||||
$(SILENT) $(GENIE) --gcc=nacl --gcc_version=4.8 --osd=osdmini --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
|
||||
endif
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-nacl config=$(CONFIG)64
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-nacl config=$(CONFIG)64
|
||||
|
||||
nacl_x86: generate
|
||||
ifndef NACL_SDK_ROOT
|
||||
@ -315,7 +315,7 @@ endif
|
||||
ifndef COMPILE
|
||||
$(SILENT) $(GENIE) --gcc=nacl --gcc_version=4.8 --osd=osdmini --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
|
||||
endif
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-nacl config=$(CONFIG)32
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-nacl config=$(CONFIG)32
|
||||
|
||||
nacl-arm: generate
|
||||
ifndef NACL_SDK_ROOT
|
||||
@ -324,7 +324,7 @@ endif
|
||||
ifndef COMPILE
|
||||
$(SILENT) $(GENIE) --gcc=nacl-arm --gcc_version=4.8 --osd=osdmini --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
|
||||
endif
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-nacl-arm config=$(CONFIG)
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-nacl-arm config=$(CONFIG)
|
||||
|
||||
pnacl: generate
|
||||
ifndef NACL_SDK_ROOT
|
||||
@ -333,50 +333,50 @@ endif
|
||||
ifndef COMPILE
|
||||
$(SILENT) $(GENIE) --gcc=pnacl --gcc_version=4.8 --osd=osdmini --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
|
||||
endif
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-pnacl config=$(CONFIG)
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-pnacl config=$(CONFIG)
|
||||
|
||||
linux_x64: generate
|
||||
ifndef COMPILE
|
||||
$(SILENT) $(GENIE) $(PARAMS) --gcc=linux-gcc --targetos=$(TARGETOS) --osd=$(OSD) --gcc_version=$(GCC_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
|
||||
endif
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-linux config=$(CONFIG)64
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-linux config=$(CONFIG)64
|
||||
|
||||
linux_x86: generate
|
||||
ifndef COMPILE
|
||||
$(SILENT) $(GENIE) $(PARAMS) --gcc=linux-gcc --targetos=$(TARGETOS) --osd=$(OSD) --gcc_version=$(GCC_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
|
||||
endif
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-linux config=$(CONFIG)32
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-linux config=$(CONFIG)32
|
||||
|
||||
linux_x64_clang: generate
|
||||
ifndef COMPILE
|
||||
$(SILENT) $(GENIE) $(PARAMS) --gcc=linux-clang --targetos=$(TARGETOS) --osd=$(OSD) --gcc_version=$(CLANG_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
|
||||
endif
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-linux-clang config=$(CONFIG)64
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-linux-clang config=$(CONFIG)64
|
||||
|
||||
linux_x86_clang: generate
|
||||
ifndef COMPILE
|
||||
$(SILENT) $(GENIE) $(PARAMS) --gcc=linux-clang --targetos=$(TARGETOS) --osd=$(OSD) --gcc_version=$(CLANG_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
|
||||
endif
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-linux-clang config=$(CONFIG)32
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-linux-clang config=$(CONFIG)32
|
||||
|
||||
macosx_x64: generate
|
||||
ifndef COMPILE
|
||||
$(SILENT) $(GENIE) $(PARAMS) --gcc=osx --targetos=macosx --osd=$(OSD) --gcc_version=$(GCC_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
|
||||
endif
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-osx config=$(CONFIG)64
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-osx config=$(CONFIG)64
|
||||
|
||||
macosx_x86: generate
|
||||
ifndef COMPILE
|
||||
$(SILENT) $(GENIE) $(PARAMS) --gcc=osx --targetos=macosx --os_version=$(DARWIN_VERSION) --osd=$(OSD) --gcc_version=$(GCC_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
|
||||
endif
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-osx config=$(CONFIG)32
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-osx config=$(CONFIG)32
|
||||
|
||||
$(GENIE):
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C 3rdparty/genie/build/gmake.$(OS) -f genie.make
|
||||
|
||||
clean:
|
||||
@echo Cleaning...
|
||||
-@rm -rf .build
|
||||
-@rm -rf build
|
||||
$(SILENT) $(MAKE) --no-print-directory -R -C 3rdparty/genie/build/gmake.$(OS) -f genie.make clean
|
||||
|
||||
GEN_FOLDERS := \
|
||||
|
@ -1,7 +1,7 @@
|
||||
premake.check_paths = true
|
||||
premake.make.override = { "TARGET" }
|
||||
MAME_DIR = (path.getabsolute("..") .. "/")
|
||||
local MAME_BUILD_DIR = (MAME_DIR .. ".build/")
|
||||
local MAME_BUILD_DIR = (MAME_DIR .. "build/")
|
||||
local naclToolchain = ""
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user