From 69c3e6ff11039c509bc96c34ccf879cc1ae7294b Mon Sep 17 00:00:00 2001 From: Christian Costa Date: Mon, 6 Jun 2005 15:51:50 +0000 Subject: [PATCH] Moved d3ddevice and direct3d objects files to ddraw root dir. Renamed all remaining files. --- configure | 10 -------- configure.ac | 2 -- dlls/ddraw/Makefile.in | 28 ++++++++++------------ dlls/ddraw/{d3dcommon.c => d3d_utils.c} | 0 dlls/ddraw/ddraw_main.c | 2 +- dlls/ddraw/{d3ddevice/main.c => device_main.c} | 0 dlls/ddraw/{d3ddevice/mesa.c => device_opengl.c} | 2 +- dlls/ddraw/{direct3d/main.c => direct3d_main.c} | 0 dlls/ddraw/{direct3d/mesa.c => direct3d_opengl.c} | 2 +- dlls/ddraw/{d3dexecutebuffer.c => executebuffer.c} | 2 +- dlls/ddraw/{d3dlight.c => light.c} | 2 +- dlls/ddraw/main.c | 2 +- dlls/ddraw/{d3dmaterial.c => material.c} | 2 +- dlls/ddraw/{mesa_private.h => opengl_private.h} | 0 dlls/ddraw/{mesa.c => opengl_utils.c} | 2 +- dlls/ddraw/surface_main.c | 2 +- dlls/ddraw/{d3dtexture.c => texture.c} | 2 +- dlls/ddraw/{d3dvertexbuffer.c => vertexbuffer.c} | 2 +- dlls/ddraw/{d3dviewport.c => viewport.c} | 0 19 files changed, 23 insertions(+), 39 deletions(-) rename dlls/ddraw/{d3dcommon.c => d3d_utils.c} (100%) rename dlls/ddraw/{d3ddevice/main.c => device_main.c} (100%) rename dlls/ddraw/{d3ddevice/mesa.c => device_opengl.c} (99%) rename dlls/ddraw/{direct3d/main.c => direct3d_main.c} (100%) rename dlls/ddraw/{direct3d/mesa.c => direct3d_opengl.c} (99%) rename dlls/ddraw/{d3dexecutebuffer.c => executebuffer.c} (99%) rename dlls/ddraw/{d3dlight.c => light.c} (99%) rename dlls/ddraw/{d3dmaterial.c => material.c} (99%) rename dlls/ddraw/{mesa_private.h => opengl_private.h} (100%) rename dlls/ddraw/{mesa.c => opengl_utils.c} (99%) rename dlls/ddraw/{d3dtexture.c => texture.c} (99%) rename dlls/ddraw/{d3dvertexbuffer.c => vertexbuffer.c} (99%) rename dlls/ddraw/{d3dviewport.c => viewport.c} (100%) diff --git a/configure b/configure index 29795ddd877..b8084f593d6 100755 --- a/configure +++ b/configure @@ -20049,10 +20049,6 @@ esac - ac_config_commands="$ac_config_commands dlls/ddraw/d3ddevice" - - ac_config_commands="$ac_config_commands dlls/ddraw/direct3d" - ac_config_commands="$ac_config_commands dlls/gdi/enhmfdrv" ac_config_commands="$ac_config_commands dlls/gdi/mfdrv" @@ -20878,8 +20874,6 @@ do "tools/winegcc/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/winegcc/Makefile" ;; "tools/wmc/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/wmc/Makefile" ;; "tools/wrc/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/wrc/Makefile" ;; - "dlls/ddraw/d3ddevice" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/d3ddevice" ;; - "dlls/ddraw/direct3d" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/direct3d" ;; "dlls/gdi/enhmfdrv" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi/enhmfdrv" ;; "dlls/gdi/mfdrv" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi/mfdrv" ;; "dlls/kernel/messages" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/kernel/messages" ;; @@ -21670,10 +21664,6 @@ esac { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 echo "$as_me: executing $ac_dest commands" >&6;} case $ac_dest in - dlls/ddraw/d3ddevice ) test -d "dlls/ddraw/d3ddevice" || ({ echo "$as_me:$LINENO: creating dlls/ddraw/d3ddevice" >&5 -echo "$as_me: creating dlls/ddraw/d3ddevice" >&6;} && mkdir "dlls/ddraw/d3ddevice") ;; - dlls/ddraw/direct3d ) test -d "dlls/ddraw/direct3d" || ({ echo "$as_me:$LINENO: creating dlls/ddraw/direct3d" >&5 -echo "$as_me: creating dlls/ddraw/direct3d" >&6;} && mkdir "dlls/ddraw/direct3d") ;; dlls/gdi/enhmfdrv ) test -d "dlls/gdi/enhmfdrv" || ({ echo "$as_me:$LINENO: creating dlls/gdi/enhmfdrv" >&5 echo "$as_me: creating dlls/gdi/enhmfdrv" >&6;} && mkdir "dlls/gdi/enhmfdrv") ;; dlls/gdi/mfdrv ) test -d "dlls/gdi/mfdrv" || ({ echo "$as_me:$LINENO: creating dlls/gdi/mfdrv" >&5 diff --git a/configure.ac b/configure.ac index bbb89f5735b..2b51b0ae9c1 100644 --- a/configure.ac +++ b/configure.ac @@ -1507,8 +1507,6 @@ dnl **** Generate output files **** AH_TOP([#define __WINE_CONFIG_H]) -WINE_CONFIG_EXTRA_DIR(dlls/ddraw/d3ddevice) -WINE_CONFIG_EXTRA_DIR(dlls/ddraw/direct3d) WINE_CONFIG_EXTRA_DIR(dlls/gdi/enhmfdrv) WINE_CONFIG_EXTRA_DIR(dlls/gdi/mfdrv) WINE_CONFIG_EXTRA_DIR(dlls/kernel/messages) diff --git a/dlls/ddraw/Makefile.in b/dlls/ddraw/Makefile.in index b386ede49ce..361d0d07f85 100644 --- a/dlls/ddraw/Makefile.in +++ b/dlls/ddraw/Makefile.in @@ -9,18 +9,18 @@ EXTRAINCL = @X_CFLAGS@ EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ OPENGLFILES = \ - d3dcommon.c \ - d3ddevice/main.c \ - d3ddevice/mesa.c \ - d3dexecutebuffer.c \ - d3dlight.c \ - d3dmaterial.c \ - d3dtexture.c \ - d3dvertexbuffer.c \ - d3dviewport.c \ - direct3d/main.c \ - direct3d/mesa.c \ - mesa.c + d3d_utils.c \ + device_main.c \ + device_opengl.c \ + direct3d_main.c \ + direct3d_opengl.c \ + executebuffer.c \ + light.c \ + material.c \ + opengl_utils.c \ + texture.c \ + vertexbuffer.c \ + viewport.c C_SRCS = \ @OPENGLFILES@ \ @@ -47,10 +47,6 @@ RC_SRCS = version.rc SUBDIRS = tests -EXTRASUBDIRS = \ - d3ddevice \ - direct3d - @MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/ddraw/d3dcommon.c b/dlls/ddraw/d3d_utils.c similarity index 100% rename from dlls/ddraw/d3dcommon.c rename to dlls/ddraw/d3d_utils.c diff --git a/dlls/ddraw/ddraw_main.c b/dlls/ddraw/ddraw_main.c index c9985c7f3cb..57c7e330cc2 100644 --- a/dlls/ddraw/ddraw_main.c +++ b/dlls/ddraw/ddraw_main.c @@ -67,7 +67,7 @@ #include "wine/debug.h" #include "ddraw_private.h" -#include "mesa_private.h" /* To have the D3D creation function */ +#include "opengl_private.h" /* To have the D3D creation function */ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/d3ddevice/main.c b/dlls/ddraw/device_main.c similarity index 100% rename from dlls/ddraw/d3ddevice/main.c rename to dlls/ddraw/device_main.c diff --git a/dlls/ddraw/d3ddevice/mesa.c b/dlls/ddraw/device_opengl.c similarity index 99% rename from dlls/ddraw/d3ddevice/mesa.c rename to dlls/ddraw/device_opengl.c index ef94c7bd0b5..c514ec802af 100644 --- a/dlls/ddraw/d3ddevice/mesa.c +++ b/dlls/ddraw/device_opengl.c @@ -43,7 +43,7 @@ #include "wine/library.h" #include "d3d_private.h" -#include "mesa_private.h" +#include "opengl_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); WINE_DECLARE_DEBUG_CHANNEL(ddraw_geom); diff --git a/dlls/ddraw/direct3d/main.c b/dlls/ddraw/direct3d_main.c similarity index 100% rename from dlls/ddraw/direct3d/main.c rename to dlls/ddraw/direct3d_main.c diff --git a/dlls/ddraw/direct3d/mesa.c b/dlls/ddraw/direct3d_opengl.c similarity index 99% rename from dlls/ddraw/direct3d/mesa.c rename to dlls/ddraw/direct3d_opengl.c index e2553e7df48..57c7c7bf71f 100644 --- a/dlls/ddraw/direct3d/mesa.c +++ b/dlls/ddraw/direct3d_opengl.c @@ -42,7 +42,7 @@ #include "ddraw_private.h" #include "d3d_private.h" -#include "mesa_private.h" +#include "opengl_private.h" #include "wine/debug.h" diff --git a/dlls/ddraw/d3dexecutebuffer.c b/dlls/ddraw/executebuffer.c similarity index 99% rename from dlls/ddraw/d3dexecutebuffer.c rename to dlls/ddraw/executebuffer.c index 3bd0664f913..7785bf116f9 100644 --- a/dlls/ddraw/d3dexecutebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -39,7 +39,7 @@ #include "wine/debug.h" #include "d3d_private.h" -#include "mesa_private.h" +#include "opengl_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); WINE_DECLARE_DEBUG_CHANNEL(ddraw_geom); diff --git a/dlls/ddraw/d3dlight.c b/dlls/ddraw/light.c similarity index 99% rename from dlls/ddraw/d3dlight.c rename to dlls/ddraw/light.c index 2b6399ce49b..7a8fb820a54 100644 --- a/dlls/ddraw/d3dlight.c +++ b/dlls/ddraw/light.c @@ -37,7 +37,7 @@ #include "wine/debug.h" #include "d3d_private.h" -#include "mesa_private.h" +#include "opengl_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 36c499654a4..83b3533a56a 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -73,7 +73,7 @@ BOOL opengl_initialized = 0; #ifdef HAVE_OPENGL -#include "mesa_private.h" +#include "opengl_private.h" static void *gl_handle = NULL; diff --git a/dlls/ddraw/d3dmaterial.c b/dlls/ddraw/material.c similarity index 99% rename from dlls/ddraw/d3dmaterial.c rename to dlls/ddraw/material.c index daeade5ad96..ab58bba6a42 100644 --- a/dlls/ddraw/d3dmaterial.c +++ b/dlls/ddraw/material.c @@ -37,7 +37,7 @@ #include "wine/debug.h" #include "d3d_private.h" -#include "mesa_private.h" +#include "opengl_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/mesa_private.h b/dlls/ddraw/opengl_private.h similarity index 100% rename from dlls/ddraw/mesa_private.h rename to dlls/ddraw/opengl_private.h diff --git a/dlls/ddraw/mesa.c b/dlls/ddraw/opengl_utils.c similarity index 99% rename from dlls/ddraw/mesa.c rename to dlls/ddraw/opengl_utils.c index 0c1c4402d91..74d483a4379 100644 --- a/dlls/ddraw/mesa.c +++ b/dlls/ddraw/opengl_utils.c @@ -32,7 +32,7 @@ #include "d3d.h" #include "wine/debug.h" -#include "mesa_private.h" +#include "opengl_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/surface_main.c b/dlls/ddraw/surface_main.c index be7c371850b..e2e03f9801c 100644 --- a/dlls/ddraw/surface_main.c +++ b/dlls/ddraw/surface_main.c @@ -30,9 +30,9 @@ #define NONAMELESSSTRUCT #include "winerror.h" -#include "mesa_private.h" #include "wine/debug.h" #include "ddraw_private.h" +#include "opengl_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); WINE_DECLARE_DEBUG_CHANNEL(ddraw_flip); diff --git a/dlls/ddraw/d3dtexture.c b/dlls/ddraw/texture.c similarity index 99% rename from dlls/ddraw/d3dtexture.c rename to dlls/ddraw/texture.c index 633fb340a46..bba72ebedc3 100644 --- a/dlls/ddraw/d3dtexture.c +++ b/dlls/ddraw/texture.c @@ -37,7 +37,7 @@ #include "d3d.h" #include "wine/debug.h" -#include "mesa_private.h" +#include "opengl_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); WINE_DECLARE_DEBUG_CHANNEL(ddraw_tex); diff --git a/dlls/ddraw/d3dvertexbuffer.c b/dlls/ddraw/vertexbuffer.c similarity index 99% rename from dlls/ddraw/d3dvertexbuffer.c rename to dlls/ddraw/vertexbuffer.c index 5ebb1b54d34..deb970a5a11 100644 --- a/dlls/ddraw/d3dvertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -33,7 +33,7 @@ #include "wine/debug.h" #include "d3d_private.h" -#include "mesa_private.h" +#include "opengl_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); WINE_DECLARE_DEBUG_CHANNEL(ddraw_geom); diff --git a/dlls/ddraw/d3dviewport.c b/dlls/ddraw/viewport.c similarity index 100% rename from dlls/ddraw/d3dviewport.c rename to dlls/ddraw/viewport.c -- 2.11.4.GIT