diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-08-17 22:26:48 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-08-17 22:26:48 (GMT) |
commit | f338acabb27d64eddd5ccccd3adf4fdbfbcc94f9 (patch) | |
tree | 04de0545f0e808536feee3596569bcdc37f31c7a /win/makefile.vc | |
parent | 3fa2df99d2930a900ec7494cb122eb01b975c6c6 (diff) | |
parent | a18c3eca9bb851589fcb45fbcef0d8be43396a15 (diff) | |
download | tcl-f338acabb27d64eddd5ccccd3adf4fdbfbcc94f9.zip tcl-f338acabb27d64eddd5ccccd3adf4fdbfbcc94f9.tar.gz tcl-f338acabb27d64eddd5ccccd3adf4fdbfbcc94f9.tar.bz2 |
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!
Diffstat (limited to 'win/makefile.vc')
-rw-r--r-- | win/makefile.vc | 13 |
1 files changed, 11 insertions, 2 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 ...
|