From 7aa463806c4e6616699c8f742cc8204b4d129b0a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jos=C3=A9=20Fonseca?= <jose.r.fonseca@gmail.com>
Date: Wed, 9 May 2012 11:06:12 +0100
Subject: [PATCH] Rename hlsl d3dcommon.
---
apps/CMakeLists.txt | 2 +-
apps/d3d10/CMakeLists.txt | 2 +-
apps/d3d10_1/CMakeLists.txt | 2 +-
apps/d3d11/CMakeLists.txt | 2 +-
apps/d3d11_1/CMakeLists.txt | 2 +-
apps/d3dcommon/.gitignore | 1 +
apps/{hlsl => d3dcommon}/CMakeLists.txt | 0
apps/{hlsl => d3dcommon}/tri.fx | 0
apps/{hlsl => d3dcommon}/tri_ps.h | 0
apps/{hlsl => d3dcommon}/tri_vs.h | 0
10 files changed, 6 insertions(+), 5 deletions(-)
create mode 100644 apps/d3dcommon/.gitignore
rename apps/{hlsl => d3dcommon}/CMakeLists.txt (100%)
rename apps/{hlsl => d3dcommon}/tri.fx (100%)
rename apps/{hlsl => d3dcommon}/tri_ps.h (100%)
rename apps/{hlsl => d3dcommon}/tri_vs.h (100%)
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
index 2098b5d..6f38fdd 100644
--- a/apps/CMakeLists.txt
+++ b/apps/CMakeLists.txt
@@ -33,7 +33,7 @@ if (EGL_FOUND)
endif ()
if (DirectX_FXC_EXECUTABLE)
- add_subdirectory (hlsl)
+ add_subdirectory (d3dcommon)
endif ()
if (DirectX_D3D11_1_FOUND)
diff --git a/apps/d3d10/CMakeLists.txt b/apps/d3d10/CMakeLists.txt
index a9da968..0bdd13e 100644
--- a/apps/d3d10/CMakeLists.txt
+++ b/apps/d3d10/CMakeLists.txt
@@ -1,5 +1,5 @@
include_directories (
- ${CMAKE_CURRENT_SOURCE_DIR}/../hlsl
+ ${CMAKE_CURRENT_SOURCE_DIR}/../d3dcommon
${APITRACE_SOURCE_DIR}/dispatch
${DirectX_D3D10_INCLUDE_DIR}
)
diff --git a/apps/d3d10_1/CMakeLists.txt b/apps/d3d10_1/CMakeLists.txt
index b290117..c2205bb 100644
--- a/apps/d3d10_1/CMakeLists.txt
+++ b/apps/d3d10_1/CMakeLists.txt
@@ -1,5 +1,5 @@
include_directories (
- ${CMAKE_CURRENT_SOURCE_DIR}/../hlsl
+ ${CMAKE_CURRENT_SOURCE_DIR}/../d3dcommon
${APITRACE_SOURCE_DIR}/dispatch
${DirectX_D3D10_1_INCLUDE_DIR}
)
diff --git a/apps/d3d11/CMakeLists.txt b/apps/d3d11/CMakeLists.txt
index 91c3c78..69ae735 100644
--- a/apps/d3d11/CMakeLists.txt
+++ b/apps/d3d11/CMakeLists.txt
@@ -1,5 +1,5 @@
include_directories (
- ${CMAKE_CURRENT_SOURCE_DIR}/../hlsl
+ ${CMAKE_CURRENT_SOURCE_DIR}/../d3dcommon
${APITRACE_SOURCE_DIR}/dispatch
${DirectX_D3D11_INCLUDE_DIR}
)
diff --git a/apps/d3d11_1/CMakeLists.txt b/apps/d3d11_1/CMakeLists.txt
index adfde3a..d35a8bf 100644
--- a/apps/d3d11_1/CMakeLists.txt
+++ b/apps/d3d11_1/CMakeLists.txt
@@ -1,5 +1,5 @@
include_directories (
- ${CMAKE_CURRENT_SOURCE_DIR}/../hlsl
+ ${CMAKE_CURRENT_SOURCE_DIR}/../d3dcommon
${APITRACE_SOURCE_DIR}/dispatch
${DirectX_D3D11_1_INCLUDE_DIR}
)
diff --git a/apps/d3dcommon/.gitignore b/apps/d3dcommon/.gitignore
new file mode 100644
index 0000000..8f6f666
--- /dev/null
+++ b/apps/d3dcommon/.gitignore
@@ -0,0 +1 @@
+*.rule
diff --git a/apps/hlsl/CMakeLists.txt b/apps/d3dcommon/CMakeLists.txt
similarity index 100%
rename from apps/hlsl/CMakeLists.txt
rename to apps/d3dcommon/CMakeLists.txt
diff --git a/apps/hlsl/tri.fx b/apps/d3dcommon/tri.fx
similarity index 100%
rename from apps/hlsl/tri.fx
rename to apps/d3dcommon/tri.fx
diff --git a/apps/hlsl/tri_ps.h b/apps/d3dcommon/tri_ps.h
similarity index 100%
rename from apps/hlsl/tri_ps.h
rename to apps/d3dcommon/tri_ps.h
diff --git a/apps/hlsl/tri_vs.h b/apps/d3dcommon/tri_vs.h
similarity index 100%
rename from apps/hlsl/tri_vs.h
rename to apps/d3dcommon/tri_vs.h
--
2.45.2