Module: wine Branch: master Commit: 35033025aa9358961053b9d755ca33f93f218b8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=35033025aa9358961053b9d755...
Author: Ken Thomases ken@codeweavers.com Date: Sun Dec 16 18:06:52 2012 -0600
winequartz.drv: Rename to winemac.drv ("the Mac driver").
---
configure | 6 +++--- configure.ac | 8 ++++---- dlls/{winequartz.drv => winemac.drv}/Makefile.in | 4 ++-- .../quartzdrv_main.c => winemac.drv/macdrv_main.c} | 4 ++-- .../winemac.drv.spec} | 0 5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/configure b/configure index e96750d..7b3b31d 100755 --- a/configure +++ b/configure @@ -6673,7 +6673,7 @@ done then CARBONLIB="-framework Carbon"
- enable_winequartz_drv=${enable_winequartz_drv:-yes} + enable_winemac_drv=${enable_winemac_drv:-yes} fi if test "x$enable_win16" = "xyes" then @@ -7129,7 +7129,7 @@ $as_echo "$ac_cv_c_dll_hpux" >&6; } esac
enable_wineqtdecoder=${enable_wineqtdecoder:-no} -enable_winequartz_drv=${enable_winequartz_drv:-no} +enable_winemac_drv=${enable_winemac_drv:-no}
if test "$LIBEXT" = "a"; then as_fn_error $? "could not find a way to build shared libraries. @@ -15866,13 +15866,13 @@ wine_fn_config_lib winecrt0 wine_fn_config_dll wined3d enable_wined3d implib wine_fn_config_dll winegstreamer enable_winegstreamer wine_fn_config_dll winejoystick.drv enable_winejoystick_drv +wine_fn_config_dll winemac.drv enable_winemac_drv wine_fn_config_dll winemapi enable_winemapi wine_fn_config_dll winemp3.acm enable_winemp3_acm wine_fn_config_dll wineoss.drv enable_wineoss_drv wine_fn_config_dll wineps.drv enable_wineps_drv install-lib,po wine_fn_config_dll wineps16.drv16 enable_win16 wine_fn_config_dll wineqtdecoder enable_wineqtdecoder -wine_fn_config_dll winequartz.drv enable_winequartz_drv wine_fn_config_dll winex11.drv enable_winex11_drv wine_fn_config_dll wing.dll16 enable_win16 wine_fn_config_dll wing32 enable_wing32 diff --git a/configure.ac b/configure.ac index 2a4ea4e..3a07cbf 100644 --- a/configure.ac +++ b/configure.ac @@ -796,11 +796,11 @@ case $host_os in else WINE_NOTICE([QuickTime ${notice_platform}development files not found, video decoding won't be supported.]) fi - dnl Enable quartz driver on Mac OS X + dnl Enable Mac driver on Mac OS X if test "$ac_cv_header_Carbon_Carbon_h" = "yes" then AC_SUBST(CARBONLIB,"-framework Carbon") - enable_winequartz_drv=${enable_winequartz_drv:-yes} + enable_winemac_drv=${enable_winemac_drv:-yes} fi dnl Check for Xcode 3.x broken 16-bit support if test "x$enable_win16" = "xyes" @@ -899,7 +899,7 @@ case $host_os in esac
enable_wineqtdecoder=${enable_wineqtdecoder:-no} -enable_winequartz_drv=${enable_winequartz_drv:-no} +enable_winemac_drv=${enable_winemac_drv:-no}
if test "$LIBEXT" = "a"; then AC_MSG_ERROR( @@ -3045,13 +3045,13 @@ WINE_CONFIG_LIB(winecrt0) WINE_CONFIG_DLL(wined3d,,[implib]) WINE_CONFIG_DLL(winegstreamer) WINE_CONFIG_DLL(winejoystick.drv) +WINE_CONFIG_DLL(winemac.drv) WINE_CONFIG_DLL(winemapi) WINE_CONFIG_DLL(winemp3.acm) WINE_CONFIG_DLL(wineoss.drv) WINE_CONFIG_DLL(wineps.drv,,[install-lib,po]) WINE_CONFIG_DLL(wineps16.drv16,enable_win16) WINE_CONFIG_DLL(wineqtdecoder) -WINE_CONFIG_DLL(winequartz.drv) WINE_CONFIG_DLL(winex11.drv) WINE_CONFIG_DLL(wing.dll16,enable_win16) WINE_CONFIG_DLL(wing32) diff --git a/dlls/winequartz.drv/Makefile.in b/dlls/winemac.drv/Makefile.in similarity index 58% rename from dlls/winequartz.drv/Makefile.in rename to dlls/winemac.drv/Makefile.in index 18801f5..4145dff 100644 --- a/dlls/winequartz.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -1,7 +1,7 @@ -MODULE = winequartz.drv +MODULE = winemac.drv IMPORTS = user32 gdi32 advapi32
C_SRCS = \ - quartzdrv_main.c + macdrv_main.c
@MAKE_DLL_RULES@ diff --git a/dlls/winequartz.drv/quartzdrv_main.c b/dlls/winemac.drv/macdrv_main.c similarity index 94% rename from dlls/winequartz.drv/quartzdrv_main.c rename to dlls/winemac.drv/macdrv_main.c index 88bc6ac..17aebf6 100644 --- a/dlls/winequartz.drv/quartzdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -1,5 +1,5 @@ /* - * QUARTZDRV initialization code + * MACDRV initialization code * * Copyright 1998 Patrik Stridvall * Copyright 2000 Alexandre Julliard @@ -27,7 +27,7 @@ #include "winreg.h"
/*********************************************************************** - * QUARTZDRV initialisation routine + * MACDRV initialisation routine */ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { diff --git a/dlls/winequartz.drv/winequartz.drv.spec b/dlls/winemac.drv/winemac.drv.spec similarity index 100% rename from dlls/winequartz.drv/winequartz.drv.spec rename to dlls/winemac.drv/winemac.drv.spec