Because XP is no longer supported, _ATL_XP_TARGETING is no longer needed

tcltk · Aug 22, 2024 · 130efcd · 130efcd
1 parent a8be4e1
commit 130efcd
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 49 deletions.
diff --git a/win/Makefile.in b/win/Makefile.in
@@ -174,7 +174,7 @@ LDFLAGS_OPTIMIZE = @LDFLAGS_OPTIMIZE@
 #CFLAGS		= $(CFLAGS_DEBUG)
 #CFLAGS		= $(CFLAGS_OPTIMIZE)
 #CFLAGS		= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
-CFLAGS		= @CFLAGS@ @CFLAGS_DEFAULT@ -D_ATL_XP_TARGETING=1 -D__USE_MINGW_ANSI_STDIO=0
+CFLAGS		= @CFLAGS@ @CFLAGS_DEFAULT@ -D__USE_MINGW_ANSI_STDIO=0
 
 # Special compiler flags to use when building man2tcl on Windows.
 MAN2TCLFLAGS	= @MAN2TCLFLAGS@

diff --git a/win/makefile.vc b/win/makefile.vc
@@ -281,39 +281,39 @@ TKOBJS = \
 !endif
 
 TTK_OBJS = \
-        $(TMP_DIR)\ttkWinMonitor.obj \
-        $(TMP_DIR)\ttkWinTheme.obj \
-        $(TMP_DIR)\ttkWinXPTheme.obj \
-        $(TMP_DIR)\ttkBlink.obj \
-        $(TMP_DIR)\ttkButton.obj \
-        $(TMP_DIR)\ttkCache.obj \
-        $(TMP_DIR)\ttkClamTheme.obj \
-        $(TMP_DIR)\ttkClassicTheme.obj \
-        $(TMP_DIR)\ttkDefaultTheme.obj \
-        $(TMP_DIR)\ttkElements.obj \
-        $(TMP_DIR)\ttkEntry.obj \
-        $(TMP_DIR)\ttkFrame.obj \
-        $(TMP_DIR)\ttkImage.obj \
-        $(TMP_DIR)\ttkInit.obj \
-        $(TMP_DIR)\ttkLabel.obj \
-        $(TMP_DIR)\ttkLayout.obj \
-        $(TMP_DIR)\ttkManager.obj \
-        $(TMP_DIR)\ttkNotebook.obj \
-        $(TMP_DIR)\ttkPanedwindow.obj \
-        $(TMP_DIR)\ttkProgress.obj \
-        $(TMP_DIR)\ttkScale.obj \
-        $(TMP_DIR)\ttkScrollbar.obj \
-        $(TMP_DIR)\ttkScroll.obj \
-        $(TMP_DIR)\ttkSeparator.obj \
-        $(TMP_DIR)\ttkSquare.obj \
-        $(TMP_DIR)\ttkState.obj \
-        $(TMP_DIR)\ttkTagSet.obj \
-        $(TMP_DIR)\ttkTheme.obj \
-        $(TMP_DIR)\ttkTrace.obj \
-        $(TMP_DIR)\ttkTrack.obj \
-        $(TMP_DIR)\ttkTreeview.obj \
-        $(TMP_DIR)\ttkWidget.obj \
-        $(TMP_DIR)\ttkStubInit.obj
+	$(TMP_DIR)\ttkWinMonitor.obj \
+	$(TMP_DIR)\ttkWinTheme.obj \
+	$(TMP_DIR)\ttkWinXPTheme.obj \
+	$(TMP_DIR)\ttkBlink.obj \
+	$(TMP_DIR)\ttkButton.obj \
+	$(TMP_DIR)\ttkCache.obj \
+	$(TMP_DIR)\ttkClamTheme.obj \
+	$(TMP_DIR)\ttkClassicTheme.obj \
+	$(TMP_DIR)\ttkDefaultTheme.obj \
+	$(TMP_DIR)\ttkElements.obj \
+	$(TMP_DIR)\ttkEntry.obj \
+	$(TMP_DIR)\ttkFrame.obj \
+	$(TMP_DIR)\ttkImage.obj \
+	$(TMP_DIR)\ttkInit.obj \
+	$(TMP_DIR)\ttkLabel.obj \
+	$(TMP_DIR)\ttkLayout.obj \
+	$(TMP_DIR)\ttkManager.obj \
+	$(TMP_DIR)\ttkNotebook.obj \
+	$(TMP_DIR)\ttkPanedwindow.obj \
+	$(TMP_DIR)\ttkProgress.obj \
+	$(TMP_DIR)\ttkScale.obj \
+	$(TMP_DIR)\ttkScrollbar.obj \
+	$(TMP_DIR)\ttkScroll.obj \
+	$(TMP_DIR)\ttkSeparator.obj \
+	$(TMP_DIR)\ttkSquare.obj \
+	$(TMP_DIR)\ttkState.obj \
+	$(TMP_DIR)\ttkTagSet.obj \
+	$(TMP_DIR)\ttkTheme.obj \
+	$(TMP_DIR)\ttkTrace.obj \
+	$(TMP_DIR)\ttkTrack.obj \
+	$(TMP_DIR)\ttkTreeview.obj \
+	$(TMP_DIR)\ttkWidget.obj \
+	$(TMP_DIR)\ttkStubInit.obj
 
 TKSTUBOBJS = \
 	$(TMP_DIR)\tkStubLib.obj \

