From a6fc45b29b07c6b619b4889893846e6dec151b34 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Tue, 15 Jun 2010 19:21:20 +0000 Subject: Add translation feature support in create_msvc. svn-id: r49886 --- tools/create_msvc/create_msvc.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'tools/create_msvc/create_msvc.cpp') diff --git a/tools/create_msvc/create_msvc.cpp b/tools/create_msvc/create_msvc.cpp index f418971239..dee91defdb 100644 --- a/tools/create_msvc/create_msvc.cpp +++ b/tools/create_msvc/create_msvc.cpp @@ -835,11 +835,12 @@ const Feature s_features[] = { { "mpeg2", "USE_MPEG2", "libmpeg2.lib", false, "mpeg2 codec for cutscenes" }, // ScummVM feature flags - { "scalers", "USE_SCALERS", "", true, "Scalers" }, - { "hqscalers", "USE_HQ_SCALERS", "", true, "HQ scalers" }, - { "16bit", "USE_RGB_COLOR", "", true, "16bit color support" }, - { "mt32emu", "USE_MT32EMU", "", true, "integrated MT-32 emulator" }, - { "nasm", "USE_NASM", "", true, "IA-32 assembly support" }, // This feature is special in the regard, that it needs additional handling. + { "scalers", "USE_SCALERS", "", true, "Scalers" }, + { "hqscalers", "USE_HQ_SCALERS", "", true, "HQ scalers" }, + { "16bit", "USE_RGB_COLOR", "", true, "16bit color support" }, + { "mt32emu", "USE_MT32EMU", "", true, "integrated MT-32 emulator" }, + { "nasm", "USE_NASM", "", true, "IA-32 assembly support" }, // This feature is special in the regard, that it needs additional handling. + { "translation", "USE_TRANSLATION", "", true, "Translation support" } }; } // End of anonymous namespace -- cgit v1.2.3 From ce111a39df155f379ec829f66a39498bee303720 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Sat, 26 Jun 2010 22:45:53 +0000 Subject: Add flag to set USE_DETECTLANG in create_msvc. svn-id: r50350 --- tools/create_msvc/create_msvc.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tools/create_msvc/create_msvc.cpp') diff --git a/tools/create_msvc/create_msvc.cpp b/tools/create_msvc/create_msvc.cpp index dee91defdb..3019e219e4 100644 --- a/tools/create_msvc/create_msvc.cpp +++ b/tools/create_msvc/create_msvc.cpp @@ -840,7 +840,9 @@ const Feature s_features[] = { { "16bit", "USE_RGB_COLOR", "", true, "16bit color support" }, { "mt32emu", "USE_MT32EMU", "", true, "integrated MT-32 emulator" }, { "nasm", "USE_NASM", "", true, "IA-32 assembly support" }, // This feature is special in the regard, that it needs additional handling. - { "translation", "USE_TRANSLATION", "", true, "Translation support" } + { "translation", "USE_TRANSLATION", "", true, "Translation support" }, + { "langdetect", "USE_DETECTLANG", "", true, "System language detection support" } // This feature actually depends on "translation", there + // is just no current way of properly detecting this... }; } // End of anonymous namespace -- cgit v1.2.3 From deef8bb650e980140a731490e3f6519a4ae4da60 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Fri, 23 Jul 2010 18:42:54 +0000 Subject: TOOLS: Fix MSVC 2010 project files. Formerly the MSVC 2010 project files did not respect the global include/library/executable directories of the user, but used custom paths for that. This resulted in headers and libraries not be found by the MSVC, in case they were not stored in %(SCUMMVM_LIBS). Additionally it overwrote the executable MSVC used when compiling for x64, thus breaking the x64 target. svn-id: r51213 --- tools/create_msvc/create_msvc.cpp | 86 +++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'tools/create_msvc/create_msvc.cpp') diff --git a/tools/create_msvc/create_msvc.cpp b/tools/create_msvc/create_msvc.cpp index 3019e219e4..0855bf9de2 100644 --- a/tools/create_msvc/create_msvc.cpp +++ b/tools/create_msvc/create_msvc.cpp @@ -210,8 +210,9 @@ public: * @param bits Number of bits the platform supports. * @param defines Defines the platform needs to have set. * @param prefix File prefix, used to add additional include paths. + * @param isWin32 Bitness of property file */ - virtual void outputGlobalPropFile(std::ofstream &properties, int bits, const std::string &defines, const std::string &prefix) = 0; + virtual void outputGlobalPropFile(std::ofstream &properties, int bits, const std::string &defines, const std::string &prefix, bool isWin32) = 0; /** * Generates the project properties for debug and release settings. @@ -282,7 +283,7 @@ public: void writeReferences(std::ofstream &output); - void outputGlobalPropFile(std::ofstream &properties, int bits, const std::string &defines, const std::string &prefix); + void outputGlobalPropFile(std::ofstream &properties, int bits, const std::string &defines, const std::string &prefix, bool isWin32); void createBuildProp(const BuildSetup &setup, bool isRelease, bool isWin32); @@ -305,7 +306,7 @@ public: void writeReferences(std::ofstream &output); - void outputGlobalPropFile(std::ofstream &properties, int bits, const std::string &defines, const std::string &prefix); + void outputGlobalPropFile(std::ofstream &properties, int bits, const std::string &defines, const std::string &prefix, bool isWin32); void createBuildProp(const BuildSetup &setup, bool isRelease, bool isWin32); @@ -1326,7 +1327,7 @@ void ProjectProvider::createGlobalProp(const BuildSetup &setup) { defines += *i; } - outputGlobalPropFile(properties, 32, defines, convertPathToWin(setup.filePrefix)); + outputGlobalPropFile(properties, 32, defines, convertPathToWin(setup.filePrefix), true); properties.close(); properties.open((setup.outputDir + '/' + "ScummVM_Global64" + getPropertiesExtension()).c_str()); @@ -1348,7 +1349,7 @@ void ProjectProvider::createGlobalProp(const BuildSetup &setup) { defines += *i; } - outputGlobalPropFile(properties, 64, defines, convertPathToWin(setup.filePrefix)); + outputGlobalPropFile(properties, 64, defines, convertPathToWin(setup.filePrefix), false); } void ProjectProvider::addFilesToProject(const std::string &dir, std::ofstream &projectFile, @@ -1651,7 +1652,7 @@ void VisualStudioProvider::writeReferences(std::ofstream &output) { output << "\tEndProjectSection\n"; } -void VisualStudioProvider::outputGlobalPropFile(std::ofstream &properties, int bits, const std::string &defines, const std::string &prefix) { +void VisualStudioProvider::outputGlobalPropFile(std::ofstream &properties, int bits, const std::string &defines, const std::string &prefix, bool isWin32) { properties << "\n" "\n" "\t\t<_ProjectFileVersion>10.0.30319.1\n"; - - if (name == "scummvm") - project << "$(SCUMMVM_LIBS)\\bin;$(VCInstallDir)bin;$(WindowsSdkDir)bin\\NETFX 4.0 Tools;$(WindowsSdkDir)bin;$(VSInstallDir)Common7\\Tools\\bin;$(VSInstallDir)Common7\\tools;$(VSInstallDir)Common7\\ide;$(ProgramFiles)\\HTML Help Workshop;$(FrameworkSDKDir)\\bin;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\\SysWow64;$(FxCopDir);$(PATH)\n" - "$(SCUMMVM_LIBS)\\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\\include;\n" - "$(SCUMMVM_LIBS)\\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\\lib\n"; - project << "\t\n"; // Project-specific settings @@ -2049,38 +2044,41 @@ void MSBuildProvider::outputProjectSettings(std::ofstream &project, const std::s project << "\t\n"; } -void MSBuildProvider::outputGlobalPropFile(std::ofstream &properties, int bits, const std::string &defines, const std::string &prefix) { +void MSBuildProvider::outputGlobalPropFile(std::ofstream &properties, int bits, const std::string &defines, const std::string &prefix, bool isWin32) { properties << "\n" "\n" - "\n" - "<_ProjectFileVersion>10.0.30319.1\n" - "<_PropertySheetDisplayName>ScummVM_Global\n" - "$(Configuration)" << bits << "\\\n" - "$(Configuration)" << bits << "/$(ProjectName)\\\n" - "\n" - "\n" - "\n" - "true\n" - "" << _globalWarnings << ";%(DisableSpecificWarnings)\n" - "" << prefix << ";" << prefix << "\\engines;%(AdditionalIncludeDirectories)\n" - "" << defines << ";%(PreprocessorDefinitions)\n" - "\n" - "\n" - "false\n" - "Level4\n" - "false\n" - "Default\n" - "\n" - "\n" - "%(IgnoreSpecificDefaultLibraries)\n" - "Console\n" - "WinMainCRTStartup\n" - "\n" - "\n" - "HAS_INCLUDE_SET;%(PreprocessorDefinitions)\n" - "" << prefix << ";%(AdditionalIncludeDirectories)\n" - "\n" - "\n" + "\t\n" + "\t\t<_ProjectFileVersion>10.0.30319.1\n" + "\t\t<_PropertySheetDisplayName>ScummVM_Global\n" + "\t\t%(SCUMMVM_LIBS)\\bin;$(ExecutablePath)\n" + "\t\t%(SCUMMVM_LIBS)\\libs\\" << (isWin32 ? "x86" : "x64") << ";$(LibraryPath)\n" + "\t\t%(SCUMMVM_LIBS)\\include;$(IncludePath)\n" + "\t\t$(Configuration)" << bits << "\\\n" + "\t\t$(Configuration)" << bits << "/$(ProjectName)\\\n" + "\t\n" + "\t\n" + "\t\t\n" + "\t\t\ttrue\n" + "\t\t\t" << _globalWarnings << ";%(DisableSpecificWarnings)\n" + "\t\t\t" << prefix << ";" << prefix << "\\engines;$(AdditionalIncludeDirectories)\n" + "\t\t\t" << defines << ";%(PreprocessorDefinitions)\n" + "\t\t\t\n" + "\t\t\t\n" + "\t\t\tfalse\n" + "\t\t\tLevel4\n" + "\t\t\tfalse\n" + "\t\t\tDefault\n" + "\t\t\n" + "\t\t\n" + "\t\t\t%(IgnoreSpecificDefaultLibraries)\n" + "\t\t\tConsole\n" + "\t\t\tWinMainCRTStartup\n" + "\t\t\n" + "\t\t\n" + "\t\t\tHAS_INCLUDE_SET;%(PreprocessorDefinitions)\n" + "\t\t\t" << prefix << ";%(AdditionalIncludeDirectories)\n" + "\t\t\n" + "\t\n" "\n"; properties.flush(); @@ -2105,7 +2103,9 @@ void MSBuildProvider::createBuildProp(const BuildSetup &setup, bool isRelease, b "\t\t" << (isRelease ? "false" : "true") << "\n" "\t\n" "\t\n" - "\t\t\n"; + "\t\t\n"; + + if (isRelease) { properties << "\t\t\ttrue\n" -- cgit v1.2.3 From 824a3c3ca1c1a0587a24db0e5b1ca6db6849aae4 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Fri, 23 Jul 2010 19:06:38 +0000 Subject: TOOLS: Preliminary SCUMMVM_LIBS support for msvc8/9. Currently %(SCUMMVM_LIBS)/bin is not added to the executable path, since I can not find any easy way to do that. The libs and include setting should be fine though. svn-id: r51214 --- tools/create_msvc/create_msvc.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools/create_msvc/create_msvc.cpp') diff --git a/tools/create_msvc/create_msvc.cpp b/tools/create_msvc/create_msvc.cpp index 0855bf9de2..8e2a6011b4 100644 --- a/tools/create_msvc/create_msvc.cpp +++ b/tools/create_msvc/create_msvc.cpp @@ -1665,7 +1665,7 @@ void VisualStudioProvider::outputGlobalPropFile(std::ofstream &properties, int b "\t\tName=\"VCCLCompilerTool\"\n" "\t\tDisableLanguageExtensions=\"true\"\n" "\t\tDisableSpecificWarnings=\"" << _globalWarnings << "\"\n" - "\t\tAdditionalIncludeDirectories=\"" << prefix << ";" << prefix << "\\engines\"\n" + "\t\tAdditionalIncludeDirectories=\"" << prefix << ";" << prefix << "\\engines;%(SCUMMVM_LIBS)\\include\"\n" "\t\tPreprocessorDefinitions=\"" << defines << "\"\n" "\t\tExceptionHandling=\"0\"\n" "\t\tRuntimeTypeInfo=\"false\"\n" @@ -1682,6 +1682,7 @@ void VisualStudioProvider::outputGlobalPropFile(std::ofstream &properties, int b "\t\tIgnoreDefaultLibraryNames=\"\"\n" "\t\tSubSystem=\"1\"\n" "\t\tEntryPointSymbol=\"WinMainCRTStartup\"\n" + "\t\tAdditionalLibraryDirectories=\"%(SCUMMVM_LIBS)\\libs\\" << (isWin32 ? "x86" : "x64") << "\"\n" "\t/>\n" "\t\n" "\tScummVM_Global\n" "\t\t%(SCUMMVM_LIBS)\\bin;$(ExecutablePath)\n" "\t\t%(SCUMMVM_LIBS)\\libs\\" << (isWin32 ? "x86" : "x64") << ";$(LibraryPath)\n" - "\t\t%(SCUMMVM_LIBS)\\include;$(IncludePath)\n" + "\t\t%(SCUMMVM_LIBS)\\include;$(IncludePath)\n" "\t\t$(Configuration)" << bits << "\\\n" "\t\t$(Configuration)" << bits << "/$(ProjectName)\\\n" "\t\n" @@ -2104,7 +2104,7 @@ void MSBuildProvider::createBuildProp(const BuildSetup &setup, bool isRelease, b "\t\t" << (isRelease ? "false" : "true") << "\n" "\t\n" "\t\n" - "\t\t\n"; + "\t\t\n"; -- cgit v1.2.3 From f2838316cb55fc743e68ff1768350fcca5ce08fc Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Sun, 1 Aug 2010 21:30:15 +0000 Subject: create_msvc: Fix SCUMMVM_LIBS support for MSVC2010. svn-id: r51595 --- tools/create_msvc/create_msvc.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tools/create_msvc/create_msvc.cpp') diff --git a/tools/create_msvc/create_msvc.cpp b/tools/create_msvc/create_msvc.cpp index 2d3e47c73a..1c395b01aa 100644 --- a/tools/create_msvc/create_msvc.cpp +++ b/tools/create_msvc/create_msvc.cpp @@ -1665,7 +1665,7 @@ void VisualStudioProvider::outputGlobalPropFile(std::ofstream &properties, int b "\t\tName=\"VCCLCompilerTool\"\n" "\t\tDisableLanguageExtensions=\"true\"\n" "\t\tDisableSpecificWarnings=\"" << _globalWarnings << "\"\n" - "\t\tAdditionalIncludeDirectories=\"" << prefix << ";" << prefix << "\\engines;%(SCUMMVM_LIBS)\\include\"\n" + "\t\tAdditionalIncludeDirectories=\"" << prefix << ";" << prefix << "\\engines;$(SCUMMVM_LIBS)\\include\"\n" "\t\tPreprocessorDefinitions=\"" << defines << "\"\n" "\t\tExceptionHandling=\"0\"\n" "\t\tRuntimeTypeInfo=\"false\"\n" @@ -1682,7 +1682,7 @@ void VisualStudioProvider::outputGlobalPropFile(std::ofstream &properties, int b "\t\tIgnoreDefaultLibraryNames=\"\"\n" "\t\tSubSystem=\"1\"\n" "\t\tEntryPointSymbol=\"WinMainCRTStartup\"\n" - "\t\tAdditionalLibraryDirectories=\"%(SCUMMVM_LIBS)\\libs\\" << (isWin32 ? "x86" : "x64") << "\"\n" + "\t\tAdditionalLibraryDirectories=\"$(SCUMMVM_LIBS)\\libs\\" << (isWin32 ? "x86" : "x64") << "\"\n" "\t/>\n" "\t\n" "\t\t<_ProjectFileVersion>10.0.30319.1\n" "\t\t<_PropertySheetDisplayName>ScummVM_Global\n" - "\t\t%(SCUMMVM_LIBS)\\bin;$(ExecutablePath)\n" - "\t\t%(SCUMMVM_LIBS)\\libs\\" << (isWin32 ? "x86" : "x64") << ";$(LibraryPath)\n" - "\t\t%(SCUMMVM_LIBS)\\include;$(IncludePath)\n" + "\t\t$(SCUMMVM_LIBS)\\bin;$(ExecutablePath)\n" + "\t\t$(SCUMMVM_LIBS)\\libs\\" << (isWin32 ? "x86" : "x64") << ";$(LibraryPath)\n" + "\t\t$(SCUMMVM_LIBS)\\include;$(IncludePath)\n" "\t\t$(Configuration)" << bits << "\\\n" "\t\t$(Configuration)" << bits << "/$(ProjectName)\\\n" "\t\n" -- cgit v1.2.3