diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2006-01-25 12:15:25 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2006-01-25 12:15:25 +0000 |
commit | 60e8f4f9885d3cffb6cb7aa3b0e09a3fed0d3c84 (patch) | |
tree | bb0f192ecc3f8c5074a462035d59bb5d6eda810a | |
parent | c9bded807b727f2da977837ed4975a721ceabd5c (diff) | |
download | rockbox-60e8f4f9885d3cffb6cb7aa3b0e09a3fed0d3c84.tar.gz rockbox-60e8f4f9885d3cffb6cb7aa3b0e09a3fed0d3c84.zip |
First steps towards SDL sim for windows
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8449 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/SOURCES | 2 | ||||
-rw-r--r-- | firmware/export/lcd.h | 2 | ||||
-rw-r--r-- | uisimulator/common/io.c | 2 | ||||
-rw-r--r-- | 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 | |||
139 | #if CONFIG_CODEC != SWCODEC | 139 | #if CONFIG_CODEC != SWCODEC |
140 | mpeg.c | 140 | mpeg.c |
141 | #endif | 141 | #endif |
142 | #ifndef WIN32 /* the win32 sim has its own versin of these: */ | 142 | #if !defined(WIN32) || defined(SDL) |
143 | panic.c | 143 | panic.c |
144 | debug.c | 144 | debug.c |
145 | #endif | 145 | #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 @@ | |||
29 | 29 | ||
30 | #ifdef SIMULATOR | 30 | #ifdef SIMULATOR |
31 | #define lcd_icon(x,y) sim_lcd_icon(x,y) | 31 | #define lcd_icon(x,y) sim_lcd_icon(x,y) |
32 | #ifndef MAX_PATH | ||
32 | #define MAX_PATH 260 | 33 | #define MAX_PATH 260 |
34 | #endif | ||
33 | #else | 35 | #else |
34 | #include "file.h" /* for MAX_PATH; FIXME: Why does this not work for sims? */ | 36 | #include "file.h" /* for MAX_PATH; FIXME: Why does this not work for sims? */ |
35 | #endif | 37 | #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) | |||
409 | dlclose((void *)pd); | 409 | dlclose((void *)pd); |
410 | } | 410 | } |
411 | 411 | ||
412 | #ifndef WIN32 | 412 | #if !defined(WIN32) || defined(SDL) |
413 | /* the win32 version is in debug-win32.c */ | 413 | /* the win32 version is in debug-win32.c */ |
414 | 414 | ||
415 | void debug_init(void) | 415 | 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 @@ | |||
24 | 24 | ||
25 | #include "lcd.h" | 25 | #include "lcd.h" |
26 | 26 | ||
27 | #ifdef WIN32 | 27 | #if defined(WIN32) && !defined(SDL) |
28 | #include "lcd-win32.h" | 28 | #include "lcd-win32.h" |
29 | #else | 29 | #else |
30 | #include "lcd-x11.h" | 30 | #include "lcd-x11.h" |