Author: rfm
Date: Mon Jun 27 18:38:51 2016
New Revision: 39930
URL: http://svn.gna.org/viewcvs/gnustep?rev=39930&view=rev
Log:
msys2 64bit tweaks
Modified:
libs/base/trunk/Headers/GNUstepBase/GSConfig.h.in
libs/base/trunk/Source/GNUmakefile
Modified: libs/base/trunk/Headers/GNUstepBase/GSConfig.h.in
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Headers/GNUstepBase/GSConfig.h.in?rev=39930&r1=39929&r2=39930&view=diff
==============================================================================
--- libs/base/trunk/Headers/GNUstepBase/GSConfig.h.in (original)
+++ libs/base/trunk/Headers/GNUstepBase/GSConfig.h.in Mon Jun 27 18:38:51 2016
@@ -294,6 +294,7 @@
#if defined(_WIN32)
#define BOOL WinBOOL
+#define __OBJC_BOOL 1
#include <w32api.h>
#ifndef _WIN32_WINNT
#define _WIN32_WINNT Windows2000
@@ -305,8 +306,15 @@
#define WINVER Windows2000
#endif
+#if defined(__WIN64__)
+#include <winsock2.h>
+#include <windows.h>
+#else
#include <windows.h>
#include <winsock2.h>
+#endif
+
+#undef __OBJC_BOOL
#undef BOOL
#endif
Modified: libs/base/trunk/Source/GNUmakefile
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/GNUmakefile?rev=39930&r1=39929&r2=39930&view=diff
==============================================================================
--- libs/base/trunk/Source/GNUmakefile (original)
+++ libs/base/trunk/Source/GNUmakefile Mon Jun 27 18:38:51 2016
@@ -83,7 +83,11 @@
ifeq ($(GNUSTEP_TARGET_OS), mingw32)
libgnustep-base_SUBPROJECTS += win32
else
- libgnustep-base_SUBPROJECTS += unix
+ ifeq ($(GNUSTEP_TARGET_OS), mingw64)
+ libgnustep-base_SUBPROJECTS += win32
+ else
+ libgnustep-base_SUBPROJECTS += unix
+ endif
endif
DEFS+= -DGNUSTEP_TARGET_DIR=\"$(GNUSTEP_TARGET_DIR)\" \
@@ -104,6 +108,9 @@
endif
ifeq ($(GNUSTEP_TARGET_OS), mingw32)
+ GNU_MFILES += libgnustep-base-entry.m
+endif
+ifeq ($(GNUSTEP_TARGET_OS), mingw64)
GNU_MFILES += libgnustep-base-entry.m
endif
@@ -307,10 +314,12 @@
objc-load.m
ifneq ($(GNUSTEP_TARGET_OS), mingw32)
+ ifneq ($(GNUSTEP_TARGET_OS), mingw64)
BASE_MFILES += \
GSFileHandle.m \
NSMessagePort.m \
NSMessagePortNameServer.m
+ endif
endif
ifeq ($(GNUSTEP_BASE_HAVE_MDNS), 1)
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
