Re: [ros-dev] Linux build && _mingw.h

[Filip Navara]

David Kredba wrote:

>   I got this with your patch :
>
>  In file included from import.c:33:
>  ../../include/wine/windef.h:21:25: windef.h: není souborem ani adresářem
>  import.c:34:21: winbase.h: není souborem ani adresářem
>  import.c: In function `add_extra_undef_symbols':
>  import.c:455: error: `IMAGE_FILE_DLL' undeclared (first use in this 
>  function)
>  import.c:455: error: (Each undeclared identifier is reported only once
>  import.c:455: error: for each function it appears in.)
>  import.c:459: error: `IMAGE_SUBSYSTEM_WINDOWS_GUI' undeclared (first 
>  use in this function)
>  import.c:460: error: `IMAGE_SUBSYSTEM_WINDOWS_CUI' undeclared (first 
>  use in this function)
>  make[2]: *** [import.o] Error 1
>  make[1]: *** [winebuild_target] Error 2 
Ok, try the attached one instead...

Thanks,
Filip

Index: tools/bin2res/Makefile
===================================================================
RCS file: /CVS/ReactOS/reactos/tools/bin2res/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- tools/bin2res/Makefile	3 Jan 2004 22:25:51 -0000	1.2
+++ tools/bin2res/Makefile	26 Dec 2004 17:28:56 -0000
@@ -8,7 +8,7 @@
 
 CLEAN_FILES = *.o bin2res$(EXE_POSTFIX)
 
-HOST_CFLAGS = -I$(PATH_TO_TOP)/include/wine -I$(PATH_TO_TOP)/include -D__REACTOS__ -Wall
-Werror
+HOST_CFLAGS = -I$(PATH_TO_TOP)/include/wine -D__REACTOS__ -Wall -Werror
 
 bin2res.o: bin2res.c
 	$(HOST_CC) -g $(HOST_CFLAGS) -c bin2res.c -o bin2res.o
Index: tools/bin2res/bin2res.c
===================================================================
RCS file: /CVS/ReactOS/reactos/tools/bin2res/bin2res.c,v
retrieving revision 1.2
diff -u -r1.2 bin2res.c
--- tools/bin2res/bin2res.c	2 Aug 2004 07:59:38 -0000	1.2
+++ tools/bin2res/bin2res.c	26 Dec 2004 17:32:14 -0000
@@ -21,7 +21,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -32,6 +31,11 @@
 #ifdef HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+extern int mkstemps(char *template, int suffix_len);
 
 static const char* help =
         "Usage: bin2res [OPTIONS] <rsrc.rc>\n"
Index: tools/bin2res/mkstemps.c
===================================================================
RCS file: /CVS/ReactOS/reactos/tools/bin2res/mkstemps.c,v
retrieving revision 1.1
diff -u -r1.1 mkstemps.c
--- tools/bin2res/mkstemps.c	2 Jan 2004 19:49:47 -0000	1.1
+++ tools/bin2res/mkstemps.c	26 Dec 2004 17:28:40 -0000
@@ -17,7 +17,6 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <sys/types.h>
 #include <stdlib.h>
Index: tools/winebuild/Makefile
===================================================================
RCS file: /CVS/ReactOS/reactos/tools/winebuild/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- tools/winebuild/Makefile	27 Sep 2004 08:15:07 -0000	1.6
+++ tools/winebuild/Makefile	26 Dec 2004 18:04:48 -0000
@@ -22,7 +22,7 @@
 
 CLEAN_FILES = *.o $(TARGET)
 
-HOST_CFLAGS = -D__USE_W32API -I$(PATH_TO_TOP)/include -I$(PATH_TO_TOP)/include/wine
-I$(W32API_PATH)/include
+HOST_CFLAGS = -D__USE_W32API -I$(PATH_TO_TOP)/include/wine
 
 %.o: %.c
 	$(HOST_CC) $(HOST_CFLAGS) -c $< -o $@
Index: tools/winebuild/import.c
===================================================================
RCS file: /CVS/ReactOS/reactos/tools/winebuild/import.c,v
retrieving revision 1.4
diff -u -r1.4 import.c
--- tools/winebuild/import.c	23 Sep 2004 20:27:30 -0000	1.4
+++ tools/winebuild/import.c	26 Dec 2004 18:05:00 -0000
@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <ctype.h>
 #include <fcntl.h>
@@ -31,8 +30,7 @@
 # include <unistd.h>
 #endif
 
-#include "windef.h"
-#include "winbase.h"
+#include "winglue.h"
 #include "build.h"
 
 struct import
Index: tools/winebuild/main.c
===================================================================
RCS file: /CVS/ReactOS/reactos/tools/winebuild/main.c,v
retrieving revision 1.5
diff -u -r1.5 main.c
--- tools/winebuild/main.c	2 Nov 2004 19:47:18 -0000	1.5
+++ tools/winebuild/main.c	26 Dec 2004 18:05:06 -0000
@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <stdio.h>
@@ -35,8 +34,7 @@
 # include <getopt.h>
 #endif
 
