Provide core includes for the resource compiler by default

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index ad80988a368e3d104a60e5e47227903c94048196..5f90aa5165d60a3114a048ef560e58f9760a9f28 100644 (file)
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -1103,7 +1103,7 @@ function generate_version_info_resource(makefiletarget, basename, creditspath, s
         */
        if (FSO.FileExists(creditspath + '\\template.rc')) {
                MFO.WriteLine("$(BUILD_DIR)\\" + resname + ": " + creditspath + "\\template.rc");
-               MFO.WriteLine("\t$(RC) /nologo /fo $(BUILD_DIR)\\" + resname + logo + debug +
+               MFO.WriteLine("\t$(RC) /nologo $(BASE_INCLUDES) /fo $(BUILD_DIR)\\" + resname + logo + debug +
                        ' /d FILE_DESCRIPTION="\\"' + res_desc + '\\"" /d FILE_NAME="\\"' +
                        makefiletarget + '\\"" /d PRODUCT_NAME="\\"' + res_prod_name +
                        versioning + '\\"" /d THANKS_GUYS="\\"' + thanks + '\\"" ' +
@@ -1112,14 +1112,14 @@ function generate_version_info_resource(makefiletarget, basename, creditspath, s
        }
        if (MODE_PHPIZE) {
                MFO.WriteLine("$(BUILD_DIR)\\" + resname + ": $(PHP_DIR)\\build\\template.rc");
-               MFO.WriteLine("\t$(RC) /nologo /I $(PHP_DIR)/include /n /fo $(BUILD_DIR)\\" + resname + logo + debug +
+               MFO.WriteLine("\t$(RC) /nologo  $(BASE_INCLUDES) /I $(PHP_DIR)/include /n /fo $(BUILD_DIR)\\" + resname + logo + debug +
                        ' /d FILE_DESCRIPTION="\\"' + res_desc + '\\"" /d FILE_NAME="\\"'
                        + makefiletarget + '\\"" /d URL="\\"' + project_url + 
                        '\\"" /d INTERNAL_NAME="\\"' + internal_name + versioning + 
                        '\\"" /d THANKS_GUYS="\\"' + thanks + '\\"" $(PHP_DIR)\\build\\template.rc');
        } else {
                MFO.WriteLine("$(BUILD_DIR)\\" + resname + ": win32\\build\\template.rc");
-               MFO.WriteLine("\t$(RC) /nologo /n /fo $(BUILD_DIR)\\" + resname + logo + debug +
+               MFO.WriteLine("\t$(RC) /nologo  $(BASE_INCLUDES) /n /fo $(BUILD_DIR)\\" + resname + logo + debug +
                        ' /d FILE_DESCRIPTION="\\"' + res_desc + '\\"" /d FILE_NAME="\\"'
                        + makefiletarget + '\\"" /d URL="\\"' + project_url + 
                        '\\"" /d INTERNAL_NAME="\\"' + internal_name + versioning +