ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved d3ddevice and direct3d objects files to ddraw root dir. 

Renamed all remaining files.
This commit is contained in:
Christian Costa 2005-06-06 15:51:50 +00:00 committed by Alexandre Julliard
parent d8c5960ce1
commit 69c3e6ff11
19 changed files with 23 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -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/enhmfdrv"
ac_config_commands="$ac_config_commands dlls/gdi/mfdrv" 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/winegcc/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/winegcc/Makefile" ;;
"tools/wmc/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/wmc/Makefile" ;; "tools/wmc/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/wmc/Makefile" ;;
"tools/wrc/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/wrc/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/enhmfdrv" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi/enhmfdrv" ;;
"dlls/gdi/mfdrv" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi/mfdrv" ;; "dlls/gdi/mfdrv" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi/mfdrv" ;;
"dlls/kernel/messages" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/kernel/messages" ;; "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:$LINENO: executing $ac_dest commands" >&5
echo "$as_me: executing $ac_dest commands" >&6;} echo "$as_me: executing $ac_dest commands" >&6;}
case $ac_dest in 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 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") ;; 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 dlls/gdi/mfdrv ) test -d "dlls/gdi/mfdrv" || ({ echo "$as_me:$LINENO: creating dlls/gdi/mfdrv" >&5

2
configure.ac
View File

