From 8359434381c750ace24491d5a02b828c67b4358c Mon Sep 17 00:00:00 2001 From: punkrockguy318 Date: Wed, 23 Jul 2008 02:27:35 +0000 Subject: [PATCH] attempt to fix build issues on gentoo also moves the archive function definitions outside out driver.h, because they are being handled platform dependently. Could someone on windows test this out? --- SConstruct | 2 +- src/driver.h | 6 ------ src/drivers/win/archive.h | 14 +++++++++++++- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/SConstruct b/SConstruct index bb95f789..d25a8d78 100644 --- a/SConstruct +++ b/SConstruct @@ -5,7 +5,7 @@ import sys opts = Options() opts.AddOptions( #BoolOption('PSS_STYLE', 'Path separator style', 1), - BoolOption('LSB_FIRST', 'Least significant byte first?', None), + #BoolOption('LSB_FIRST', 'Least significant byte first?', None), BoolOption('FRAMESKIP', 'Enable frameskipping', 0), BoolOption('OPENGL', 'Enable OpenGL support (SDL only)', 1) ) diff --git a/src/driver.h b/src/driver.h index 4bdf6541..36593e76 100644 --- a/src/driver.h +++ b/src/driver.h @@ -319,12 +319,6 @@ enum EFCEUI //checks whether an EFCEUI is valid right now bool FCEU_IsValidUI(EFCEUI ui); -//if you want to autopilot this, pass in an innerfilename to try and automatically load -FCEUFILE* FCEUD_OpenArchive(ArchiveScanRecord& asr, std::string& fname, std::string* innerFilename); - -//scans a file to see if it is an archive you can handle -ArchiveScanRecord FCEUD_ScanArchive(std::string fname); - #ifdef __cplusplus extern "C" #endif diff --git a/src/drivers/win/archive.h b/src/drivers/win/archive.h index 92d07f7b..b1d6c1e2 100644 --- a/src/drivers/win/archive.h +++ b/src/drivers/win/archive.h @@ -1,6 +1,18 @@ #ifndef _ARCHIVE_H_ #define _ARCHIVE_H_ +#include + +#include "types.h" +//#include "git.h" +#include "file.h" + void initArchiveSystem(); -#endif \ No newline at end of file +//if you want to autopilot this, pass in an innerfilename to try and automatically load +FCEUFILE* FCEUD_OpenArchive(ArchiveScanRecord& asr, std::string& fname, std::string* innerFilename); + +//scans a file to see if it is an archive you can handle +ArchiveScanRecord FCEUD_ScanArchive(std::string fname); + +#endif