cvs: php-src /win32 .cvsignore /win32/build Makefile template.rc

wez Sun Aug 1 08:32:03 2004 EDT Modified files: /php-src/win32 .cvsignore /php-src/win32/build Makefile template.rc Log: More hoops for VC6 http://cvs.php.net/diff.php/php-src/win32/.cvsignore?r1=1.6&r2=1.7&ty=u Index: php-src/win32/.cvsignore diff -u php-src/win32/.cvsignore:1.6 php-src/win32/.cvsignore:1.7 --- php-src/win32/.cvsignore:1.6 Fri Aug 22 17:47:28 2003 +++ php-src/win32/.cvsignore Sun Aug 1 08:32:03 2004 @@ -13,3 +13,4 @@ Release_TS_inline Debug_TS phpts.def +wsyslog.h http://cvs.php.net/diff.php/php-src/win32/build/Makefile?r1=1.26&r2=1.27&ty=u Index: php-src/win32/build/Makefile diff -u php-src/win32/build/Makefile:1.26 php-src/win32/build/Makefile:1.27 --- php-src/win32/build/Makefile:1.26 Sun Aug 1 07:33:58 2004 +++ php-src/win32/build/Makefile Sun Aug 1 08:32:03 2004 @@ -14,14 +14,14 @@ # | Author: Wez Furlong <wez@thebrainroom.com> | # +----------------------------------------------------------------------+ # -# $Id: Makefile,v 1.26 2004/08/01 11:33:58 wez Exp $ +# $Id: Makefile,v 1.27 2004/08/01 12:32:03 wez Exp $ # This is the makefile template for the win32 build 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 @@ $(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) http://cvs.php.net/diff.php/php-src/win32/build/template.rc?r1=1.5&r2=1.6&ty=u Index: php-src/win32/build/template.rc diff -u php-src/win32/build/template.rc:1.5 php-src/win32/build/template.rc:1.6 --- php-src/win32/build/template.rc:1.5 Thu Jan 8 05:58:27 2004 +++ php-src/win32/build/template.rc Sun Aug 1 08:32:03 2004 @@ -1,5 +1,5 @@ /* This is a template RC file. - * $Id: template.rc,v 1.5 2004/01/08 10:58:27 wez Exp $ + * $Id: template.rc,v 1.6 2004/08/01 12:32:03 wez Exp $ * Do not edit with MSVC */ #ifdef APSTUDIO_INVOKED # error dont edit with MSVC @@ -62,3 +62,8 @@ VALUE "Translation", 0x409, 1200 END END + +#ifdef MC_INCLUDE +#include MC_INCLUDE +#endif +