diff -ur ScummVM/configure ScummVM+hack/configure
old
|
new
|
|
877 | 877 | if test "$_mpeg2" = auto ; then |
878 | 878 | _mpeg2=no |
879 | 879 | cat > $TMPC << EOF |
880 | | #include <inttypes.h> |
| 880 | typedef signed $type_1_byte int8_t; |
| 881 | typedef signed $type_2_byte int16_t; |
| 882 | typedef signed $type_4_byte int32_t; |
| 883 | |
| 884 | typedef unsigned $type_1_byte uint8_t; |
| 885 | typedef unsigned $type_2_byte uint16_t; |
| 886 | typedef unsigned $type_4_byte uint32_t; |
| 887 | |
881 | 888 | #include <mpeg2dec/mpeg2.h> |
882 | 889 | int main(void) { |
883 | 890 | /* mpeg2_state_t first appears in 0.4.0 */ |
diff -ur ScummVM/graphics/animation.h ScummVM+hack/graphics/animation.h
old
|
new
|
|
30 | 30 | // Uncomment this if you are using libmpeg2 0.3.1. |
31 | 31 | // #define USE_MPEG2_0_3_1 |
32 | 32 | |
33 | | #ifdef _MSC_VER |
| 33 | #ifdef USE_MPEG2 |
34 | 34 | typedef int8 int8_t; |
35 | 35 | typedef int16 int16_t; |
36 | 36 | typedef int32 int32_t; |
… |
… |
|
38 | 38 | typedef uint8 uint8_t; |
39 | 39 | typedef uint16 uint16_t; |
40 | 40 | typedef uint32 uint32_t; |
41 | | #else |
42 | | #ifndef __PALM_OS__ |
43 | | #include <inttypes.h> |
44 | | #endif |
45 | | #endif |
46 | 41 | |
47 | | #ifdef USE_MPEG2 |
48 | 42 | extern "C" { |
49 | 43 | #include <mpeg2dec/mpeg2.h> |
50 | 44 | } |