From 084eddd7cf412ec0f8d244b7223ac3fb34d67514 Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Monteiro Date: Sun, 20 Jan 2008 23:37:44 +0000 Subject: [PATCH] Added a x64 platform to projects, but don't expect it to work. Originally committed to SVN as r1798. --- aegisub/avisynth.h | 2 +- aegisub/charset_detect.cpp | 3 + aegisub/subs_grid.cpp | 4 +- aegisub/win64/config0.h | 126 +++++++ aegisub/win64/stdint.h | 221 ++++++++++++ build/aegisub_vs2005/aegisub_vs2005.vcproj | 225 +++++++++++++ hunspell/src/win_api/libhunspell.vcproj | 162 +++++++++ lua51/lua51_vc8.vcproj | 369 ++++++++++++++++++++- universalchardet/universalcharset.vcproj | 131 +++++++- 9 files changed, 1238 insertions(+), 5 deletions(-) create mode 100644 aegisub/win64/config0.h create mode 100644 aegisub/win64/stdint.h diff --git a/aegisub/avisynth.h b/aegisub/avisynth.h index b1e68deb4..25a4b3d1b 100644 --- a/aegisub/avisynth.h +++ b/aegisub/avisynth.h @@ -337,7 +337,7 @@ class VideoFrame { VideoFrame(VideoFrameBuffer* _vfb, int _offset, int _pitch, int _row_size, int _height); VideoFrame(VideoFrameBuffer* _vfb, int _offset, int _pitch, int _row_size, int _height, int _offsetU, int _offsetV, int _pitchUV); - void* operator new(unsigned size); + void* operator new(size_t size); // TESTME: OFFSET U/V may be switched to what could be expected from AVI standard! public: int GetPitch() const { return pitch; } diff --git a/aegisub/charset_detect.cpp b/aegisub/charset_detect.cpp index dc6b25573..f59d8f26a 100644 --- a/aegisub/charset_detect.cpp +++ b/aegisub/charset_detect.cpp @@ -36,6 +36,7 @@ /////////// // Headers +#ifdef WITH_UNIVCHARDET #include "charset_detect.h" #include "text_file_reader.h" #include "../universalchardet/nsCharSetProber.h" @@ -119,3 +120,5 @@ void CharSetDetect::Report(const char* aCharset) { // Store the result reported result = wxString(aCharset,wxConvUTF8); } + +#endif // WITH_UNIVCHARDET diff --git a/aegisub/subs_grid.cpp b/aegisub/subs_grid.cpp index d7cb44f05..02f402b01 100644 --- a/aegisub/subs_grid.cpp +++ b/aegisub/subs_grid.cpp @@ -708,8 +708,8 @@ void SubtitlesGrid::OnAudioClip(wxCommandEvent &event) { //samples per read size_t spr = 65536/(provider->GetBytesPerSample()*provider->GetChannels()); - for(int i=start;iend)?(end-i):spr; + for(int64_t i=start;iend)?(end-i):spr; bufsize=len*(provider->GetBytesPerSample()*provider->GetChannels()); void *buf = malloc(bufsize); if (buf) { diff --git a/aegisub/win64/config0.h b/aegisub/win64/config0.h new file mode 100644 index 000000000..3776ff22b --- /dev/null +++ b/aegisub/win64/config0.h @@ -0,0 +1,126 @@ +// Copyright (c) 2007, Rodrigo Braz Monteiro +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: +// +// * Redistributions of source code must retain the above copyright notice, +// this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above copyright notice, +// this list of conditions and the following disclaimer in the documentation +// and/or other materials provided with the distribution. +// * Neither the name of the Aegisub Group nor the names of its contributors +// may be used to endorse or promote products derived from this software +// without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// POSSIBILITY OF SUCH DAMAGE. +// +// ----------------------------------------------------------------------------- +// +// AEGISUB +// +// Website: http://aegisub.cellosoft.com +// Contact: mailto:zeratul@cellosoft.com +// + + +#pragma once + + +// Build credit: Set this to a string with your name as you want it to appear on the program +#ifndef BUILD_CREDIT +#define BUILD_CREDIT "Anonymous" +#endif + + +////////////// HIGH PRIORITY ///////////// + +// Enable Automation +// Requires: Lua (in repository) +//#define WITH_AUTOMATION + + +// Enable Automation 3 +// Requires: auto3 dll (in repository), Lua (in repository) +//#define WITH_AUTO3 + + +// Enable DirectSound audio player +// Requires: DirectX SDK +//#define WITH_DIRECTSOUND + + + +///////////// MEDIUM PRIORITY //////////// + +// Enable FreeType2 font lister for the fonts collector +// If you're on Visual Studio, also uncomment the library names and make sure they match the files that you have +// Requires: FreeType2 +//#define WITH_FREETYPE2 +//#define FT2_LIB_RELEASE "freetype235.lib" +//#define FT2_LIB_DEBUG "freetype235_D.lib" + + +// Enable CSRI, required for styles previews in the style editor and some video providers +// Requires: csri (in repository) +//#define WITH_CSRI + + +// Enable universal charset detector, so Aegisub can automatically detect the encoding of non-unicode subtitles +// Requires: universalcharset (in repository) +//#define WITH_UNIVCHARDET + + +// Enable Hunspell-based spellchecker +// Requires: hunspell (in repository for Win32) +// If you have an old version of Hunspell (that uses Hunspell::put_word() instead of Hunspell::add()), +// uncomment the second line as well. +//#define WITH_HUNSPELL +//#define WITH_OLD_HUNSPELL + + + +/////////////// LOW PRIORITY //////////// + +// Enable DirectShow video provider +// Requires: DirectShow "baseclasses", DirectX SDK +//#define WITH_DIRECTSHOW + + +// Enable Perl scripting +// Requires: perl library (ActivePerl comes with one for Visual C++ under lib\core\) +//#define WITH_PERL + + + +///////////// NOT RECOMMENDED ///////////// + +// Enable FontConfig +// Requires: fontconfig +//#define WITH_FONTCONFIG + + +// Enable libass +// Requires: libass +//#define WITH_LIBASS + + +// Enable FFmpeg video and audio decoders +// Requires: libavcodec and libavformat +//#define WITH_FFMPEG + + +// Enable Ruby support for Automation +// Requires: Ruby 1.9 +//#define WITH_RUBY + diff --git a/aegisub/win64/stdint.h b/aegisub/win64/stdint.h new file mode 100644 index 000000000..739c89e7e --- /dev/null +++ b/aegisub/win64/stdint.h @@ -0,0 +1,221 @@ +// ISO C9x compliant stdint.h for Miscrosoft Visual Studio +// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 +// +// Copyright (c) 2006 Alexander Chemeris +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: +// +// 1. Redistributions of source code must retain the above copyright notice, +// this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. The name of the author may be used to endorse or promote products +// derived from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// +/////////////////////////////////////////////////////////////////////////////// + +#ifdef _MSC_VER + +#ifndef _MSC_STDINT_H_ // [ +#define _MSC_STDINT_H_ + +#if _MSC_VER > 1000 +#pragma once +#endif + +#include + +// For Visual Studio 6 in C++ mode wrap include with 'extern "C++" {}' +// or compiler give many errors like this: +// error C2733: second C linkage of overloaded function 'wmemchr' not allowed +#if (_MSC_VER < 1300) && defined(__cplusplus) + extern "C++" { +#endif +# include +#if (_MSC_VER < 1300) && defined(__cplusplus) + } +#endif + +// 7.18.1 Integer types + +// 7.18.1.1 Exact-width integer types +typedef __int8 int8_t; +typedef __int16 int16_t; +typedef __int32 int32_t; +typedef __int64 int64_t; +typedef unsigned __int8 uint8_t; +typedef unsigned __int16 uint16_t; +typedef unsigned __int32 uint32_t; +typedef unsigned __int64 uint64_t; + +// 7.18.1.2 Minimum-width integer types +typedef int8_t int_least8_t; +typedef int16_t int_least16_t; +typedef int32_t int_least32_t; +typedef int64_t int_least64_t; +typedef uint8_t uint_least8_t; +typedef uint16_t uint_least16_t; +typedef uint32_t uint_least32_t; +typedef uint64_t uint_least64_t; + +// 7.18.1.3 Fastest minimum-width integer types +typedef int8_t int_fast8_t; +typedef int16_t int_fast16_t; +typedef int32_t int_fast32_t; +typedef int64_t int_fast64_t; +typedef uint8_t uint_fast8_t; +typedef uint16_t uint_fast16_t; +typedef uint32_t uint_fast32_t; +typedef uint64_t uint_fast64_t; + +// 7.18.1.4 Integer types capable of holding object pointers +#ifdef _WIN64 // [ + typedef __int64 intptr_t; + typedef unsigned __int64 uintptr_t; +#else // _WIN64 ][ + typedef int intptr_t; + typedef unsigned int uintptr_t; +#endif // _WIN64 ] + +// 7.18.1.5 Greatest-width integer types +typedef int64_t intmax_t; +typedef uint64_t uintmax_t; + + +// 7.18.2 Limits of specified-width integer types + +#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [ See footnote 220 at page 257 and footnote 221 at page 259 + +// 7.18.2.1 Limits of exact-width integer types +#define INT8_MIN _I8_MIN +#define INT8_MAX _I8_MAX +#define INT16_MIN _I16_MIN +#define INT16_MAX _I16_MAX +#define INT32_MIN _I32_MIN +#define INT32_MAX _I32_MAX +#define INT64_MIN _I64_MIN +#define INT64_MAX _I64_MAX +#define UINT8_MAX _UI8_MAX +#define UINT16_MAX _UI16_MAX +#define UINT32_MAX _UI32_MAX +#define UINT64_MAX _UI64_MAX + +// 7.18.2.2 Limits of minimum-width integer types +#define INT_LEAST8_MIN INT8_MIN +#define INT_LEAST8_MAX INT8_MAX +#define INT_LEAST16_MIN INT16_MIN +#define INT_LEAST16_MAX INT16_MAX +#define INT_LEAST32_MIN INT32_MIN +#define INT_LEAST32_MAX INT32_MAX +#define INT_LEAST64_MIN INT64_MIN +#define INT_LEAST64_MAX INT64_MAX +#define UINT_LEAST8_MAX UINT8_MAX +#define UINT_LEAST16_MAX UINT16_MAX +#define UINT_LEAST32_MAX UINT32_MAX +#define UINT_LEAST64_MAX UINT64_MAX + +// 7.18.2.3 Limits of fastest minimum-width integer types +#define INT_FAST8_MIN INT8_MIN +#define INT_FAST8_MAX INT8_MAX +#define INT_FAST16_MIN INT16_MIN +#define INT_FAST16_MAX INT16_MAX +#define INT_FAST32_MIN INT32_MIN +#define INT_FAST32_MAX INT32_MAX +#define INT_FAST64_MIN INT64_MIN +#define INT_FAST64_MAX INT64_MAX +#define UINT_FAST8_MAX UINT8_MAX +#define UINT_FAST16_MAX UINT16_MAX +#define UINT_FAST32_MAX UINT32_MAX +#define UINT_FAST64_MAX UINT64_MAX + +// 7.18.2.4 Limits of integer types capable of holding object pointers +#ifdef _WIN64 // [ +# define INTPTR_MIN INT64_MIN +# define INTPTR_MAX INT64_MAX +# define UINTPTR_MAX UINT64_MAX +#else // _WIN64 ][ +# define INTPTR_MIN INT32_MIN +# define INTPTR_MAX INT32_MAX +# define UINTPTR_MAX UINT32_MAX +#endif // _WIN64 ] + +// 7.18.2.5 Limits of greatest-width integer types +#define INTMAX_MIN INT64_MIN +#define INTMAX_MAX INT64_MAX +#define UINTMAX_MAX UINT64_MAX + +// 7.18.3 Limits of other integer types + +#ifdef _WIN64 // [ +# define PTRDIFF_MIN _I64_MIN +# define PTRDIFF_MAX _I64_MAX +#else // _WIN64 ][ +# define PTRDIFF_MIN _I32_MIN +# define PTRDIFF_MAX _I32_MAX +#endif // _WIN64 ] + +#define SIG_ATOMIC_MIN INT_MIN +#define SIG_ATOMIC_MAX INT_MAX + +#ifndef SIZE_MAX // [ +# ifdef _WIN64 // [ +# define SIZE_MAX _UI64_MAX +# else // _WIN64 ][ +# define SIZE_MAX _UI32_MAX +# endif // _WIN64 ] +#endif // SIZE_MAX ] + +// WCHAR_MIN and WCHAR_MAX are also defined in +#ifndef WCHAR_MIN // [ +# define WCHAR_MIN 0 +#endif // WCHAR_MIN ] +#ifndef WCHAR_MAX // [ +# define WCHAR_MAX _UI16_MAX +#endif // WCHAR_MAX ] + +#define WINT_MIN 0 +#define WINT_MAX _UI16_MAX + +#endif // __STDC_LIMIT_MACROS ] + + +// 7.18.4 Limits of other integer types + +#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [ See footnote 224 at page 260 + +// 7.18.4.1 Macros for minimum-width integer constants + +#define INT8_C(val) val +#define INT16_C(val) val +#define INT32_C(val) val##L +#define INT64_C(val) val##i64 + +#define UINT8_C(val) val +#define UINT16_C(val) val +#define UINT32_C(val) val##UL +#define UINT64_C(val) val##Ui64 + +// 7.18.4.2 Macros for greatest-width integer constants +#define INTMAX_C INT64_C +#define UINTMAX_C UINT64_C + +#endif // __STDC_CONSTANT_MACROS ] + + +#endif // _MSC_STDINT_H_ ] +#endif // _MSC_VER ] diff --git a/build/aegisub_vs2005/aegisub_vs2005.vcproj b/build/aegisub_vs2005/aegisub_vs2005.vcproj index fc107d487..51f26f503 100644 --- a/build/aegisub_vs2005/aegisub_vs2005.vcproj +++ b/build/aegisub_vs2005/aegisub_vs2005.vcproj @@ -11,6 +11,9 @@ + @@ -187,6 +190,180 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -773,6 +950,22 @@ UsePrecompiledHeader="0" /> + + + + + + + + + + + + + + + + + + + @@ -156,6 +159,149 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -190,6 +336,22 @@ CompileAs="2" /> + + + + + + + @@ -145,6 +148,138 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -165,6 +300,14 @@ CompileAs="2" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -139,6 +142,132 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +