TrustedUser
2,147
edits
(Update library instructions.) |
m (Text replacement - "</source>" to "</syntaxhighlight>") |
||
(2 intermediate revisions by 2 users not shown) | |||
Line 17: | Line 17: | ||
We used the following patch when compiling SDL 1.2, which is required for x64 support. The patch was gladly taken from the SDL mailing list. | We used the following patch when compiling SDL 1.2, which is required for x64 support. The patch was gladly taken from the SDL mailing list. | ||
< | <syntaxhighlight lang="diff"> | ||
--- src/video/windx5/SDL_dx5video.c Tue Oct 13 00:07:16 2009 | --- src/video/windx5/SDL_dx5video.c Tue Oct 13 00:07:16 2009 | ||
+++ src/video/windx5/SDL_dx5video.c Tue Nov 03 21:14:38 2009 | +++ src/video/windx5/SDL_dx5video.c Tue Nov 03 21:14:38 2009 | ||
Line 56: | Line 56: | ||
/* Initialization/Query functions */ | /* Initialization/Query functions */ | ||
</ | </syntaxhighlight> | ||
After adding a new x64 configuration option in the project files, you may also need to remove "/MACHINE:I386" as additional linker command in Project->Properties, Configuration Properties->Linker->Command Line. | After adding a new x64 configuration option in the project files, you may also need to remove "/MACHINE:I386" as additional linker command in Project->Properties, Configuration Properties->Linker->Command Line. | ||
Line 74: | Line 74: | ||
'''Note''': You need to assure that the headers (and libraries in case you build a dynamically linked libvorbis) of libogg are in the paths MSVC searches. | '''Note''': You need to assure that the headers (and libraries in case you build a dynamically linked libvorbis) of libogg are in the paths MSVC searches. | ||
'''Note''': The static solution can be bugged and produce a library named "libvorbisfile.lib" instead of "libvorbisfile_static.lib". You will need to fix the target name in the project | '''Note''': The static solution can be bugged and produce a library named "libvorbisfile.lib" instead of "libvorbisfile_static.lib". You will need to fix the target name in the project settings. | ||
'''Note''': You'll need vorbis, vorbisfile and also vorbisenc for ScummVM tools. | '''Note''': You'll need vorbis, vorbisfile and also vorbisenc for ScummVM tools. | ||
=== libtheora === | |||
You will need to use the "libtheora_static" solution. | |||
'''Note''': The static solution can be bugged and produce a library named "libtheora.lib" instead of "libtheora_static.lib". You will need to fix the target name in the project settings. | |||
=== libmad === | === libmad === | ||
Line 86: | Line 92: | ||
You will also need to apply the following patch to mad.h: | You will also need to apply the following patch to mad.h: | ||
< | <syntaxhighlight lang="diff"> | ||
--- mad.h Tue Nov 03 18:29:06 2009 | --- mad.h Tue Nov 03 18:29:06 2009 | ||
+++ mad.h Tue Nov 03 18:29:14 2009 | +++ mad.h Tue Nov 03 18:29:14 2009 | ||
Line 98: | Line 104: | ||
# define FPM_INTEL | # define FPM_INTEL | ||
+#endif | +#endif | ||
</ | </syntaxhighlight> | ||
=== FLAC === | === FLAC === | ||
Line 108: | Line 114: | ||
We used the following patch when compiling libfaad to adjust for changes in the MSVC runtime: | We used the following patch when compiling libfaad to adjust for changes in the MSVC runtime: | ||
< | <syntaxhighlight lang="diff"> | ||
diff -ru '--exclude=*vcx*' '--exclude=*sln*' sources.orig/faad2-2.7/libfaad/common.h sources/faad2-2.7/libfaad/common.h | diff -ru '--exclude=*vcx*' '--exclude=*sln*' sources.orig/faad2-2.7/libfaad/common.h sources/faad2-2.7/libfaad/common.h | ||
--- sources.orig/faad2-2.7/libfaad/common.h 2009-02-05 01:51:03.000000000 +0100 | --- sources.orig/faad2-2.7/libfaad/common.h 2009-02-05 01:51:03.000000000 +0100 | ||
Line 177: | Line 183: | ||
static void sbr_header(bitfile *ld, sbr_info *sbr); | static void sbr_header(bitfile *ld, sbr_info *sbr); | ||
</ | </syntaxhighlight> | ||
'''Note for x64:''' When you want to build a x64 library for libfaad you will need to create your own x64 config for it. You can do so by easy conversion of the existing libfaad solution files for x86. | '''Note for x64:''' When you want to build a x64 library for libfaad you will need to create your own x64 config for it. You can do so by easy conversion of the existing libfaad solution files for x86. |