Merge branch 'master' of cane:bkaradzic/bgfx

This commit is contained in:
Branimir Karadžić 2016-02-25 22:20:34 -08:00
commit 07d310af12
2 changed files with 40 additions and 16 deletions

View file

@ -57,12 +57,21 @@ Languages:
* [Haskell language API bindings](https://github.com/haskell-game/bgfx) * [Haskell language API bindings](https://github.com/haskell-game/bgfx)
* [Rust language API bindings](https://github.com/rhoot/bgfx-rs) * [Rust language API bindings](https://github.com/rhoot/bgfx-rs)
Build [Building](https://bkaradzic.github.io/bgfx/build.html)
----- ----------------------------------------------------
- AppVeyor https://ci.appveyor.com/project/bkaradzic/bgfx - AppVeyor https://ci.appveyor.com/project/bkaradzic/bgfx
- TravisCI https://travis-ci.org/bkaradzic/bgfx - TravisCI https://travis-ci.org/bkaradzic/bgfx
[Examples](https://bkaradzic.github.io/bgfx/examples.html)
----------------------------------------------------------
[API Reference](https://bkaradzic.github.io/bgfx/bgfx.html)
-----------------------------------------------------------
[Tools](https://bkaradzic.github.io/bgfx/tools.html)
----------------------------------------------------
Who is using it? Who is using it?
---------------- ----------------
@ -118,18 +127,6 @@ http://makingartstudios.itch.io/dls - DLS the digital logic simulator game.
https://github.com/mamedev/mame MAME - Multiple Arcade Machine Emulator https://github.com/mamedev/mame MAME - Multiple Arcade Machine Emulator
[Building](https://bkaradzic.github.io/bgfx/build.html)
-------------------------------------------------------
[Examples](https://bkaradzic.github.io/bgfx/examples.html)
----------------------------------------------------------
[API Reference](https://bkaradzic.github.io/bgfx/bgfx.html)
-----------------------------------------------------------
[Tools](https://bkaradzic.github.io/bgfx/tools.html)
----------------------------------------------------
[License (BSD 2-clause)](https://bkaradzic.github.io/bgfx/license.html) [License (BSD 2-clause)](https://bkaradzic.github.io/bgfx/license.html)
----------------------------------------------------------------------- -----------------------------------------------------------------------

View file

@ -237,6 +237,7 @@ docs:
clean: clean:
@echo Cleaning... @echo Cleaning...
-@rm -rf .build -@rm -rf .build
@mkdir .build
### ###
@ -271,8 +272,8 @@ endif
else else
OS=windows OS=windows
BUILD_PROJECT_DIR=gmake-mingw-gcc BUILD_PROJECT_DIR=gmake-mingw-gcc
BUILD_OUTPUT_DIR=win32_mingw-gcc BUILD_OUTPUT_DIR=win64_mingw-gcc
BUILD_TOOLS_CONFIG=release32 BUILD_TOOLS_CONFIG=release64
BUILD_TOOLS_SUFFIX=Release BUILD_TOOLS_SUFFIX=Release
EXE=.exe EXE=.exe
endif endif
@ -290,3 +291,29 @@ texturec: .build/projects/$(BUILD_PROJECT_DIR)
$(SILENT) cp .build/$(BUILD_OUTPUT_DIR)/bin/texturec$(BUILD_TOOLS_SUFFIX)$(EXE) tools/bin/$(OS)/texturec$(EXE) $(SILENT) cp .build/$(BUILD_OUTPUT_DIR)/bin/texturec$(BUILD_TOOLS_SUFFIX)$(EXE) tools/bin/$(OS)/texturec$(EXE)
tools: geometryc shaderc texturec tools: geometryc shaderc texturec
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 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 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 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
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
dist: clean dist-windows dist-linux dist-darwin