libretro/beetle-psx-libretro
1
0
Fork 0
mirror of https://github.com/libretro/beetle-psx-libretro.git synced 2024-11-23 08:49:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

'Fixed' Android compilation of PCE core again - maister - please make

Browse Source 
sure when you pull from upstream that you put the headers in the right
order again - can easily be tested by trying to compile ndk-build core=pce-fast - Ryphecha includes these files in an order that will break down with the
Android toolchain
This commit is contained in:
twinaphex 2013-10-31 16:23:14 +01:00
parent c9bc52731b
commit e728fea62d
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jni/Android.mk
View File

@ -318,7 +318,7 @@ SCSI_CD_SOURCES := $(MEDNAFEN_DIR)/cdrom/scsicd.cpp
endif
ifeq ($(NEED_CD), 1)
CDROM_SOURCES := $(MEDNAFEN_DIR)/cdrom/CDAccess.cpp $(MEDNAFEN_DIR)/cdrom/CDAccess_Image.cpp $(MEDNAFEN_DIR)/cdrom/CDUtility.cpp $(MEDNAFEN_DIR)/cdrom/lec.cpp $(MEDNAFEN_DIR)/cdrom/SimpleFIFO.cpp $(MEDNAFEN_DIR)/cdrom/audioreader.cpp $(MEDNAFEN_DIR)/cdrom/galois.cpp $(MEDNAFEN_DIR)/cdrom/recover-raw.cpp $(MEDNAFEN_DIR)/cdrom/l-ec.cpp $(MEDNAFEN_DIR)/cdrom/cdromif.cpp $(MEDNAFEN_DIR)/cdrom/cd_crc32.cpp
CDROM_SOURCES := $(MEDNAFEN_DIR)/cdrom/CDAccess.cpp $(MEDNAFEN_DIR)/cdrom/CDAccess_Image.cpp $(MEDNAFEN_DIR)/cdrom/CDUtility.cpp $(MEDNAFEN_DIR)/cdrom/lec.cpp $(MEDNAFEN_DIR)/cdrom/SimpleFIFO.cpp $(MEDNAFEN_DIR)/cdrom/audioreader.cpp $(MEDNAFEN_DIR)/cdrom/galois.cpp $(MEDNAFEN_DIR)/cdrom/recover-raw.cpp $(MEDNAFEN_DIR)/cdrom/l-ec.cpp $(MEDNAFEN_DIR)/cdrom/cdromif.cpp
FLAGS += -DNEED_CD
endif

7
mednafen/cdrom/CDAccess.cpp
View File

@ -15,12 +15,15 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "../mednafen.h"
#include <sys/types.h>
#include <sys/stat.h>
#ifdef _WIN32
#include <direct.h>
#else
#include <unistd.h>
#endif
#include "../mednafen.h"
#include "CDAccess.h"
#include "CDAccess_Image.h"

5
mednafen/cdrom/CDAccess_Image.cpp
View File

@ -30,11 +30,10 @@
Trying to read sectors at an LBA of less than 0 is not supported. TODO: support it(at least up to -150).
*/
#include "../mednafen.h"
#include <sys/types.h>
#include <sys/stat.h>
#include "../mednafen.h"
#include <string.h>
#include <errno.h>
#include <time.h>

2
mednafen/cdrom/CDUtility.cpp
View File

@ -17,9 +17,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "dvdisaster.h"
#include "../mednafen.h"
#include "CDUtility.h"
#include "dvdisaster.h"
#include "lec.h"
#include <assert.h>

4
mednafen/cdrom/audioreader.cpp
View File

@ -21,12 +21,10 @@
// Don't allow exceptions to propagate into the vorbis/musepack/etc. libraries, as it could easily leave the state of the library's decoder "object" in an
// inconsistent state, which would cause all sorts of unfun when we try to destroy it while handling the exception farther up.
#include <sys/stat.h>
#include "../mednafen.h"
#include "audioreader.h"
#include <sys/types.h>
#include <sys/stat.h>
#include "../tremor/ivorbisfile.h"
#ifdef HAVE_LIBSNDFILE