gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

msys2 64bit tweaks

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@39930 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2016-06-27 16:38:51 +00:00
parent 40bfca6870
commit 87e7dd43de
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Headers/GNUstepBase/GSConfig.h.in
View file

@ -294,6 +294,7 @@ typedef struct {
#if defined(_WIN32)
#define BOOL WinBOOL
#define __OBJC_BOOL 1
#include <w32api.h>
#ifndef _WIN32_WINNT
#define _WIN32_WINNT Windows2000
@ -305,8 +306,15 @@ typedef struct {
#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

11
Source/GNUmakefile
View file

@ -83,7 +83,11 @@ libgnustep-baseadd_SUBPROJECTS += Additions
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)\" \
@ -106,6 +110,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
GNU_OTHER_SRCFILES = \
win32-entry.m \
@ -307,10 +314,12 @@ externs.m \
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)