diff options
| author | Johannes Schickel | 2011-05-05 20:28:43 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2011-05-05 20:28:43 +0200 |
| commit | d41c32d363e985f4d5b64795bbccebe976bdd5c4 (patch) | |
| tree | 433f0f11142997bad41fef68449ef388f093a8cf | |
| parent | 09b9e3ab9d6a914129e82d8dd97891041bc8e37b (diff) | |
| download | scummvm-rg350-d41c32d363e985f4d5b64795bbccebe976bdd5c4.tar.gz scummvm-rg350-d41c32d363e985f4d5b64795bbccebe976bdd5c4.tar.bz2 scummvm-rg350-d41c32d363e985f4d5b64795bbccebe976bdd5c4.zip | |
BUILD: Get rid of old MSVC style win resource support.
| -rw-r--r-- | devtools/create_project/msbuild.cpp | 1 | ||||
| -rw-r--r-- | devtools/create_project/visualstudio.cpp | 1 | ||||
| -rw-r--r-- | dists/scummvm.rc | 5 | ||||
| -rw-r--r-- | dists/scummvm.rc.in | 5 |
4 files changed, 0 insertions, 12 deletions
diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp index 06425dd4aa..8143c92c35 100644 --- a/devtools/create_project/msbuild.cpp +++ b/devtools/create_project/msbuild.cpp @@ -340,7 +340,6 @@ void MSBuildProvider::outputGlobalPropFile(std::ofstream &properties, int bits, "\t\t\t<EntryPointSymbol>WinMainCRTStartup</EntryPointSymbol>\n" "\t\t</Link>\n" "\t\t<ResourceCompile>\n" - "\t\t\t<PreprocessorDefinitions>HAS_INCLUDE_SET;%(PreprocessorDefinitions)</PreprocessorDefinitions>\n" "\t\t\t<AdditionalIncludeDirectories>" << prefix << ";%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\n" "\t\t</ResourceCompile>\n" "\t</ItemDefinitionGroup>\n" diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp index 77af8aeca1..1c52e9d3c1 100644 --- a/devtools/create_project/visualstudio.cpp +++ b/devtools/create_project/visualstudio.cpp @@ -241,7 +241,6 @@ void VisualStudioProvider::outputGlobalPropFile(std::ofstream &properties, int b "\t/>\n" "\t<Tool\n" "\t\tName=\"VCResourceCompilerTool\"\n" - "\t\tPreprocessorDefinitions=\"HAS_INCLUDE_SET\"\n" "\t\tAdditionalIncludeDirectories=\"" << prefix << "\"\n" "\t/>\n" "</VisualStudioPropertySheet>\n"; diff --git a/dists/scummvm.rc b/dists/scummvm.rc index 203f57aa46..109437305c 100644 --- a/dists/scummvm.rc +++ b/dists/scummvm.rc @@ -6,7 +6,6 @@ #define FILE 256 -#if defined (__MINGW32__) || defined(__CYGWIN32__) || defined(HAS_INCLUDE_SET) IDI_ICON ICON DISCARDABLE "icons/scummvm.ico" scummmodern.zip FILE "gui/themes/scummmodern.zip" @@ -45,10 +44,6 @@ toon.dat FILE "dists/engine-data/toon.dat" pred.dic FILE "dists/pred.dic" #endif -#else -IDI_ICON ICON DISCARDABLE "../../icons/scummvm.ico" -#endif - VS_VERSION_INFO VERSIONINFO FILEVERSION 1,4,0,0 PRODUCTVERSION 1,4,0,0 diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in index 20e88f1df5..c043ce1644 100644 --- a/dists/scummvm.rc.in +++ b/dists/scummvm.rc.in @@ -6,7 +6,6 @@ #define FILE 256 -#if defined (__MINGW32__) || defined(__CYGWIN32__) || defined(HAS_INCLUDE_SET) IDI_ICON ICON DISCARDABLE "icons/scummvm.ico" scummmodern.zip FILE "gui/themes/scummmodern.zip" @@ -45,10 +44,6 @@ toon.dat FILE "dists/engine-data/toon.dat" pred.dic FILE "dists/pred.dic" #endif -#else -IDI_ICON ICON DISCARDABLE "../../icons/scummvm.ico" -#endif - VS_VERSION_INFO VERSIONINFO FILEVERSION @VER_MAJOR@,@VER_MINOR@,@VER_PATCH@,0 PRODUCTVERSION @VER_MAJOR@,@VER_MINOR@,@VER_PATCH@,0 |