- MFH: add nts postfix to the dist filenames

diff --git a/win32/build/Makefile b/win32/build/Makefile
index d1d0e8354699a0265a832b4cb0147635c7d31397..3af9e20b6c8d78a68d672c47f22ea95744b16b6b 100644 (file)
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -112,18 +112,18 @@ build-snap: generated_files
 build-dist: $(BUILD_DIR)\deplister.exe
        -rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
        -rmdir /s /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
-       -del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip
-       -del /f /q $(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)-Win32.zip
-       -del /f /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip
+       -del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32.zip
+       -del /f /q $(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32.zip
+       -del /f /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32.zip
        $(BUILD_DIR)\php.exe -n win32/build/mkdist.php "$(BUILD_DIR)" "$(PHPDLL)" "$(SAPI_TARGETS)" "$(EXT_TARGETS) $(PHP_EXTRA_DIST_FILES)" "$(PECL_TARGETS) $(PECL_EXTRA_DIST_FILES)" "$(SNAPSHOT_TEMPLATE)"
        cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-       -$(ZIP) -9 -r ..\php-$(PHP_VERSION_STRING)-Win32.zip .
+       -$(ZIP) -9 -r ..\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32.zip .
        cd ..\..
        cd $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
-       -$(ZIP) -9 -r ..\pecl-$(PHP_VERSION_STRING)-Win32.zip .
+       -$(ZIP) -9 -r ..\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32.zip .
        cd ..\..
        cd $(BUILD_DIR)
-       -$(ZIP) -9 php-debug-pack-$(PHP_VERSION_STRING)-Win32.zip *.pdb
+       -$(ZIP) -9 php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32.zip *.pdb
        cd ..\..
 
 dist: all build-dist

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index ebf12d8937cc577138b4922b7a740d72fb257139..61fc14742a4f4825ae5699f8dc7c8a5e380f7531 100644 (file)
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -45,6 +45,9 @@ if (X64) {
        STDOUT.WriteLine("Detected 32-bit compiler");
 }
 
+AC_DEFINE('ARCHITECTURE', X64 ? 'x64' : 'x86', "Detected compiler architecture");
+DEFINE("PHP_ARCHITECTURE", X64 ? 'x64' : 'x86');
+
 // cygwin now ships with link.exe.  Avoid searching the cygwin path
 // for this, as we want the MS linker, not the fileutil
 PATH_PROG('link', WshShell.Environment("Process").Item("PATH"));
@@ -176,6 +179,9 @@ if (PHP_ZTS == "yes") {
        ADD_FLAG("CFLAGS", "/D ZTS=1");
 }
        
+DEFINE("PHP_ZTS_ARCHIVE_POSTFIX", PHP_ZTS == "yes" ? '' : "-nts");
+
+
 // we want msvcrt in the PHP DLL
 ADD_FLAG("PHP_LDFLAGS", "/nodefaultlib:libcmt");