Fix PTR64 autodetect for Windows

This commit is contained in:
Aaron Giles 2010-01-16 04:40:55 +00:00
parent aebc07a897
commit f373246c42
2 changed files with 17 additions and 12 deletions

View File

@ -61,9 +61,11 @@ endif
#-------------------------------------------------
ifndef TARGETOS
ifeq ($(OS),Windows_NT)
TARGETOS = win32
else
ifneq ($(CROSSBUILD),1)
UNAME = $(shell uname -a)
@ -93,8 +95,23 @@ endif
endif # CROSS_BUILD
endif # Windows_NT
endif # TARGET_OS
ifeq ($(TARGETOS),win32)
# Autodetect PTR64
ifndef PTR64
ifneq (,$(findstring mingw64-w64,$(PATH)))
PTR64=1
endif
endif
endif
#-------------------------------------------------
# configure name of final executable
#-------------------------------------------------

View File

@ -78,18 +78,6 @@ OBJDIRS += $(WINOBJ)
#-------------------------------------------------
# auto-detect PTR64
#-------------------------------------------------
ifndef PTR64
ifneq (,$(findstring mingw64-w64,$(PATH)))
PTR64=1
endif
endif
#-------------------------------------------------
# configure the resource compiler
#-------------------------------------------------