mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Made universalchardet work on Win64 (it's a one-line patch [prcpucfg.h:146] to make it work on other OS, but I don't know what the proper define is)

Browse source 
Originally committed to SVN as r1817.
This commit is contained in:
Rodrigo Braz Monteiro 2008-01-23 06:17:18 +00:00
parent f562f89632
commit 4a59329784
6 changed files with 151 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aegisub/font_file_lister.cpp
View file

@ -42,7 +42,7 @@
#include "text_file_writer.h" #include "text_file_writer.h"
#include "text_file_reader.h" #include "text_file_reader.h"
#include "standard_paths.h" #include "standard_paths.h"
#if defined(WIN32) || defined(__APPLE__) #if defined(__WINDOWS__) || defined(__APPLE__)
#ifdef WITH_FREETYPE2 #ifdef WITH_FREETYPE2
#include "font_file_lister_freetype.h" #include "font_file_lister_freetype.h"
#define FontListerClass FreetypeFontFileLister #define FontListerClass FreetypeFontFileLister

2
aegisub/font_file_lister.h
View file

@ -47,7 +47,7 @@
//////////// ////////////
// Typedefs // Typedefs
#if defined(WIN32) || defined(__APPLE__) #if defined(__WINDOWS__) || defined(__APPLE__)
typedef struct FT_LibraryRec_ *FT_Library; typedef struct FT_LibraryRec_ *FT_Library;
#endif #endif
typedef std::map<wxString,wxArrayString> FontMap; typedef std::map<wxString,wxArrayString> FontMap;

2
aegisub/stdwx.h
View file

@ -99,5 +99,7 @@
#include <list> #include <list>
#include <map> #include <map>
#pragma warning(default: 6011)
#endif // C++ #endif // C++

40
build/aegisub_vs2005/aegisub_vs2005.vcproj
View file

@ -132,7 +132,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../aegisub/win64;../../hunspell/src" AdditionalIncludeDirectories="../../aegisub/win64;../../hunspell/src"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" PreprocessorDefinitions="WIN32;WIN64;_DEBUG;_WINDOWS"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -305,7 +305,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../aegisub/win64;../../hunspell/src" AdditionalIncludeDirectories="../../aegisub/win64;../../hunspell/src"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" PreprocessorDefinitions="WIN32;WIN64;NDEBUG;_WINDOWS"
RuntimeLibrary="2" RuntimeLibrary="2"
OpenMP="true" OpenMP="true"
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
@ -1387,14 +1387,6 @@
<Filter <Filter
Name="Core" Name="Core"
> >
<File
RelativePath="..\..\aegisub\win32\config.h"
>
</File>
<File
RelativePath="..\..\aegisub\win32\config0.h"
>
</File>
<File <File
RelativePath="..\..\aegisub\frame_main.cpp" RelativePath="..\..\aegisub\frame_main.cpp"
> >
@ -1820,6 +1812,34 @@
> >
</File> </File>
</Filter> </Filter>
<Filter
Name="Config"
>
<Filter
Name="win32"
>
<File
RelativePath="..\..\aegisub\win32\config.h"
>
</File>
<File
RelativePath="..\..\aegisub\win32\config0.h"
>
</File>
</Filter>
<Filter
Name="win64"
>
<File
RelativePath="..\..\aegisub\win64\config.h"
>
</File>
<File
RelativePath="..\..\aegisub\win64\config0.h"
>
</File>
</Filter>
</Filter>
<File <File
RelativePath="..\..\aegisub\changelog.txt" RelativePath="..\..\aegisub\changelog.txt"
> >

52
universalchardet/prcpucfg.h
View file

@ -143,8 +143,60 @@
#else /* defined(_M_IX86) || defined(_X86_) */ #else /* defined(_M_IX86) || defined(_X86_) */
#ifdef WIN64
#define IS_LITTLE_ENDIAN 1
#undef IS_BIG_ENDIAN
#define PR_BYTES_PER_BYTE 1
#define PR_BYTES_PER_SHORT 2
#define PR_BYTES_PER_INT 4
#define PR_BYTES_PER_INT64 8
#define PR_BYTES_PER_LONG 8
#define PR_BYTES_PER_FLOAT 4
#define PR_BYTES_PER_WORD 4
#define PR_BYTES_PER_DWORD 8
#define PR_BYTES_PER_DOUBLE 8
#define PR_BITS_PER_BYTE 8
#define PR_BITS_PER_SHORT 16
#define PR_BITS_PER_INT 32
#define PR_BITS_PER_INT64 64
#define PR_BITS_PER_LONG 64
#define PR_BITS_PER_FLOAT 32
#define PR_BITS_PER_WORD 32
#define PR_BITS_PER_DWORD 64
#define PR_BITS_PER_DOUBLE 64
#define PR_BITS_PER_BYTE_LOG2 3
#define PR_BITS_PER_SHORT_LOG2 4
#define PR_BITS_PER_INT_LOG2 5
#define PR_BITS_PER_INT64_LOG2 6
#define PR_BITS_PER_LONG_LOG2 6
#define PR_BITS_PER_FLOAT_LOG2 5
#define PR_BITS_PER_WORD_LOG2 5
#define PR_BITS_PER_DWORD_LOG2 6
#define PR_BITS_PER_DOUBLE_LOG2 6
#define PR_ALIGN_OF_SHORT 2
#define PR_ALIGN_OF_INT 4
#define PR_ALIGN_OF_LONG 8
#define PR_ALIGN_OF_INT64 8
#define PR_ALIGN_OF_FLOAT 4
#define PR_ALIGN_OF_WORD 4
#define PR_ALIGN_OF_DWORD 8
#define PR_ALIGN_OF_DOUBLE 4
#define PR_ALIGN_OF_POINTER 4
#define PR_BYTES_PER_WORD_LOG2 2
#define PR_BYTES_PER_DWORD_LOG2 2
#else
#error unknown processor architecture #error unknown processor architecture
#endif
#endif /* defined(_M_IX86) || defined(_X86_) */ #endif /* defined(_M_IX86) || defined(_X86_) */
#define HAVE_LONG_LONG #define HAVE_LONG_LONG

130
universalchardet/universalcharset.vcproj
View file

@ -81,6 +81,70 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;WIN64;_DEBUG;_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
OutputFile="../lib/univcset_d.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" OutputDirectory="$(SolutionDir)$(ConfigurationName)"
@ -142,70 +206,6 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
OutputFile="../lib/univcset_d.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
@ -232,7 +232,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB" PreprocessorDefinitions="WIN32;WIN64;NDEBUG;_LIB"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"