Skip to content

Commit

Permalink
added mingw64 (msys2) platform support
Browse files Browse the repository at this point in the history
  • Loading branch information
zsoltm committed Jan 30, 2015
1 parent 4e029b1 commit 31fea24
Showing 1 changed file with 15 additions and 8 deletions.
23 changes: 15 additions & 8 deletions Makefile
Expand Up @@ -61,6 +61,13 @@ PLATFORM=$(COMPILE_PLATFORM)
endif
export PLATFORM

ifeq ($(PLATFORM),mingw32)
MINGW=1
endif
ifeq ($(PLATFORM),mingw64)
MINGW=1
endif

ifeq ($(COMPILE_ARCH),i86pc)
COMPILE_ARCH=x86
endif
Expand Down Expand Up @@ -164,7 +171,7 @@ USE_CURL=1
endif

ifndef USE_CURL_DLOPEN
ifeq ($(PLATFORM),mingw32)
ifdef MINGW
USE_CURL_DLOPEN=0
else
USE_CURL_DLOPEN=1
Expand Down Expand Up @@ -508,7 +515,7 @@ else # ifeq darwin
# SETUP AND BUILD -- MINGW32
#############################################################################

ifeq ($(PLATFORM),mingw32)
ifdef MINGW

ifeq ($(CROSS_COMPILING),1)
# If CC is already set to something generic, we probably want to use
Expand Down Expand Up @@ -656,7 +663,7 @@ ifeq ($(PLATFORM),mingw32)
SDLDLL=SDL2.dll
endif

else # ifeq mingw32
else # ifdef MINGW

#############################################################################
# SETUP AND BUILD -- FREEBSD
Expand Down Expand Up @@ -909,7 +916,7 @@ else # ifeq sunos

endif #Linux
endif #darwin
endif #mingw32
endif #MINGW
endif #FreeBSD
endif #OpenBSD
endif #NetBSD
Expand Down Expand Up @@ -1649,7 +1656,7 @@ Q3OBJ = \
$(B)/client/con_log.o \
$(B)/client/sys_main.o

ifeq ($(PLATFORM),mingw32)
ifdef MINGW
Q3OBJ += \
$(B)/client/con_passive.o
else
Expand Down Expand Up @@ -2093,7 +2100,7 @@ ifeq ($(HAVE_VM_COMPILED),true)
endif
endif

ifeq ($(PLATFORM),mingw32)
ifdef MINGW
Q3OBJ += \
$(B)/client/win_resource.o \
$(B)/client/sys_win32.o
Expand Down Expand Up @@ -2261,7 +2268,7 @@ ifeq ($(HAVE_VM_COMPILED),true)
endif
endif

ifeq ($(PLATFORM),mingw32)
ifdef MINGW
Q3DOBJ += \
$(B)/ded/win_resource.o \
$(B)/ded/sys_win32.o \
Expand Down Expand Up @@ -2877,7 +2884,7 @@ distclean: clean toolsclean
@rm -rf $(BUILD_DIR)

installer: release
ifeq ($(PLATFORM),mingw32)
ifdef MINGW
@$(MAKE) VERSION=$(VERSION) -C $(NSISDIR) V=$(V) \
SDLDLL=$(SDLDLL) \
USE_RENDERER_DLOPEN=$(USE_RENDERER_DLOPEN) \
Expand Down

0 comments on commit 31fea24

Please sign in to comment.