diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-11-17 11:27:13 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-11-17 11:27:13 (GMT) |
| commit | a27501598a341435dbc5b32bbbfb3635aebff956 (patch) | |
| tree | 3ce1d60f74e3c947e5a6aac865eb48d9dde0f6d4 /win/rules.vc | |
| parent | 5560b9198b6cdd785cf9d82301a7fff87c0c8c1f (diff) | |
| parent | 24d7fa64015b310278717d5f2462d84b7f7cd124 (diff) | |
| download | tcl-a27501598a341435dbc5b32bbbfb3635aebff956.zip tcl-a27501598a341435dbc5b32bbbfb3635aebff956.tar.gz tcl-a27501598a341435dbc5b32bbbfb3635aebff956.tar.bz2 | |
merge core-8-6-branch
Diffstat (limited to 'win/rules.vc')
| -rw-r--r-- | win/rules.vc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/win/rules.vc b/win/rules.vc index 425f873..1351455 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -1311,6 +1311,13 @@ cwarn = $(WARNINGS) cwarn = $(cwarn) -wd4311 -wd4312
!endif
+### Common compiler options that are architecture specific
+!if "$(MACHINE)" == "ARM"
+carch = -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE
+!else
+carch =
+!endif
+
!if $(DEBUG)
# Turn warnings into errors
cwarn = $(cwarn) -WX
@@ -1326,7 +1333,7 @@ INCLUDES = $(INCLUDES) -I"$(GENERICDIR)" -I"$(WINDIR)" -I"$(COMPATDIR)" # post-reform build logs
# cflags contains generic flags used for building practically all object files
-cflags = -nologo -c $(COMPILERFLAGS) $(cwarn) -Fp$(TMP_DIR)^\ $(cdebug)
+cflags = -nologo -c $(COMPILERFLAGS) $(carch) $(cwarn) -Fp$(TMP_DIR)^\ $(cdebug)
# appcflags contains $(cflags) and flags for building the application
# object files (e.g. tclsh, or wish) pkgcflags contains $(cflags) plus
@@ -1494,6 +1501,8 @@ default-clean: @if exist $(WINDIR)\nmakehlp.obj del $(WINDIR)\nmakehlp.obj
@if exist $(WINDIR)\nmakehlp.exe del $(WINDIR)\nmakehlp.exe
@if exist $(WINDIR)\nmakehlp.out del $(WINDIR)\nmakehlp.out
+ @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, vercl.i ...
|