notaz.gp2x.de
/
gpsp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drc: fix eabi alignment
[gpsp.git]
/
gui.c
diff --git
a/gui.c
b/gui.c
index
b1a2d7d
..
9381d6b
100644
(file)
--- a/
gui.c
+++ b/
gui.c
@@
-16,6
+16,9
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "common.h"
+#include "font.h"
+
#ifndef _WIN32_WCE
#include <sys/stat.h>
#ifndef _WIN32_WCE
#include <sys/stat.h>
@@
-25,20
+28,13
@@
#endif
#endif
-#ifndef GP2X_BUILD
-#include "gp2x/cpuctrl.h"
-#endif
-
-#include "common.h"
-#include "font.h"
-
#define MAX_PATH 1024
// Blatantly stolen and trimmed from MZX (megazeux.sourceforge.net)
#ifdef GP2X_BUILD
#define MAX_PATH 1024
// Blatantly stolen and trimmed from MZX (megazeux.sourceforge.net)
#ifdef GP2X_BUILD
-#define FILE_LIST_ROWS
((int)((SDL_SCREEN_HEIGHT - 40) / FONT_HEIGHT))
+#define FILE_LIST_ROWS
20
#define FILE_LIST_POSITION 5
#define DIR_LIST_POSITION 260
#define FILE_LIST_POSITION 5
#define DIR_LIST_POSITION 260
@@
-52,23
+48,17
@@
#ifdef PSP_BUILD
#ifdef PSP_BUILD
+#define COLOR_BG color16(2, 8, 10)
+
#define color16(red, green, blue) \
(blue << 11) | (green << 5) | red \
#else
#define color16(red, green, blue) \
(blue << 11) | (green << 5) | red \
#else
-#define color16(red, green, blue) \
- (red << 11) | (green << 5) | blue \
-
-#endif
-
-#ifdef GP2X_BUILD
-
#define COLOR_BG color16(0, 0, 0)
#define COLOR_BG color16(0, 0, 0)
-#else
-
-#define COLOR_BG color16(2, 8, 10)
+#define color16(red, green, blue) \
+ (red << 11) | (green << 5) | blue \
#endif
#endif
@@
-756,7
+746,7
@@
u8 *scale_options[] =
"unscaled 3:2", "scaled 3:2 (slower)",
"unscaled 3:2 (anti-tear)", "scaled 3:2 (anti-tear)"
#else
"unscaled 3:2", "scaled 3:2 (slower)",
"unscaled 3:2 (anti-tear)", "scaled 3:2 (anti-tear)"
#else
- "unscaled 3:2", "scaled 3:2", "fullscreen"
+ "unscaled 3:2", "scaled 3:2", "fullscreen"
, "scaled 3:2 (software)"
#ifdef PSP_BUILD
" 16:9"
#endif
#ifdef PSP_BUILD
" 16:9"
#endif
@@
-842,10
+832,10
@@
s32 load_config_file()
{
u8 config_path[512];
{
u8 config_path[512];
- #if (defined(PSP_BUILD) || defined(ARM_ARCH)) && !defined(_WIN32_WCE)
- sprintf(config_path, "%s/%s", main_path, GPSP_CONFIG_FILENAME);
- #else
+ #if defined(_WIN32) || defined(_WIN32_WCE)
sprintf(config_path, "%s\\%s", main_path, GPSP_CONFIG_FILENAME);
sprintf(config_path, "%s\\%s", main_path, GPSP_CONFIG_FILENAME);
+ #else
+ sprintf(config_path, "%s/%s", main_path, GPSP_CONFIG_FILENAME);
#endif
file_open(config_file, config_path, read);
#endif
file_open(config_file, config_path, read);