Module: wine Branch: master Commit: f60ec4ea06e7ed0f4879523f79901fc64cb1ae35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f60ec4ea06e7ed0f4879523f7...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Nov 12 11:20:28 2020 +0100
glu32: Build with msvcrt.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/glu32/Makefile.in | 2 ++ dlls/glu32/glu.c | 3 --- dlls/glu32/mipmap.c | 9 --------- dlls/glu32/project.c | 3 --- dlls/glu32/quad.c | 3 --- 5 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/dlls/glu32/Makefile.in b/dlls/glu32/Makefile.in index 71d019d4fc1..587191229f8 100644 --- a/dlls/glu32/Makefile.in +++ b/dlls/glu32/Makefile.in @@ -2,6 +2,8 @@ MODULE = glu32.dll IMPORTLIB = glu32 IMPORTS = opengl32
+EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ geom.c \ glu.c \ diff --git a/dlls/glu32/glu.c b/dlls/glu32/glu.c index 09d099f485d..9305b90d308 100644 --- a/dlls/glu32/glu.c +++ b/dlls/glu32/glu.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 <assert.h> #include <stdarg.h>
diff --git a/dlls/glu32/mipmap.c b/dlls/glu32/mipmap.c index 2eff5583bcf..6877e2f342c 100644 --- a/dlls/glu32/mipmap.c +++ b/dlls/glu32/mipmap.c @@ -28,9 +28,6 @@ * Silicon Graphics, Inc. */
-#include "config.h" -#include "wine/port.h" - #include <assert.h> #include <stdarg.h> #include <stdlib.h> @@ -4770,10 +4767,6 @@ static void fill_image(const PixelStorageModes *psm, assert(iter2 == &newimage[width*height* elements_per_group(format,0)]); } - assert( iter == &((const GLubyte *)userdata)[rowsize*height + - psm->unpack_skip_rows * rowsize + - psm->unpack_skip_pixels * group_size] ); - } /* else */ } /* fill_image() */
@@ -6049,8 +6042,6 @@ static void scaleInternalPackedPixel(int components, highy_int++; } } - - assert(outindex == (widthOut*heightOut - 1)); } /* scaleInternalPackedPixel() */
/* rowSizeInBytes is at least the width (in bytes) due to padding on diff --git a/dlls/glu32/project.c b/dlls/glu32/project.c index 3db0331e96b..dc104541b8f 100644 --- a/dlls/glu32/project.c +++ b/dlls/glu32/project.c @@ -28,9 +28,6 @@ * Silicon Graphics, Inc. */
-#include "config.h" -#include "wine/port.h" - #include <math.h>
#include "windef.h" diff --git a/dlls/glu32/quad.c b/dlls/glu32/quad.c index f9914ed31c8..9ffaa6bd4de 100644 --- a/dlls/glu32/quad.c +++ b/dlls/glu32/quad.c @@ -28,9 +28,6 @@ * Silicon Graphics, Inc. */
-#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include <math.h>