Support cross-compiling Tcl for 'Win32 on ARM' using Visual Studio.

1 files changed, 11 insertions, 2 deletions

diff --git a/win/makefile.vc b/win/makefile.vc
index 6f61327..a5a64b8 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -124,7 +124,7 @@ the build instructions.
 #		nodep	 = Turns off compatability 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

@@ -456,9 +456,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)

@@ -536,6 +543,8 @@ baselibs   = $(baselibs) ucrt.lib
 !endif

 

 guilibs	  = $(baselibs) gdi32.lib

+guilibs	  = $(guilibs) comdlg32.lib imm32.lib comctl32.lib shell32.lib

+guilibs	  = $(guilibs) uuid.lib ole32.lib oleaut32.lib

 

 

 #---------------------------------------------------------------------