From 295d782d2ce61c0cee3dc826d83a089af0c5dff4 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 1 Apr 2012 18:17:07 +0000 Subject: [PATCH] [WIN32SS] * Move ReactX modules into win32ss/reactx. svn path=/trunk/; revision=56308 --- reactos/drivers/CMakeLists.txt | 1 - reactos/win32ss/CMakeLists.txt | 1 + reactos/{drivers/directx => win32ss/reactx}/CMakeLists.txt | 0 reactos/{drivers/directx => win32ss/reactx}/dxapi/CMakeLists.txt | 0 reactos/{drivers/directx => win32ss/reactx}/dxapi/dxapi.rc | 0 reactos/{drivers/directx => win32ss/reactx}/dxapi/dxapi.spec | 0 reactos/{drivers/directx => win32ss/reactx}/dxapi/dxapi_driver.h | 0 reactos/{drivers/directx => win32ss/reactx}/dxapi/main.c | 0 reactos/{drivers/directx => win32ss/reactx}/dxg/CMakeLists.txt | 0 reactos/{drivers/directx => win32ss/reactx}/dxg/ddhmg.c | 0 reactos/{drivers/directx => win32ss/reactx}/dxg/dxg.rc | 0 reactos/{drivers/directx => win32ss/reactx}/dxg/dxg.spec | 0 reactos/{drivers/directx => win32ss/reactx}/dxg/dxg_driver.h | 0 reactos/{drivers/directx => win32ss/reactx}/dxg/dxg_int.h | 0 reactos/{drivers/directx => win32ss/reactx}/dxg/eng.c | 0 reactos/{drivers/directx => win32ss/reactx}/dxg/historic.c | 0 reactos/{drivers/directx => win32ss/reactx}/dxg/main.c | 0 reactos/{drivers/directx => win32ss/reactx}/dxg/tags.h | 0 .../{drivers/directx => win32ss/reactx}/dxgthk/CMakeLists.txt | 0 reactos/{drivers/directx => win32ss/reactx}/dxgthk/dxgthk.rc | 0 reactos/{drivers/directx => win32ss/reactx}/dxgthk/dxgthk.spec | 0 reactos/{drivers/directx => win32ss/reactx}/dxgthk/main.c | 0 22 files changed, 1 insertion(+), 1 deletion(-) rename reactos/{drivers/directx => win32ss/reactx}/CMakeLists.txt (100%) rename reactos/{drivers/directx => win32ss/reactx}/dxapi/CMakeLists.txt (100%) rename reactos/{drivers/directx => win32ss/reactx}/dxapi/dxapi.rc (100%) rename reactos/{drivers/directx => win32ss/reactx}/dxapi/dxapi.spec (100%) rename reactos/{drivers/directx => win32ss/reactx}/dxapi/dxapi_driver.h (100%) rename reactos/{drivers/directx => win32ss/reactx}/dxapi/main.c (100%) rename reactos/{drivers/directx => win32ss/reactx}/dxg/CMakeLists.txt (100%) rename reactos/{drivers/directx => win32ss/reactx}/dxg/ddhmg.c (100%) rename reactos/{drivers/directx => win32ss/reactx}/dxg/dxg.rc (100%) rename reactos/{drivers/directx => win32ss/reactx}/dxg/dxg.spec (100%) rename reactos/{drivers/directx => win32ss/reactx}/dxg/dxg_driver.h (100%) rename reactos/{drivers/directx => win32ss/reactx}/dxg/dxg_int.h (100%) rename reactos/{drivers/directx => win32ss/reactx}/dxg/eng.c (100%) rename reactos/{drivers/directx => win32ss/reactx}/dxg/historic.c (100%) rename reactos/{drivers/directx => win32ss/reactx}/dxg/main.c (100%) rename reactos/{drivers/directx => win32ss/reactx}/dxg/tags.h (100%) rename reactos/{drivers/directx => win32ss/reactx}/dxgthk/CMakeLists.txt (100%) rename reactos/{drivers/directx => win32ss/reactx}/dxgthk/dxgthk.rc (100%) rename reactos/{drivers/directx => win32ss/reactx}/dxgthk/dxgthk.spec (100%) rename reactos/{drivers/directx => win32ss/reactx}/dxgthk/main.c (100%) diff --git a/reactos/drivers/CMakeLists.txt b/reactos/drivers/CMakeLists.txt index cba9e35982b..7a672a385c5 100644 --- a/reactos/drivers/CMakeLists.txt +++ b/reactos/drivers/CMakeLists.txt @@ -3,7 +3,6 @@ add_subdirectory(base) add_subdirectory(battery) add_subdirectory(bluetooth) add_subdirectory(bus) -add_subdirectory(directx) add_subdirectory(filesystems) add_subdirectory(filters) add_subdirectory(hid) diff --git a/reactos/win32ss/CMakeLists.txt b/reactos/win32ss/CMakeLists.txt index a086d5d4694..d247170ba76 100644 --- a/reactos/win32ss/CMakeLists.txt +++ b/reactos/win32ss/CMakeLists.txt @@ -1,4 +1,5 @@ add_subdirectory(drivers) add_subdirectory(gdi/gdi32) +add_subdirectory(reactx) add_subdirectory(user/user32) diff --git a/reactos/drivers/directx/CMakeLists.txt b/reactos/win32ss/reactx/CMakeLists.txt similarity index 100% rename from reactos/drivers/directx/CMakeLists.txt rename to reactos/win32ss/reactx/CMakeLists.txt diff --git a/reactos/drivers/directx/dxapi/CMakeLists.txt b/reactos/win32ss/reactx/dxapi/CMakeLists.txt similarity index 100% rename from reactos/drivers/directx/dxapi/CMakeLists.txt rename to reactos/win32ss/reactx/dxapi/CMakeLists.txt diff --git a/reactos/drivers/directx/dxapi/dxapi.rc b/reactos/win32ss/reactx/dxapi/dxapi.rc similarity index 100% rename from reactos/drivers/directx/dxapi/dxapi.rc rename to reactos/win32ss/reactx/dxapi/dxapi.rc diff --git a/reactos/drivers/directx/dxapi/dxapi.spec b/reactos/win32ss/reactx/dxapi/dxapi.spec similarity index 100% rename from reactos/drivers/directx/dxapi/dxapi.spec rename to reactos/win32ss/reactx/dxapi/dxapi.spec diff --git a/reactos/drivers/directx/dxapi/dxapi_driver.h b/reactos/win32ss/reactx/dxapi/dxapi_driver.h similarity index 100% rename from reactos/drivers/directx/dxapi/dxapi_driver.h rename to reactos/win32ss/reactx/dxapi/dxapi_driver.h diff --git a/reactos/drivers/directx/dxapi/main.c b/reactos/win32ss/reactx/dxapi/main.c similarity index 100% rename from reactos/drivers/directx/dxapi/main.c rename to reactos/win32ss/reactx/dxapi/main.c diff --git a/reactos/drivers/directx/dxg/CMakeLists.txt b/reactos/win32ss/reactx/dxg/CMakeLists.txt similarity index 100% rename from reactos/drivers/directx/dxg/CMakeLists.txt rename to reactos/win32ss/reactx/dxg/CMakeLists.txt diff --git a/reactos/drivers/directx/dxg/ddhmg.c b/reactos/win32ss/reactx/dxg/ddhmg.c similarity index 100% rename from reactos/drivers/directx/dxg/ddhmg.c rename to reactos/win32ss/reactx/dxg/ddhmg.c diff --git a/reactos/drivers/directx/dxg/dxg.rc b/reactos/win32ss/reactx/dxg/dxg.rc similarity index 100% rename from reactos/drivers/directx/dxg/dxg.rc rename to reactos/win32ss/reactx/dxg/dxg.rc diff --git a/reactos/drivers/directx/dxg/dxg.spec b/reactos/win32ss/reactx/dxg/dxg.spec similarity index 100% rename from reactos/drivers/directx/dxg/dxg.spec rename to reactos/win32ss/reactx/dxg/dxg.spec diff --git a/reactos/drivers/directx/dxg/dxg_driver.h b/reactos/win32ss/reactx/dxg/dxg_driver.h similarity index 100% rename from reactos/drivers/directx/dxg/dxg_driver.h rename to reactos/win32ss/reactx/dxg/dxg_driver.h diff --git a/reactos/drivers/directx/dxg/dxg_int.h b/reactos/win32ss/reactx/dxg/dxg_int.h similarity index 100% rename from reactos/drivers/directx/dxg/dxg_int.h rename to reactos/win32ss/reactx/dxg/dxg_int.h diff --git a/reactos/drivers/directx/dxg/eng.c b/reactos/win32ss/reactx/dxg/eng.c similarity index 100% rename from reactos/drivers/directx/dxg/eng.c rename to reactos/win32ss/reactx/dxg/eng.c diff --git a/reactos/drivers/directx/dxg/historic.c b/reactos/win32ss/reactx/dxg/historic.c similarity index 100% rename from reactos/drivers/directx/dxg/historic.c rename to reactos/win32ss/reactx/dxg/historic.c diff --git a/reactos/drivers/directx/dxg/main.c b/reactos/win32ss/reactx/dxg/main.c similarity index 100% rename from reactos/drivers/directx/dxg/main.c rename to reactos/win32ss/reactx/dxg/main.c diff --git a/reactos/drivers/directx/dxg/tags.h b/reactos/win32ss/reactx/dxg/tags.h similarity index 100% rename from reactos/drivers/directx/dxg/tags.h rename to reactos/win32ss/reactx/dxg/tags.h diff --git a/reactos/drivers/directx/dxgthk/CMakeLists.txt b/reactos/win32ss/reactx/dxgthk/CMakeLists.txt similarity index 100% rename from reactos/drivers/directx/dxgthk/CMakeLists.txt rename to reactos/win32ss/reactx/dxgthk/CMakeLists.txt diff --git a/reactos/drivers/directx/dxgthk/dxgthk.rc b/reactos/win32ss/reactx/dxgthk/dxgthk.rc similarity index 100% rename from reactos/drivers/directx/dxgthk/dxgthk.rc rename to reactos/win32ss/reactx/dxgthk/dxgthk.rc diff --git a/reactos/drivers/directx/dxgthk/dxgthk.spec b/reactos/win32ss/reactx/dxgthk/dxgthk.spec similarity index 100% rename from reactos/drivers/directx/dxgthk/dxgthk.spec rename to reactos/win32ss/reactx/dxgthk/dxgthk.spec diff --git a/reactos/drivers/directx/dxgthk/main.c b/reactos/win32ss/reactx/dxgthk/main.c similarity index 100% rename from reactos/drivers/directx/dxgthk/main.c rename to reactos/win32ss/reactx/dxgthk/main.c