-#include "windef.h"
-#include "winbase.h"
+#include "winglue.h"
 #include "build.h"
 
 int UsePIC = 0;
Index: tools/winebuild/mkstemps.c
===================================================================
RCS file: /CVS/ReactOS/reactos/tools/winebuild/mkstemps.c,v
retrieving revision 1.1
diff -u -r1.1 mkstemps.c
--- tools/winebuild/mkstemps.c	5 Jan 2004 19:49:59 -0000	1.1
+++ tools/winebuild/mkstemps.c	26 Dec 2004 18:04:48 -0000
@@ -17,7 +17,6 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <sys/types.h>
 #include <stdlib.h>
Index: tools/winebuild/parser.c
===================================================================
RCS file: /CVS/ReactOS/reactos/tools/winebuild/parser.c,v
retrieving revision 1.3
diff -u -r1.3 parser.c
--- tools/winebuild/parser.c	23 Sep 2004 20:27:30 -0000	1.3
+++ tools/winebuild/parser.c	26 Dec 2004 18:05:14 -0000
@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <ctype.h>
@@ -32,8 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "windef.h"
-#include "winbase.h"
+#include "winglue.h"
 #include "build.h"
 
 int current_line = 0;
Index: tools/winebuild/relay.c
===================================================================
RCS file: /CVS/ReactOS/reactos/tools/winebuild/relay.c,v
retrieving revision 1.2
diff -u -r1.2 relay.c
--- tools/winebuild/relay.c	23 Sep 2004 20:27:30 -0000	1.2
+++ tools/winebuild/relay.c	26 Dec 2004 18:04:48 -0000
@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <ctype.h>
 
Index: tools/winebuild/res16.c
===================================================================
RCS file: /CVS/ReactOS/reactos/tools/winebuild/res16.c,v
retrieving revision 1.3
diff -u -r1.3 res16.c
--- tools/winebuild/res16.c	23 Sep 2004 20:27:30 -0000	1.3
+++ tools/winebuild/res16.c	26 Dec 2004 18:05:20 -0000
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -37,8 +36,7 @@
 #include <sys/mman.h>
 #endif
 
-#include "windef.h"
-#include "winbase.h"
+#include "winglue.h"
 #include "build.h"
 
 #define ALIGNMENT 2 /* alignment for resource data */
Index: tools/winebuild/res32.c
===================================================================
RCS file: /CVS/ReactOS/reactos/tools/winebuild/res32.c,v
retrieving revision 1.3
diff -u -r1.3 res32.c
--- tools/winebuild/res32.c	23 Sep 2004 20:27:30 -0000	1.3
+++ tools/winebuild/res32.c	26 Dec 2004 18:05:26 -0000
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -37,8 +36,7 @@
 #include <sys/mman.h>
 #endif
 
-#include "windef.h"
-#include "winbase.h"
+#include "winglue.h"
 #include "build.h"
 
 /* Unicode string or integer id */
Index: tools/winebuild/spec16.c
===================================================================
RCS file: /CVS/ReactOS/reactos/tools/winebuild/spec16.c,v
retrieving revision 1.2
diff -u -r1.2 spec16.c
--- tools/winebuild/spec16.c	23 Sep 2004 20:27:30 -0000	1.2
+++ tools/winebuild/spec16.c	26 Dec 2004 18:04:48 -0000
@@ -23,7 +23,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <ctype.h>
Index: tools/winebuild/spec32.c
===================================================================
RCS file: /CVS/ReactOS/reactos/tools/winebuild/spec32.c,v
retrieving revision 1.8
diff -u -r1.8 spec32.c
--- tools/winebuild/spec32.c	24 Nov 2004 20:11:52 -0000	1.8
+++ tools/winebuild/spec32.c	26 Dec 2004 18:05:36 -0000
@@ -23,19 +23,14 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
 #include <ctype.h>
 #include <stdarg.h>
 #include <string.h>
 
-#ifdef WIN32
-#include "windef.h"
-#include "winbase.h"
-#else
 #include "winglue.h"
-#endif
+
 #define EXCEPTION_WINE_STUB       0x80000100  /* stub entry point called */
 #define EH_NONCONTINUABLE   0x01
 
Index: tools/winebuild/utils.c
===================================================================
RCS file: /CVS/ReactOS/reactos/tools/winebuild/utils.c,v
retrieving revision 1.3
diff -u -r1.3 utils.c
--- tools/winebuild/utils.c	23 Sep 2004 20:27:30 -0000	1.3
+++ tools/winebuild/utils.c	26 Dec 2004 18:04:48 -0000
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/port.h"
 
 #if !defined(WIN32)
 #undef strdup