Use included irrlicht version for font tool, added Ukrainian

to the list of special languages.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11890 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2012-11-07 12:56:51 +00:00
parent c720ed602e
commit 0a42987058
3 changed files with 10 additions and 11 deletions

View File

@ -41,8 +41,8 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../dependencies/include/irrlicht" AdditionalIncludeDirectories="../../lib/irrlicht/include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_IRR_STATIC_LIB_"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="1"
@ -62,9 +62,10 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions=" kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib glu32.lib opengl32.lib gdi32.lib" AdditionalOptions=" kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib glu32.lib opengl32.lib gdi32.lib"
AdditionalDependencies="Irrlicht.lib"
OutputFile="../../font_tool.exe" OutputFile="../../font_tool.exe"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="../../dependencies/lib" AdditionalLibraryDirectories="../../lib/irrlicht/lib/Win32-visualstudio"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/TestProject.pdb" ProgramDatabaseFile="$(OutDir)/TestProject.pdb"
SubSystem="1" SubSystem="1"
@ -122,8 +123,8 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="2"
WholeProgramOptimization="false" WholeProgramOptimization="false"
AdditionalIncludeDirectories="../../dependencies/include/irrlicht" AdditionalIncludeDirectories="../../lib/irrlicht/include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_IRR_STATIC_LIB_"
MinimalRebuild="true" MinimalRebuild="true"
RuntimeLibrary="0" RuntimeLibrary="0"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
@ -142,9 +143,10 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions=" kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib glu32.lib opengl32.lib gdi32.lib" AdditionalOptions=" kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib glu32.lib opengl32.lib gdi32.lib"
OutputFile="../../../bin/Win32-visualstudio/FontTool.exe" AdditionalDependencies="Irrlicht.lib"
OutputFile="../../FontTool.exe"
LinkIncremental="0" LinkIncremental="0"
AdditionalLibraryDirectories="../../dependencies/lib" AdditionalLibraryDirectories="../../lib/irrlicht/lib/Win32-visualstudio"
GenerateDebugInformation="false" GenerateDebugInformation="false"
SubSystem="1" SubSystem="1"
OptimizeReferences="2" OptimizeReferences="2"

View File

@ -28,10 +28,6 @@
using namespace irr; using namespace irr;
using namespace gui; using namespace gui;
#ifdef _MSC_VER
# pragma comment(lib, "Irrlicht.lib")
#endif
const s32 texturesizes[] = {128, 256, 512, 1024, 2048, 4096, 0}; const s32 texturesizes[] = {128, 256, 512, 1024, 2048, 4096, 0};
const wchar_t *fileformats[] = { L"bmp", L"ppm", 0 }; // bitmap font formats const wchar_t *fileformats[] = { L"bmp", L"ppm", 0 }; // bitmap font formats

View File

@ -2,3 +2,4 @@ data/po/ko.po
data/po/vi.po data/po/vi.po
data/po/zh_CN.po data/po/zh_CN.po
data/po/zh_TW.po data/po/zh_TW.po
data/po/uk.po