diff options
| -rw-r--r-- | win32/build/Makefile | 12 | ||||
| -rw-r--r-- | win32/build/config.w32 | 3 |
2 files changed, 9 insertions, 6 deletions
diff --git a/win32/build/Makefile b/win32/build/Makefile index 6f452485c5..1fe3281f8d 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -126,18 +126,18 @@ build-snap: generated_files build-dist: $(BUILD_DIR)\deplister.exe -rd /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING) -rd /s /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING) - -del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE)..zip - -del /f /q $(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE)..zip - -del /f /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE)..zip + -del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip + -del /f /q $(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip + -del /f /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).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-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip . + -$(ZIP) -9 -r ..\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip . cd ..\.. cd $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING) - -$(ZIP) -9 -r ..\pecl-$(PHP_VERSION_STRING)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip . + -$(ZIP) -9 -r ..\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip . cd ..\.. cd $(BUILD_DIR) - -$(ZIP) -9 php-debug-pack-$(PHP_VERSION_STRING)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip *.pdb + -$(ZIP) -9 php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip *.pdb cd ..\.. dist: all build-dist diff --git a/win32/build/config.w32 b/win32/build/config.w32 index a4e6e6b236..f77444da27 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -184,6 +184,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"); |