From 60e8f4f9885d3cffb6cb7aa3b0e09a3fed0d3c84 Mon Sep 17 00:00:00 2001 From: Linus Nielsen Feltzing Date: Wed, 25 Jan 2006 12:15:25 +0000 Subject: [PATCH] First steps towards SDL sim for windows git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8449 a1c6a512-1295-4272-9138-f99709370657 --- firmware/SOURCES | 2 +- firmware/export/lcd.h | 2 ++ uisimulator/common/io.c | 2 +- uisimulator/common/lcd-common.c | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/firmware/SOURCES b/firmware/SOURCES index dbfa102ceb..b70ee7f118 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -139,7 +139,7 @@ mp3data.c #if CONFIG_CODEC != SWCODEC mpeg.c #endif -#ifndef WIN32 /* the win32 sim has its own versin of these: */ +#if !defined(WIN32) || defined(SDL) panic.c debug.c #endif diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 7fcae6edf1..2779bd9c95 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h @@ -29,7 +29,9 @@ #ifdef SIMULATOR #define lcd_icon(x,y) sim_lcd_icon(x,y) +#ifndef MAX_PATH #define MAX_PATH 260 +#endif #else #include "file.h" /* for MAX_PATH; FIXME: Why does this not work for sims? */ #endif diff --git a/uisimulator/common/io.c b/uisimulator/common/io.c index 68eb8933a5..4943bc04e2 100644 --- a/uisimulator/common/io.c +++ b/uisimulator/common/io.c @@ -409,7 +409,7 @@ void sim_plugin_close(int pd) dlclose((void *)pd); } -#ifndef WIN32 +#if !defined(WIN32) || defined(SDL) /* the win32 version is in debug-win32.c */ void debug_init(void) diff --git a/uisimulator/common/lcd-common.c b/uisimulator/common/lcd-common.c index a9fc294b1a..119c440318 100644 --- a/uisimulator/common/lcd-common.c +++ b/uisimulator/common/lcd-common.c @@ -24,7 +24,7 @@ #include "lcd.h" -#ifdef WIN32 +#if defined(WIN32) && !defined(SDL) #include "lcd-win32.h" #else #include "lcd-x11.h"