Adopt some harmless changes from the 'irontcl' branch. Left 2 changes behind which I'm not so sure about (but I could be convinced ...). Ticket with explanation would be appreciated!

3 files changed, 14 insertions, 5 deletions

diff --git a/win/makefile.vc b/win/makefile.vc
index ada08cc..e0d8d9d 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -121,7 +121,7 @@ the build instructions.
 #		nodep	 = Turns off compatibility macros to ensure the core

 #			    isn't being built with deprecated functions.

 #

-#	MACHINE=(ALPHA|AMD64|IA64|IX86)

+#	MACHINE=(ARM|AMD64|IA64|IX86)

 #		Set the machine type used for the compiler, linker, and

 #		resource compiler.  This hook is needed to tell the tools

 #		when alternate platforms are requested.  IX86 is the default

@@ -484,9 +484,16 @@ cdebug	= -Zi -Od $(DEBUGFLAGS)
 cdebug	= -Zi -WX $(DEBUGFLAGS)

 !endif

 

+### Common compiler options that are architecture specific

+!if "$(MACHINE)" == "ARM"

+carch = -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE

+!else

+carch =

+!endif

+

 ### Declarations common to all compiler options

 cwarn = $(WARNINGS) -D _CRT_SECURE_NO_DEPRECATE -D _CRT_NONSTDC_NO_DEPRECATE

-cflags = -nologo -c $(COMPILERFLAGS) $(cwarn) -Fp$(TMP_DIR)^\

+cflags = -nologo -c $(COMPILERFLAGS) $(carch) $(cwarn) -Fp$(TMP_DIR)^\

 

 !if $(MSVCRT)

 !if $(DEBUG) && !$(UNCHECKED)

@@ -1222,6 +1229,8 @@ clean: clean-pkgs
 	@if exist $(WINDIR)\nmakehlp.obj del $(WINDIR)\nmakehlp.obj

 	@echo Cleaning $(WINDIR)\nmakehlp.exe ...

 	@if exist $(WINDIR)\nmakehlp.exe del $(WINDIR)\nmakehlp.exe

+	@echo Cleaning $(WINDIR)\nmhlp-out.txt ...

+	@if exist $(WINDIR)\nmhlp-out.txt del $(WINDIR)\nmhlp-out.txt

 	@echo Cleaning $(WINDIR)\_junk.pch ...

 	@if exist $(WINDIR)\_junk.pch del $(WINDIR)\_junk.pch

 	@echo Cleaning $(WINDIR)\vercl.x ...

diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c
index 688fa8d..84c7a97 100644
--- a/win/tclWin32Dll.c
+++ b/win/tclWin32Dll.c
@@ -29,7 +29,7 @@ static int platformId;		/* Running under NT, or 95/98? */
  * VC++ 5.x has no 'cpuid' assembler instruction, so we must emulate it
  */
 
-#if defined(_MSC_VER) && (_MSC_VER <= 1100)
+#if defined(_MSC_VER) && (_MSC_VER <= 1100) && defined (_M_IX86)
 #define cpuid	__asm __emit 0fh __asm __emit 0a2h
 #endif
 
@@ -735,7 +735,7 @@ TclWinCPUID(
     __cpuid(regsPtr, index);
     status = TCL_OK;
 
-#   else
+#   elif defined (_M_IX86)
     /*
      * Define a structure in the stack frame to hold the registers.
      */
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 6662327..7586af1 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -828,7 +828,7 @@ tclWinDebugPanic(
     __builtin_trap();
 #elif defined(_WIN64)
     __debugbreak();
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) && defined (_M_IX86)
     _asm {int 3}
 #else
     DebugBreak();