diff --git a/win/rules.vc b/win/rules.vc
@@ -1446,9 +1446,6 @@ OPTDEFINES	= $(OPTDEFINES) /DNO_STRTOI64=1
 !if "$(_USE_64BIT_TIME_T)" == "1"
 OPTDEFINES	= $(OPTDEFINES) /D_USE_64BIT_TIME_T=1
 !endif
-
-# _ATL_XP_TARGETING - Newer SDK's need this to build for XP
-COMPILERFLAGS  = /D_ATL_XP_TARGETING
 !endif
 !if "$(TCL_BUILD_FOR)" == "8"
 OPTDEFINES	= $(OPTDEFINES) /DTCL_MAJOR_VERSION=8
@@ -1459,9 +1456,9 @@ OPTDEFINES	= $(OPTDEFINES) /DTCL_MAJOR_VERSION=8
 # so we pass both
 !if !$(DOING_TCL) && !$(DOING_TK)
 PKGNAMEFLAGS = /DPACKAGE_NAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \
-               /DPACKAGE_TCLNAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \
-               /DPACKAGE_VERSION="\"$(DOTVERSION)\"" \
-               /DMODULE_SCOPE=extern
+	/DPACKAGE_TCLNAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \
+	/DPACKAGE_VERSION="\"$(DOTVERSION)\"" \
+	/DMODULE_SCOPE=extern
 !endif
 
 # crt picks the C run time based on selected OPTS
@@ -1798,18 +1795,18 @@ VS_VERSION_INFO VERSIONINFO
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "FileDescription",  "Tcl extension " PROJECT
-            VALUE "OriginalFilename", PRJLIBNAME
-            VALUE "FileVersion",      DOTVERSION
-            VALUE "ProductName",      "Package " PROJECT " for Tcl"
-            VALUE "ProductVersion",   DOTVERSION
-        END
+	BLOCK "040904b0"
+	BEGIN
+	    VALUE "FileDescription",  "Tcl extension " PROJECT
+	    VALUE "OriginalFilename", PRJLIBNAME
+	    VALUE "FileVersion",      DOTVERSION
+	    VALUE "ProductName",      "Package " PROJECT " for Tcl"
+	    VALUE "ProductVersion",   DOTVERSION
+	END
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x409, 1200
+	VALUE "Translation", 0x409, 1200
     END
 END