From 90e1bb074eede2936d5e7a79d5b7cf7dea2e66b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?= Date: Mon, 4 Jan 2021 22:36:50 -0800 Subject: [PATCH] Fixed makefile. --- makefile | 56 +++++++++++++++++++------------------------------------- 1 file changed, 19 insertions(+), 37 deletions(-) diff --git a/makefile b/makefile index 606b3fa..65744a5 100644 --- a/makefile +++ b/makefile @@ -42,7 +42,7 @@ projgen: ## Generate project files for all configurations. $(GENIE) --with-tools vs2017 $(GENIE) --with-tools --gcc=mingw-gcc gmake $(GENIE) --with-tools --gcc=linux-gcc gmake - $(GENIE) --with-tools --gcc=osx gmake + $(GENIE) --with-tools --gcc=osx-x64 gmake $(GENIE) --with-tools --xcode=osx xcode8 $(GENIE) --with-tools --xcode=ios xcode8 $(GENIE) --gcc=freebsd gmake @@ -153,13 +153,13 @@ vs2017-release64: .build/projects/vs2017 ## Build - vs2017 x64 Release devenv .build/projects/vs2017/bimg.sln /Build "Release|x64" vs2017: vs2017-debug32 vs2017-release32 vs2017-debug64 vs2017-release64 ## Build - vs2017 x86/x64 Debug and Release -.build/projects/gmake-osx: - $(GENIE) --with-tools --gcc=osx gmake -osx-debug64: .build/projects/gmake-osx ## Build - OSX x64 Debug - $(MAKE) -C .build/projects/gmake-osx config=debug64 -osx-release64: .build/projects/gmake-osx ## Build - OSX x64 Release - $(MAKE) -C .build/projects/gmake-osx config=release64 -osx: osx-debug64 osx-release64 ## Build - OSX x64 Debug and Release +.build/projects/gmake-osx-x64: + $(GENIE) --gcc=osx-x64 gmake +osx-x64-debug: .build/projects/gmake-osx-x64 + make -C .build/projects/gmake-osx config=debug +osx-x64-release: .build/projects/gmake-osx-x64 + make -C .build/projects/gmake-osx config=release +osx-x64: osx-x64-debug osx-x64-release .build/projects/gmake-ios-arm: $(GENIE) --gcc=ios-arm gmake @@ -201,7 +201,7 @@ rpi-release: .build/projects/gmake-rpi ## Build - RasberryPi Release $(MAKE) -R -C .build/projects/gmake-rpi config=release rpi: rpi-debug rpi-release ## Build - RasberryPi Debug and Release -build-darwin: osx +build-darwin: osx-x64 build-linux: linux-debug64 linux-release64 @@ -231,9 +231,9 @@ UNAME := $(shell uname) ifeq ($(UNAME),$(filter $(UNAME),Linux Darwin FreeBSD GNU/kFreeBSD)) ifeq ($(UNAME),$(filter $(UNAME),Darwin)) OS=darwin -BUILD_PROJECT_DIR=gmake-osx -BUILD_OUTPUT_DIR=osx64_clang -BUILD_TOOLS_CONFIG=release64 +BUILD_PROJECT_DIR=gmake-osx-x64 +BUILD_OUTPUT_DIR=osx-x64 +BUILD_TOOLS_CONFIG=release BUILD_TOOLS_SUFFIX=Release EXE= else @@ -284,33 +284,15 @@ clean-tools: ## Clean tools projects. -$(SILENT) rm -r .build/projects/$(BUILD_PROJECT_DIR) dist-windows: .build/projects/gmake-mingw-gcc - $(SILENT) $(MAKE) -C .build/projects/gmake-mingw-gcc config=release64 -j 6 geometryc - $(SILENT) cp .build/win64_mingw-gcc/bin/geometrycRelease.exe tools/bin/windows/geometryc.exe - $(SILENT) $(MAKE) -C .build/projects/gmake-mingw-gcc config=release64 -j 6 shaderc - $(SILENT) cp .build/win64_mingw-gcc/bin/shadercRelease.exe tools/bin/windows/shaderc.exe - $(SILENT) $(MAKE) -C .build/projects/gmake-mingw-gcc config=release64 -j 6 texturec - $(SILENT) cp .build/win64_mingw-gcc/bin/texturecRelease.exe tools/bin/windows/texturec.exe - $(SILENT) $(MAKE) -C .build/projects/gmake-mingw-gcc config=release64 -j 6 texturev - $(SILENT) cp .build/win64_mingw-gcc/bin/texturevRelease.exe tools/bin/windows/texturev.exe + $(SILENT) $(MAKE) -C .build/projects/gmake-mingw-gcc config=release64 -j 6 texturec + $(SILENT) cp .build/win64_mingw-gcc/bin/texturecRelease.exe tools/bin/windows/texturec.exe dist-linux: .build/projects/gmake-linux - $(SILENT) $(MAKE) -C .build/projects/gmake-linux config=release64 -j 6 geometryc - $(SILENT) cp .build/linux64_gcc/bin/geometrycRelease tools/bin/linux/geometryc - $(SILENT) $(MAKE) -C .build/projects/gmake-linux config=release64 -j 6 shaderc - $(SILENT) cp .build/linux64_gcc/bin/shadercRelease tools/bin/linux/shaderc - $(SILENT) $(MAKE) -C .build/projects/gmake-linux config=release64 -j 6 texturec - $(SILENT) cp .build/linux64_gcc/bin/texturecRelease tools/bin/linux/texturec - $(SILENT) $(MAKE) -C .build/projects/gmake-linux config=release64 -j 6 texturev - $(SILENT) cp .build/linux64_gcc/bin/texturevRelease tools/bin/linux/texturev + $(SILENT) $(MAKE) -C .build/projects/gmake-linux config=release64 -j 6 texturec + $(SILENT) cp .build/linux64_gcc/bin/texturecRelease tools/bin/linux/texturec -dist-darwin: .build/projects/gmake-osx - $(SILENT) $(MAKE) -C .build/projects/gmake-osx config=release64 -j 6 geometryc - $(SILENT) cp .build/osx64_clang/bin/geometrycRelease tools/bin/darwin/geometryc - $(SILENT) $(MAKE) -C .build/projects/gmake-osx config=release64 -j 6 shaderc - $(SILENT) cp .build/osx64_clang/bin/shadercRelease tools/bin/darwin/shaderc - $(SILENT) $(MAKE) -C .build/projects/gmake-osx config=release64 -j 6 texturec - $(SILENT) cp .build/osx64_clang/bin/texturecRelease tools/bin/darwin/texturec - $(SILENT) $(MAKE) -C .build/projects/gmake-osx config=release64 -j 6 texturev - $(SILENT) cp .build/osx64_clang/bin/texturevRelease tools/bin/darwin/texturev +dist-darwin: .build/projects/gmake-osx-x64 + $(SILENT) $(MAKE) -C .build/projects/gmake-osx-x64 config=release -j 6 texturec + $(SILENT) cp .build/osx-x64/bin/texturecRelease tools/bin/darwin/texturec dist: clean dist-windows dist-linux dist-darwin