Fix build on Windows

diff --git a/win32/build/Makefile b/win32/build/Makefile
index ef02e558280db50bfa79b42875701f6d9d54289f..a249781dfdbe957391c0befc6a0fbe08b3f05c2c 100644 (file)
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -21,8 +21,6 @@ CC="$(CL)"
 LD="$(LINK)"
 MC="$(MC)"
 MT="$(MT)"
-RE2C="$(RE2C)"
-RE2C_FLAGS=""
 
 
 MCFILE=$(BUILD_DIR)\wsyslog.rc
@@ -46,10 +44,10 @@ Zend\zend_language_parser.c Zend\zend_language_parser.h: Zend\zend_language_pars
        $(BISON) --output=Zend/zend_language_parser.c -v -d -p zend Zend/zend_language_parser.y
 
 Zend\zend_ini_scanner.c: Zend\zend_ini_scanner.l
-       $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt Zend\zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend\zend_ini_scanner.l
+       $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l
 
 Zend\zend_language_scanner.c: Zend\zend_language_scanner.l
-       $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt $(srcdir)/zend_language_scanner_defs.h -o$@ $(srcdir)/zend_language_scanner.l
+       $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.l
 
 PHPDLL_RES=$(BUILD_DIR)\$(PHPDLL).res
 
@@ -70,14 +68,14 @@ $(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 
+               win32\build\template.rc
 
 $(BUILD_DIR)\$(PHPDLL): generated_files $(PHPDEF) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(PHPDLL_RES) $(MCFILE)
        @$(CC) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS) $(PHPDLL_RES) /link /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS) $(STATIC_EXT_LDFLAGS)
        -@$(_VC_MANIFEST_EMBED_DLL)
-       
+
 $(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL)
-       
+
 $(BUILD_DIR) $(BUILD_DIRS_SUB):
        @echo Recreating build dirs
        @if not exist $(BUILD_DIR) mkdir $(BUILD_DIR)
@@ -94,7 +92,7 @@ clean: clean-sapi
        @echo Cleaning build dirs
        @for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @del /F /Q %D\*.* > NUL
        -@del /F /Q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk $(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF) $(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip > NUL
-       -rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING) 
+       -rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
 
 clean-pecl:
        @echo Cleaning PECL targets only

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 1b93d699c08d35818f8c2ddd84baf8941d7c6578..b351e10f6a1b55daf55d6e3b8e31d6d5062720c9 100644 (file)
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -15,7 +15,7 @@ function probe_msvc_compiler_version(CL)
        // tricky escapes to get stderr redirection to work
        var banner = execute('cmd /c ""' + CL + '" 2>&1"');
        if (banner.match(/(\d+)\.(\d+)\.(\d+)(\.(\d+))?/)) {
-               return RegExp.$1;               
+               return RegExp.$1;
        }
        return 0;
 }
@@ -26,14 +26,14 @@ STDOUT.WriteLine("Detected MS compiler version " + VCVERS);
 // 12 is VC6
 // 13 is vs.net 2003
 // 14 is vs.net 2005
- 
+
 // do we use x64 or 80x86 version of compiler?
 function probe_msvc_compiler_x64(CL)
 {
        // tricky escapes to get stderr redirection to work
        var banner = execute('cmd /c ""' + CL + '" 2>&1"');
        if (banner.match(/x64/)) {
-               return 1;               
+               return 1;
        }
        return 0;
 }
@@ -60,6 +60,7 @@ if (!PATH_PROG('bison')) {
 if (!PATH_PROG('re2c')) {
        ERROR('re2c is required')
 }
+DEFINE('RE2C_FLAGS', null);
 PATH_PROG('zip');
 PATH_PROG('lemon');
 
@@ -147,7 +148,7 @@ DEFINE("DLL_LDFLAGS", "/dll ");
 DEFINE("PHP_LDFLAGS", "$(DLL_LDFLAGS)");
 
 // General libs
-// urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib comdlg32.lib 
+// urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib comdlg32.lib
 DEFINE("LIBS", "kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib ws2_32.lib");
 
 // Set some debug/release specific options
@@ -174,7 +175,7 @@ if (PHP_DEBUG == "yes") {
 if (PHP_ZTS == "yes") {
        ADD_FLAG("CFLAGS", "/D ZTS=1");
 }
-       
+
 // we want msvcrt in the PHP DLL
 ADD_FLAG("PHP_LDFLAGS", "/nodefaultlib:libcmt");