ioquake
/
ioq3
mirror of https://github.com/ioquake/ioq3.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #110 from zsoltm/mingw64 

added mingw64 (msys2) platform support
This commit is contained in:
Tim Angus 2015-06-12 16:28:13 +01:00
parent 708fe6937a 31fea24321
commit 76e0c51a1a
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile
View File

@ -61,6 +61,13 @@ PLATFORM=$(COMPILE_PLATFORM)
endif endif
export PLATFORM export PLATFORM
ifeq ($(PLATFORM),mingw32)
MINGW=1
endif
ifeq ($(PLATFORM),mingw64)
MINGW=1
endif
ifeq ($(COMPILE_ARCH),i86pc) ifeq ($(COMPILE_ARCH),i86pc)
COMPILE_ARCH=x86 COMPILE_ARCH=x86
endif endif
@ -164,7 +171,7 @@ USE_CURL=1
endif endif
ifndef USE_CURL_DLOPEN ifndef USE_CURL_DLOPEN
ifeq ($(PLATFORM),mingw32) ifdef MINGW
USE_CURL_DLOPEN=0 USE_CURL_DLOPEN=0
else else
USE_CURL_DLOPEN=1 USE_CURL_DLOPEN=1
@ -506,7 +513,7 @@ else # ifeq darwin
# SETUP AND BUILD -- MINGW32 # SETUP AND BUILD -- MINGW32
############################################################################# #############################################################################
ifeq ($(PLATFORM),mingw32) ifdef MINGW
ifeq ($(CROSS_COMPILING),1) ifeq ($(CROSS_COMPILING),1)
# If CC is already set to something generic, we probably want to use # If CC is already set to something generic, we probably want to use
@ -652,7 +659,7 @@ ifeq ($(PLATFORM),mingw32)
SDLDLL=SDL2.dll SDLDLL=SDL2.dll
endif endif
else # ifeq mingw32 else # ifdef MINGW
############################################################################# #############################################################################
# SETUP AND BUILD -- FREEBSD # SETUP AND BUILD -- FREEBSD
@ -903,7 +910,7 @@ else # ifeq sunos
endif #Linux endif #Linux
endif #darwin endif #darwin
endif #mingw32 endif #MINGW
endif #FreeBSD endif #FreeBSD
endif #OpenBSD endif #OpenBSD
endif #NetBSD endif #NetBSD
@ -1642,7 +1649,7 @@ Q3OBJ = \
$(B)/client/con_log.o \ $(B)/client/con_log.o \
$(B)/client/sys_main.o $(B)/client/sys_main.o
ifeq ($(PLATFORM),mingw32) ifdef MINGW
Q3OBJ += \ Q3OBJ += \
$(B)/client/con_passive.o $(B)/client/con_passive.o
else else
@ -2086,7 +2093,7 @@ ifeq ($(HAVE_VM_COMPILED),true)
endif endif
endif endif
ifeq ($(PLATFORM),mingw32) ifdef MINGW
Q3OBJ += \ Q3OBJ += \
$(B)/client/win_resource.o \ $(B)/client/win_resource.o \
$(B)/client/sys_win32.o $(B)/client/sys_win32.o
@ -2254,7 +2261,7 @@ ifeq ($(HAVE_VM_COMPILED),true)
endif endif
endif endif
ifeq ($(PLATFORM),mingw32) ifdef MINGW
Q3DOBJ += \ Q3DOBJ += \
$(B)/ded/win_resource.o \ $(B)/ded/win_resource.o \
$(B)/ded/sys_win32.o \ $(B)/ded/sys_win32.o \
@ -2870,7 +2877,7 @@ distclean: clean toolsclean
@rm -rf $(BUILD_DIR) @rm -rf $(BUILD_DIR)
installer: release installer: release
ifeq ($(PLATFORM),mingw32) ifdef MINGW
@$(MAKE) VERSION=$(VERSION) -C $(NSISDIR) V=$(V) \ @$(MAKE) VERSION=$(VERSION) -C $(NSISDIR) V=$(V) \
SDLDLL=$(SDLDLL) \ SDLDLL=$(SDLDLL) \
USE_RENDERER_DLOPEN=$(USE_RENDERER_DLOPEN) \ USE_RENDERER_DLOPEN=$(USE_RENDERER_DLOPEN) \