diff options
| author | 2010-01-16 04:40:55 +0000 | |
|---|---|---|
| committer | 2010-01-16 04:40:55 +0000 | |
| commit | f373246c42143a920dba20b1f95f0b29018d4efb (patch) | |
| tree | 452cfe2879085b9aa3d86f9cf56afc50cd0de16e | |
| parent | aebc07a8971238b115210e89eca8e7824eca8dbc (diff) | |
Fix PTR64 autodetect for Windows
| -rw-r--r-- | makefile | 17 | ||||
| -rw-r--r-- | src/osd/windows/windows.mak | 12 |
2 files changed, 17 insertions, 12 deletions
@@ -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 #------------------------------------------------- diff --git a/src/osd/windows/windows.mak b/src/osd/windows/windows.mak index 10c7e8f743a..21d6efeb9a3 100644 --- a/src/osd/windows/windows.mak +++ b/src/osd/windows/windows.mak @@ -79,18 +79,6 @@ OBJDIRS += $(WINOBJ) #------------------------------------------------- -# auto-detect PTR64 -#------------------------------------------------- - -ifndef PTR64 -ifneq (,$(findstring mingw64-w64,$(PATH))) -PTR64=1 -endif -endif - - - -#------------------------------------------------- # configure the resource compiler #------------------------------------------------- |
