diff -ur --exclude=CVS ScummVM/configure ScummVM+hack/configure
old
|
new
|
|
766 | 766 | echo "$_build_plugins" |
767 | 767 | |
768 | 768 | # |
| 769 | # Check for inttypes.h |
| 770 | # |
| 771 | echocheck "inttypes.h" |
| 772 | _have_inttypes=no |
| 773 | cat > $TMPC << EOF |
| 774 | #include <inttypes.h> |
| 775 | int main(void) { |
| 776 | return 0; |
| 777 | } |
| 778 | EOF |
| 779 | cc_check && _have_inttypes=yes |
| 780 | if test "$_have_inttypes" = yes ; then |
| 781 | _def_inttypes='#define HAVE_INTTYPES' |
| 782 | else |
| 783 | _def_inttypes='#undef HAVE_INTTYPES' |
| 784 | fi |
| 785 | echo "$_have_inttypes" |
| 786 | |
| 787 | # |
769 | 788 | # Check for Ogg Vorbis |
770 | 789 | # |
771 | 790 | echocheck "Ogg Vorbis" |
… |
… |
|
1025 | 1044 | typedef signed $type_2_byte int16; |
1026 | 1045 | typedef signed $type_4_byte int32; |
1027 | 1046 | |
| 1047 | /* Headers */ |
| 1048 | $_def_inttypes |
| 1049 | |
1028 | 1050 | /* Libs */ |
1029 | 1051 | $_def_vorbis |
1030 | 1052 | $_def_flac |
diff -ur --exclude=CVS ScummVM/graphics/animation.h ScummVM+hack/graphics/animation.h
old
|
new
|
|
27 | 27 | |
28 | 28 | class AudioStream; |
29 | 29 | |
30 | | // Uncomment this if you are using libmpeg2 0.3.1. |
31 | | // #define USE_MPEG2_0_3_1 |
| 30 | #ifdef USE_MPEG2 |
32 | 31 | |
33 | | #ifdef _MSC_VER |
| 32 | #ifdef HAVE_INTTYPES |
| 33 | #include <inttypes.h> |
| 34 | #else |
34 | 35 | typedef int8 int8_t; |
35 | 36 | typedef int16 int16_t; |
36 | 37 | typedef int32 int32_t; |
… |
… |
|
38 | 39 | typedef uint8 uint8_t; |
39 | 40 | typedef uint16 uint16_t; |
40 | 41 | typedef uint32 uint32_t; |
41 | | #else |
42 | | #ifndef __PALM_OS__ |
43 | | #include <inttypes.h> |
44 | | #endif |
45 | 42 | #endif |
46 | 43 | |
47 | | #ifdef USE_MPEG2 |
48 | 44 | extern "C" { |
49 | 45 | #include <mpeg2dec/mpeg2.h> |
50 | 46 | } |
51 | 47 | |
| 48 | // Uncomment this if you are using libmpeg2 0.3.1. |
| 49 | // #define USE_MPEG2_0_3_1 |
| 50 | |
52 | 51 | #ifdef USE_MPEG2_0_3_1 |
53 | 52 | typedef int mpeg2_state_t; |
54 | 53 | typedef sequence_t mpeg2_sequence_t; |