From eec4ae9847bb9e36487c767e8e449dfcd235d1ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Wed, 10 Sep 2014 21:48:08 -0700 Subject: [PATCH] Fixing paths. --- examples/01-cubes/makefile | 2 +- examples/02-metaballs/makefile | 2 +- examples/03-raymarch/makefile | 2 +- examples/04-mesh/makefile | 2 +- examples/05-instancing/makefile | 2 +- examples/06-bump/makefile | 2 +- examples/07-callback/makefile | 2 +- examples/08-update/makefile | 2 +- examples/09-hdr/makefile | 2 +- examples/12-lod/makefile | 2 +- examples/13-stencil/makefile | 2 +- examples/14-shadowvolumes/makefile | 2 +- examples/15-shadowmaps-simple/makefile | 2 +- examples/16-shadowmaps/makefile | 2 +- examples/17-drawstress/makefile | 2 +- examples/18-ibl/makefile | 2 +- examples/19-oit/makefile | 2 +- examples/21-deferred/makefile | 2 +- examples/assets/meshes/makefile | 2 +- examples/common/font/makefile | 2 +- examples/common/imgui/makefile | 2 +- examples/common/nanovg/makefile | 2 +- src/makefile | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/examples/01-cubes/makefile b/examples/01-cubes/makefile index 90c11e950..5ce066214 100644 --- a/examples/01-cubes/makefile +++ b/examples/01-cubes/makefile @@ -7,7 +7,7 @@ BGFX_DIR=../.. RUNTIME_DIR=$(BGFX_DIR)/examples/runtime BUILD_DIR=../../.build -include $(BGFX_DIR)/premake/shader.mk +include $(BGFX_DIR)/scripts/shader.mk rebuild: @make -s --no-print-directory TARGET=0 clean all diff --git a/examples/02-metaballs/makefile b/examples/02-metaballs/makefile index fb5954021..0057a309b 100644 --- a/examples/02-metaballs/makefile +++ b/examples/02-metaballs/makefile @@ -3,7 +3,7 @@ # License: http://www.opensource.org/licenses/BSD-2-Clause # -include ../../premake/shader-embeded.mk +include ../../scripts/shader-embeded.mk rebuild: @make -s --no-print-directory clean all diff --git a/examples/03-raymarch/makefile b/examples/03-raymarch/makefile index 90c11e950..5ce066214 100644 --- a/examples/03-raymarch/makefile +++ b/examples/03-raymarch/makefile @@ -7,7 +7,7 @@ BGFX_DIR=../.. RUNTIME_DIR=$(BGFX_DIR)/examples/runtime BUILD_DIR=../../.build -include $(BGFX_DIR)/premake/shader.mk +include $(BGFX_DIR)/scripts/shader.mk rebuild: @make -s --no-print-directory TARGET=0 clean all diff --git a/examples/04-mesh/makefile b/examples/04-mesh/makefile index 90c11e950..5ce066214 100644 --- a/examples/04-mesh/makefile +++ b/examples/04-mesh/makefile @@ -7,7 +7,7 @@ BGFX_DIR=../.. RUNTIME_DIR=$(BGFX_DIR)/examples/runtime BUILD_DIR=../../.build -include $(BGFX_DIR)/premake/shader.mk +include $(BGFX_DIR)/scripts/shader.mk rebuild: @make -s --no-print-directory TARGET=0 clean all diff --git a/examples/05-instancing/makefile b/examples/05-instancing/makefile index 90c11e950..5ce066214 100644 --- a/examples/05-instancing/makefile +++ b/examples/05-instancing/makefile @@ -7,7 +7,7 @@ BGFX_DIR=../.. RUNTIME_DIR=$(BGFX_DIR)/examples/runtime BUILD_DIR=../../.build -include $(BGFX_DIR)/premake/shader.mk +include $(BGFX_DIR)/scripts/shader.mk rebuild: @make -s --no-print-directory TARGET=0 clean all diff --git a/examples/06-bump/makefile b/examples/06-bump/makefile index 90c11e950..5ce066214 100644 --- a/examples/06-bump/makefile +++ b/examples/06-bump/makefile @@ -7,7 +7,7 @@ BGFX_DIR=../.. RUNTIME_DIR=$(BGFX_DIR)/examples/runtime BUILD_DIR=../../.build -include $(BGFX_DIR)/premake/shader.mk +include $(BGFX_DIR)/scripts/shader.mk rebuild: @make -s --no-print-directory TARGET=0 clean all diff --git a/examples/07-callback/makefile b/examples/07-callback/makefile index 90c11e950..5ce066214 100644 --- a/examples/07-callback/makefile +++ b/examples/07-callback/makefile @@ -7,7 +7,7 @@ BGFX_DIR=../.. RUNTIME_DIR=$(BGFX_DIR)/examples/runtime BUILD_DIR=../../.build -include $(BGFX_DIR)/premake/shader.mk +include $(BGFX_DIR)/scripts/shader.mk rebuild: @make -s --no-print-directory TARGET=0 clean all diff --git a/examples/08-update/makefile b/examples/08-update/makefile index 90c11e950..5ce066214 100644 --- a/examples/08-update/makefile +++ b/examples/08-update/makefile @@ -7,7 +7,7 @@ BGFX_DIR=../.. RUNTIME_DIR=$(BGFX_DIR)/examples/runtime BUILD_DIR=../../.build -include $(BGFX_DIR)/premake/shader.mk +include $(BGFX_DIR)/scripts/shader.mk rebuild: @make -s --no-print-directory TARGET=0 clean all diff --git a/examples/09-hdr/makefile b/examples/09-hdr/makefile index 90c11e950..5ce066214 100644 --- a/examples/09-hdr/makefile +++ b/examples/09-hdr/makefile @@ -7,7 +7,7 @@ BGFX_DIR=../.. RUNTIME_DIR=$(BGFX_DIR)/examples/runtime BUILD_DIR=../../.build -include $(BGFX_DIR)/premake/shader.mk +include $(BGFX_DIR)/scripts/shader.mk rebuild: @make -s --no-print-directory TARGET=0 clean all diff --git a/examples/12-lod/makefile b/examples/12-lod/makefile index ca74b3d65..536534d37 100644 --- a/examples/12-lod/makefile +++ b/examples/12-lod/makefile @@ -7,7 +7,7 @@ BGFX_DIR=../.. RUNTIME_DIR=$(BGFX_DIR)/examples/runtime BUILD_DIR=../../.build -include $(BGFX_DIR)/premake/shader.mk +include $(BGFX_DIR)/scripts/shader.mk rebuild: @make -s --no-print-directory TARGET=0 clean all diff --git a/examples/13-stencil/makefile b/examples/13-stencil/makefile index 15179e3f4..420d008a7 100644 --- a/examples/13-stencil/makefile +++ b/examples/13-stencil/makefile @@ -7,7 +7,7 @@ BGFX_DIR=../.. RUNTIME_DIR=$(BGFX_DIR)/examples/runtime BUILD_DIR=../../.build -include $(BGFX_DIR)/premake/shader.mk +include $(BGFX_DIR)/scripts/shader.mk rebuild: @make -s --no-print-directory TARGET=0 clean all diff --git a/examples/14-shadowvolumes/makefile b/examples/14-shadowvolumes/makefile index 5aa66e5b7..f101bb914 100644 --- a/examples/14-shadowvolumes/makefile +++ b/examples/14-shadowvolumes/makefile @@ -7,7 +7,7 @@ BGFX_DIR=../.. RUNTIME_DIR=$(BGFX_DIR)/examples/runtime BUILD_DIR=../../.build -include $(BGFX_DIR)/premake/shader.mk +include $(BGFX_DIR)/scripts/shader.mk GEOMETRY_SRC= \ bunny_patched \ diff --git a/examples/15-shadowmaps-simple/makefile b/examples/15-shadowmaps-simple/makefile index 15179e3f4..420d008a7 100644 --- a/examples/15-shadowmaps-simple/makefile +++ b/examples/15-shadowmaps-simple/makefile @@ -7,7 +7,7 @@ BGFX_DIR=../.. RUNTIME_DIR=$(BGFX_DIR)/examples/runtime BUILD_DIR=../../.build -include $(BGFX_DIR)/premake/shader.mk +include $(BGFX_DIR)/scripts/shader.mk rebuild: @make -s --no-print-directory TARGET=0 clean all diff --git a/examples/16-shadowmaps/makefile b/examples/16-shadowmaps/makefile index c484c18d6..547cea69a 100644 --- a/examples/16-shadowmaps/makefile +++ b/examples/16-shadowmaps/makefile @@ -7,7 +7,7 @@ BGFX_DIR=../.. RUNTIME_DIR=$(BGFX_DIR)/examples/runtime BUILD_DIR=../../.build -include $(BGFX_DIR)/premake/shader.mk +include $(BGFX_DIR)/scripts/shader.mk GEOMETRY_SRC= \ tree \ diff --git a/examples/17-drawstress/makefile b/examples/17-drawstress/makefile index 7a96901a0..0d6f5ca7f 100644 --- a/examples/17-drawstress/makefile +++ b/examples/17-drawstress/makefile @@ -3,7 +3,7 @@ # License: http://www.opensource.org/licenses/BSD-2-Clause # -include ../../premake/shader-embeded.mk +include ../../scripts/shader-embeded.mk rebuild: @make -s --no-print-directory clean all diff --git a/examples/18-ibl/makefile b/examples/18-ibl/makefile index fa9f265ea..65275428b 100644 --- a/examples/18-ibl/makefile +++ b/examples/18-ibl/makefile @@ -7,7 +7,7 @@ BGFX_DIR=../.. RUNTIME_DIR=$(BGFX_DIR)/examples/runtime BUILD_DIR=../../.build -include $(BGFX_DIR)/premake/shader.mk +include $(BGFX_DIR)/scripts/shader.mk rebuild: @make -s --no-print-directory TARGET=0 clean all diff --git a/examples/19-oit/makefile b/examples/19-oit/makefile index 90c11e950..5ce066214 100644 --- a/examples/19-oit/makefile +++ b/examples/19-oit/makefile @@ -7,7 +7,7 @@ BGFX_DIR=../.. RUNTIME_DIR=$(BGFX_DIR)/examples/runtime BUILD_DIR=../../.build -include $(BGFX_DIR)/premake/shader.mk +include $(BGFX_DIR)/scripts/shader.mk rebuild: @make -s --no-print-directory TARGET=0 clean all diff --git a/examples/21-deferred/makefile b/examples/21-deferred/makefile index 90c11e950..5ce066214 100644 --- a/examples/21-deferred/makefile +++ b/examples/21-deferred/makefile @@ -7,7 +7,7 @@ BGFX_DIR=../.. RUNTIME_DIR=$(BGFX_DIR)/examples/runtime BUILD_DIR=../../.build -include $(BGFX_DIR)/premake/shader.mk +include $(BGFX_DIR)/scripts/shader.mk rebuild: @make -s --no-print-directory TARGET=0 clean all diff --git a/examples/assets/meshes/makefile b/examples/assets/meshes/makefile index ed0f61cfd..ff6a4edfa 100644 --- a/examples/assets/meshes/makefile +++ b/examples/assets/meshes/makefile @@ -7,7 +7,7 @@ BGFX_DIR=../../.. RUNTIME_DIR=$(BGFX_DIR)/examples/runtime BUILD_DIR=../../.build -include $(BGFX_DIR)/premake/tools.mk +include $(BGFX_DIR)/scripts/tools.mk GEOMETRY_SRC= \ bunny \ diff --git a/examples/common/font/makefile b/examples/common/font/makefile index d3bc6dd54..ef0c759ac 100644 --- a/examples/common/font/makefile +++ b/examples/common/font/makefile @@ -3,7 +3,7 @@ # License: http://www.opensource.org/licenses/BSD-2-Clause # -include ../../../premake/shader-embeded.mk +include ../../../scripts/shader-embeded.mk rebuild: @make -s --no-print-directory clean all diff --git a/examples/common/imgui/makefile b/examples/common/imgui/makefile index d3bc6dd54..ef0c759ac 100644 --- a/examples/common/imgui/makefile +++ b/examples/common/imgui/makefile @@ -3,7 +3,7 @@ # License: http://www.opensource.org/licenses/BSD-2-Clause # -include ../../../premake/shader-embeded.mk +include ../../../scripts/shader-embeded.mk rebuild: @make -s --no-print-directory clean all diff --git a/examples/common/nanovg/makefile b/examples/common/nanovg/makefile index d3bc6dd54..ef0c759ac 100644 --- a/examples/common/nanovg/makefile +++ b/examples/common/nanovg/makefile @@ -3,7 +3,7 @@ # License: http://www.opensource.org/licenses/BSD-2-Clause # -include ../../../premake/shader-embeded.mk +include ../../../scripts/shader-embeded.mk rebuild: @make -s --no-print-directory clean all diff --git a/src/makefile b/src/makefile index 22791c6e7..8b1392ca8 100644 --- a/src/makefile +++ b/src/makefile @@ -3,7 +3,7 @@ # License: http://www.opensource.org/licenses/BSD-2-Clause # -include ../premake/shader-embeded.mk +include ../scripts/shader-embeded.mk rebuild: @make -s --no-print-directory clean all