debug: windows build changes for debugging

Author: nielsdos

win32/build/confutils.js

@@ -3421,30 +3421,30 @@ function toolset_setup_common_libs()
 
 function toolset_setup_build_mode()
 {
-	if (PHP_DEBUG == "yes") {
+	/*if (PHP_DEBUG == "yes") */{
 		ADD_FLAG("CFLAGS", "/LDd /MDd /Od /D _DEBUG /D ZEND_DEBUG=1 " +
 			(X64?"/Zi":"/ZI"));
 		ADD_FLAG("LDFLAGS", "/debug");
 		// Avoid problems when linking to release libraries that use the release
 		// version of the libc
 		ADD_FLAG("PHP_LDFLAGS", "/nodefaultlib:msvcrt");
-	} else {
-		// Generate external debug files when --enable-debug-pack is specified
-		if (PHP_DEBUG_PACK == "yes") {
-			ADD_FLAG("CFLAGS", "/Zi");
-			ADD_FLAG("LDFLAGS", "/incremental:no /debug /opt:ref,icf");
-		}
-		ADD_FLAG("CFLAGS", "/LD /MD");
-		if (PHP_SANITIZER == "yes" && CLANG_TOOLSET) {
-			ADD_FLAG("CFLAGS", "/Od /D _DEBUG /D ZEND_WIN32_NEVER_INLINE /D ZEND_DEBUG=1");
-		} else {
-			// Equivalent to Release_TSInline build -> best optimization
-			ADD_FLAG("CFLAGS", "/Ox /D _DEBUG /GF /D ZEND_DEBUG=1");
-		}
-
-		// if you have VS.Net /GS hardens the binary against buffer overruns
-		// ADD_FLAG("CFLAGS", "/GS");
-	}
+	//} else {
+	//	// Generate external debug files when --enable-debug-pack is specified
+	//	if (PHP_DEBUG_PACK == "yes") {
+	//		ADD_FLAG("CFLAGS", "/Zi");
+	//		ADD_FLAG("LDFLAGS", "/incremental:no /debug /opt:ref,icf");
+	//	}
+	//	ADD_FLAG("CFLAGS", "/LD /MD");
+	//	if (PHP_SANITIZER == "yes" && CLANG_TOOLSET) {
+	//		ADD_FLAG("CFLAGS", "/Od /D _DEBUG /D ZEND_WIN32_NEVER_INLINE /D ZEND_DEBUG=1");
+	//	} else {
+	//		// Equivalent to Release_TSInline build -> best optimization
+	//		ADD_FLAG("CFLAGS", "/Ox /D _DEBUG /GF /D ZEND_DEBUG=1");
+	//	}
+//
+	//	// if you have VS.Net /GS hardens the binary against buffer overruns
+	//	// ADD_FLAG("CFLAGS", "/GS");
+	//}
 }
 
 function object_out_dir_option_handle()