diff options
| author | Anatol Belski <ab@php.net> | 2018-03-12 14:16:08 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-03-12 14:16:08 +0100 |
| commit | fc09d7e76f192538949fb9a181aac29daebde980 (patch) | |
| tree | bcd83163287a2291d32bb234148eee9f2fc82373 | |
| parent | e6fb787c66cbffb4d1cbf6c284892789f0e16dec (diff) | |
| parent | 4dd1be207919d85b511d9d61a7768eb639c92794 (diff) | |
| download | php-git-fc09d7e76f192538949fb9a181aac29daebde980.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Provide core includes for the resource compiler by default
| -rw-r--r-- | win32/build/confutils.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index b682389c89..853b35c388 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -1119,7 +1119,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 + '\\"" ' + @@ -1128,14 +1128,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 + |