miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed Alien Blaster and SDL 1.3 compilation

Browse Source
This commit is contained in:
pelya
2010-12-29 16:30:08 +00:00
parent d6d9376b7f
commit c4c16ec1d8
5 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
project/jni/sdl-1.3/include/SDL_platform.h
View File

@@ -65,11 +65,14 @@
#undef __LINUX__
#define __LINUX__ 1
#endif
/* Hack, do not enable this */
/*
#if defined(ANDROID)
#undef __ANDROID__
#undef __LINUX__ /*do we need to do this?*/
#undef __LINUX__
#define __ANDROID__ 1
#endif
*/
#if defined(__APPLE__)
/* lets us know what version of Mac OS X we're compiling on */

4
project/jni/sdl-1.3/include/SDL_stdinc.h
View File

@@ -174,7 +174,7 @@ SDL_COMPILE_TIME_ASSERT(uint16, sizeof(Uint16) == 2);
SDL_COMPILE_TIME_ASSERT(sint16, sizeof(Sint16) == 2);
SDL_COMPILE_TIME_ASSERT(uint32, sizeof(Uint32) == 4);
SDL_COMPILE_TIME_ASSERT(sint32, sizeof(Sint32) == 4);
#if !defined(__NINTENDODS__) && !defined(__ANDROID__)
#if !defined(__NINTENDODS__) && !defined(ANDROID)
/* TODO: figure out why the following happens:
include/SDL_stdinc.h:150: error: size of array 'SDL_dummy_uint64' is negative
include/SDL_stdinc.h:151: error: size of array 'SDL_dummy_sint64' is negative */
@@ -196,7 +196,7 @@ SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8);
/** \cond */
#ifndef DOXYGEN_SHOULD_IGNORE_THIS
#if !defined(__NINTENDODS__) && !defined(__ANDROID__)
#if !defined(__NINTENDODS__) && !defined(ANDROID)
/* TODO: include/SDL_stdinc.h:174: error: size of array 'SDL_dummy_enum' is negative */
typedef enum
{