Alexandre Julliard : ddraw: Build with msvcrt.

Alexandre Julliard julliard at winehq.org
Tue Jul 2 15:32:02 CDT 2019


Module: wine
Branch: master
Commit: 0d48c2e796d3b09d3b70eb0958bdffc1621843d0
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=0d48c2e796d3b09d3b70eb0958bdffc1621843d0

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jul  2 09:56:16 2019 +0200

ddraw: Build with msvcrt.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ddraw/Makefile.in     | 2 ++
 dlls/ddraw/clipper.c       | 3 ---
 dlls/ddraw/ddraw.c         | 3 ---
 dlls/ddraw/ddraw_private.h | 1 +
 dlls/ddraw/device.c        | 3 ---
 dlls/ddraw/executebuffer.c | 3 ---
 dlls/ddraw/light.c         | 3 ---
 dlls/ddraw/main.c          | 3 ---
 dlls/ddraw/material.c      | 3 ---
 dlls/ddraw/palette.c       | 3 ---
 dlls/ddraw/surface.c       | 3 ---
 dlls/ddraw/utils.c         | 3 ---
 dlls/ddraw/vertexbuffer.c  | 3 ---
 dlls/ddraw/viewport.c      | 3 ---
 14 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/dlls/ddraw/Makefile.in b/dlls/ddraw/Makefile.in
index 5106834..7f51fd3 100644
--- a/dlls/ddraw/Makefile.in
+++ b/dlls/ddraw/Makefile.in
@@ -2,6 +2,8 @@ MODULE    = ddraw.dll
 IMPORTLIB = ddraw
 IMPORTS   = dxguid uuid wined3d user32 gdi32 advapi32
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	clipper.c \
 	ddraw.c \
diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c
index 68a0a7f..760b22d 100644
--- a/dlls/ddraw/clipper.c
+++ b/dlls/ddraw/clipper.c
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "ddraw_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 8dce5ce..076289b 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -21,9 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "ddraw_private.h"
 #include "ddrawi.h"
 #include "d3dhal.h"
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index b228f3e..11861f2 100644
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -21,6 +21,7 @@
 
 #include <assert.h>
 #include <limits.h>
+#include <math.h>
 #define COBJMACROS
 #define NONAMELESSSTRUCT
 #define NONAMELESSUNION
diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index fb33372..690332d 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -27,9 +27,6 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "ddraw_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c
index d5de513..80dbdfd 100644
--- a/dlls/ddraw/executebuffer.c
+++ b/dlls/ddraw/executebuffer.c
@@ -18,9 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "ddraw_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c
index 9c624f1..a8c3a93 100644
--- a/dlls/ddraw/light.c
+++ b/dlls/ddraw/light.c
@@ -17,9 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "ddraw_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c
index ac4d3f7..5236b39 100644
--- a/dlls/ddraw/main.c
+++ b/dlls/ddraw/main.c
@@ -21,9 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #define DDRAW_INIT_GUID
 #include "ddraw_private.h"
 #include "rpcproxy.h"
diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c
index 1fbf093..01c93e8 100644
--- a/dlls/ddraw/material.c
+++ b/dlls/ddraw/material.c
@@ -17,9 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "ddraw_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c
index 87aec96..980c62b 100644
--- a/dlls/ddraw/palette.c
+++ b/dlls/ddraw/palette.c
@@ -16,9 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "ddraw_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 4e2faef..cf3b31f 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -21,9 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "ddraw_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c
index b0a028d..2aa4cc2 100644
--- a/dlls/ddraw/utils.c
+++ b/dlls/ddraw/utils.c
@@ -21,9 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "ddraw_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c
index 07c0d28..9df386d 100644
--- a/dlls/ddraw/vertexbuffer.c
+++ b/dlls/ddraw/vertexbuffer.c
@@ -17,9 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "ddraw_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c
index 556783a..5fc7a4b 100644
--- a/dlls/ddraw/viewport.c
+++ b/dlls/ddraw/viewport.c
@@ -17,9 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "ddraw_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);




More information about the wine-cvs mailing list