From: Wez Furlong <wez@php.net>
Date: Sun, 1 Aug 2004 12:32:03 +0000 (+0000)
Subject: More hoops for VC6
X-Git-Tag: PRE_ZEND_VM_DISPATCH_PATCH~283
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d898a7418b66e8545432db1dd206fd978778081f;p=php

More hoops for VC6
---

diff --git a/win32/build/Makefile b/win32/build/Makefile
index 9856396f3c..203d304c0f 100644
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -21,7 +21,7 @@ CC="$(CL)"
 LD="$(LINK)"
 MC="$(MC)"
 
-MCFILE=$(BUILD_DIR)\wsyslog.res
+MCFILE=$(BUILD_DIR)\wsyslog.rc
 
 all: generated_files $(EXT_TARGETS) $(PECL_TARGETS) $(SAPI_TARGETS)
 
@@ -55,15 +55,17 @@ PHPDLL_RES=$(BUILD_DIR)\$(PHPDLL).res
 
 $(MCFILE): win32\build\wsyslog.mc
 	$(MC) -h win32\ -r $(BUILD_DIR)\ -x $(BUILD_DIR)\ win32\build\wsyslog.mc
-	$(RC) /fo $(MCFILE) $(BUILD_DIR)\wsyslog.rc
+
+#	$(RC) /fo $(MCFILE) $(BUILD_DIR)\wsyslog.rc
 
 $(PHPDLL_RES): win32\build\template.rc
 	$(RC) /fo $(PHPDLL_RES) /d FILE_DESCRIPTION="\"PHP Script Interpreter\"" \
 		/d FILE_NAME="\"$(PHPDLL)\"" /d PRODUCT_NAME="\"PHP Script Interpreter\"" \
+		/I$(BUILD_DIR) /d MC_INCLUDE="\"$(MCFILE)\"" \
 		win32\build\template.rc 
 
 $(BUILD_DIR)\$(PHPDLL): $(PHPDEF) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(PHPDLL_RES) $(MCFILE)
-	$(LD) /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS) $(STATIC_EXT_LDFLAGS) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS) $(PHPDLL_RES) $(MCFILE)
+	$(LD) /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS) $(STATIC_EXT_LDFLAGS) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS) $(PHPDLL_RES)
 	
 $(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL)
 	
diff --git a/win32/build/template.rc b/win32/build/template.rc
index 1a6b04cbfe..3bb57a7147 100644
--- a/win32/build/template.rc
+++ b/win32/build/template.rc
@@ -62,3 +62,8 @@ BEGIN
         VALUE "Translation", 0x409, 1200
     END
 END
+
+#ifdef MC_INCLUDE
+#include MC_INCLUDE
+#endif
+