@ -1507,8 +1507,6 @@ dnl **** Generate output files ****
AH_TOP([#define __WINE_CONFIG_H]) 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/enhmfdrv)
WINE_CONFIG_EXTRA_DIR(dlls/gdi/mfdrv) WINE_CONFIG_EXTRA_DIR(dlls/gdi/mfdrv)
WINE_CONFIG_EXTRA_DIR(dlls/kernel/messages) WINE_CONFIG_EXTRA_DIR(dlls/kernel/messages)

28
dlls/ddraw/Makefile.in
View File

@ -9,18 +9,18 @@ EXTRAINCL = @X_CFLAGS@
EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@
OPENGLFILES = \ OPENGLFILES = \
d3dcommon.c \ d3d_utils.c \
d3ddevice/main.c \ device_main.c \
d3ddevice/mesa.c \ device_opengl.c \
d3dexecutebuffer.c \ direct3d_main.c \
d3dlight.c \ direct3d_opengl.c \
d3dmaterial.c \ executebuffer.c \
d3dtexture.c \ light.c \
d3dvertexbuffer.c \ material.c \
d3dviewport.c \ opengl_utils.c \
direct3d/main.c \ texture.c \
direct3d/mesa.c \ vertexbuffer.c \
mesa.c viewport.c
C_SRCS = \ C_SRCS = \
@OPENGLFILES@ \ @OPENGLFILES@ \
@ -47,10 +47,6 @@ RC_SRCS = version.rc
SUBDIRS = tests SUBDIRS = tests
EXTRASUBDIRS = \
d3ddevice \
direct3d
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@
### Dependencies: ### Dependencies:

0
dlls/ddraw/d3dcommon.c → dlls/ddraw/d3d_utils.c
View File

2
dlls/ddraw/ddraw_main.c
View File

@ -67,7 +67,7 @@
#include "wine/debug.h" #include "wine/debug.h"
#include "ddraw_private.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); WINE_DEFAULT_DEBUG_CHANNEL(ddraw);

0
dlls/ddraw/d3ddevice/main.c → dlls/ddraw/device_main.c
View File

2
dlls/ddraw/d3ddevice/mesa.c → dlls/ddraw/device_opengl.c
View File

@ -43,7 +43,7 @@
#include "wine/library.h" #include "wine/library.h"
#include "d3d_private.h" #include "d3d_private.h"
#include "mesa_private.h" #include "opengl_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(ddraw); WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
WINE_DECLARE_DEBUG_CHANNEL(ddraw_geom); WINE_DECLARE_DEBUG_CHANNEL(ddraw_geom);

0
dlls/ddraw/direct3d/main.c → dlls/ddraw/direct3d_main.c
View File

2
dlls/ddraw/direct3d/mesa.c → dlls/ddraw/direct3d_opengl.c
View File

@ -42,7 +42,7 @@
#include "ddraw_private.h" #include "ddraw_private.h"
#include "d3d_private.h" #include "d3d_private.h"
#include "mesa_private.h" #include "opengl_private.h"
#include "wine/debug.h" #include "wine/debug.h"

2
dlls/ddraw/d3dexecutebuffer.c → dlls/ddraw/executebuffer.c
View File

@ -39,7 +39,7 @@
#include "wine/debug.h" #include "wine/debug.h"
#include "d3d_private.h" #include "d3d_private.h"
#include "mesa_private.h" #include "opengl_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(ddraw); WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
WINE_DECLARE_DEBUG_CHANNEL(ddraw_geom); WINE_DECLARE_DEBUG_CHANNEL(ddraw_geom);

2
dlls/ddraw/d3dlight.c → dlls/ddraw/light.c
View File

@ -37,7 +37,7 @@
#include "wine/debug.h" #include "wine/debug.h"
#include "d3d_private.h" #include "d3d_private.h"
#include "mesa_private.h" #include "opengl_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(ddraw); WINE_DEFAULT_DEBUG_CHANNEL(ddraw);

2
dlls/ddraw/main.c
View File

@ -73,7 +73,7 @@ BOOL opengl_initialized = 0;
#ifdef HAVE_OPENGL #ifdef HAVE_OPENGL
#include "mesa_private.h" #include "opengl_private.h"
static void *gl_handle = NULL; static void *gl_handle = NULL;

2
dlls/ddraw/d3dmaterial.c → dlls/ddraw/material.c
View File

@ -37,7 +37,7 @@
#include "wine/debug.h" #include "wine/debug.h"
#include "d3d_private.h" #include "d3d_private.h"
#include "mesa_private.h" #include "opengl_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(ddraw); WINE_DEFAULT_DEBUG_CHANNEL(ddraw);

0
dlls/ddraw/mesa_private.h → dlls/ddraw/opengl_private.h
View File

2
dlls/ddraw/mesa.c → dlls/ddraw/opengl_utils.c
View File

@ -32,7 +32,7 @@
#include "d3d.h" #include "d3d.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "mesa_private.h" #include "opengl_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(ddraw); WINE_DEFAULT_DEBUG_CHANNEL(ddraw);

2
dlls/ddraw/surface_main.c
View File

@ -30,9 +30,9 @@
#define NONAMELESSSTRUCT #define NONAMELESSSTRUCT
#include "winerror.h" #include "winerror.h"
#include "mesa_private.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "ddraw_private.h" #include "ddraw_private.h"
#include "opengl_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(ddraw); WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
WINE_DECLARE_DEBUG_CHANNEL(ddraw_flip); WINE_DECLARE_DEBUG_CHANNEL(ddraw_flip);

2
dlls/ddraw/d3dtexture.c → dlls/ddraw/texture.c
View File

@ -37,7 +37,7 @@
#include "d3d.h" #include "d3d.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "mesa_private.h" #include "opengl_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(ddraw); WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
WINE_DECLARE_DEBUG_CHANNEL(ddraw_tex); WINE_DECLARE_DEBUG_CHANNEL(ddraw_tex);

2
dlls/ddraw/d3dvertexbuffer.c → dlls/ddraw/vertexbuffer.c
View File

@ -33,7 +33,7 @@
#include "wine/debug.h" #include "wine/debug.h"
#include "d3d_private.h" #include "d3d_private.h"
#include "mesa_private.h" #include "opengl_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(ddraw); WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
WINE_DECLARE_DEBUG_CHANNEL(ddraw_geom); WINE_DECLARE_DEBUG_CHANNEL(ddraw_geom);

0
dlls/ddraw/d3dviewport.c → dlls/ddraw/viewport.c
View File