diff options
author | Daniel Stenberg <daniel@haxx.se> | 2003-02-07 10:21:50 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2003-02-07 10:21:50 +0000 |
commit | 3d84988597e932a3a891d6927217484d9c5209a0 (patch) | |
tree | e65f7cf8f5d3d491c6d99c8a5d71ad6c2f59f523 /uisimulator/win32 | |
parent | 910cc29d92d8e1091b8c1409c3511bc1d1b4bab8 (diff) | |
download | rockbox-3d84988597e932a3a891d6927217484d9c5209a0.tar.gz rockbox-3d84988597e932a3a891d6927217484d9c5209a0.zip |
use the new paths
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3223 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator/win32')
-rw-r--r-- | uisimulator/win32/Makefile | 8 | ||||
-rw-r--r-- | uisimulator/win32/atoi.h | 20 | ||||
-rw-r--r-- | uisimulator/win32/dir-win32.c | 1 | ||||
-rw-r--r-- | uisimulator/win32/dir-win32.h | 2 | ||||
-rw-r--r-- | uisimulator/win32/file.h | 2 |
5 files changed, 28 insertions, 5 deletions
diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile index 6daf8d70e1..f18352ac61 100644 --- a/uisimulator/win32/Makefile +++ b/uisimulator/win32/Makefile | |||
@@ -31,9 +31,13 @@ endif | |||
31 | 31 | ||
32 | PREVAPPDIR= .. | 32 | PREVAPPDIR= .. |
33 | FIRMWAREDIR = ../../firmware | 33 | FIRMWAREDIR = ../../firmware |
34 | |||
35 | # build some sources from these dirs | ||
34 | DRIVERS = $(FIRMWAREDIR)/drivers | 36 | DRIVERS = $(FIRMWAREDIR)/drivers |
35 | COMMON = $(FIRMWAREDIR)/common | 37 | COMMON = $(FIRMWAREDIR)/common |
36 | LIBMADDIR = $(PREVAPPDIR)/common/libmad | 38 | |
39 | # include here: | ||
40 | EXPORT = $(FIRMWAREDIR)/export | ||
37 | TOOLSDIR = ../../tools | 41 | TOOLSDIR = ../../tools |
38 | DOCSDIR = ../../docs | 42 | DOCSDIR = ../../docs |
39 | 43 | ||
@@ -54,7 +58,7 @@ $(KEYPAD) $(DISPLAY) -DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) $(RTC) | |||
54 | LDFLAGS = -lgdi32 -luser32 -mwindows | 58 | LDFLAGS = -lgdi32 -luser32 -mwindows |
55 | 59 | ||
56 | # Use this for simulator-only files | 60 | # Use this for simulator-only files |
57 | INCLUDES = -I. -I$(DRIVERS) -I$(COMMON) -I$(FIRMWAREDIR) -I$(APPDIR) -I$(MACHINEDIR) -I../common -I$(MACHINEDIR) -I$(OBJDIR) | 61 | INCLUDES = -I. -I$(EXPORT) -I$(APPDIR) -I$(MACHINEDIR) -I../common -I$(MACHINEDIR) -I$(OBJDIR) |
58 | 62 | ||
59 | # The true Rockbox Applications should use this include path: | 63 | # The true Rockbox Applications should use this include path: |
60 | APPINCLUDES = -I$(FIRMWAREDIR)/include $(INCLUDES) | 64 | APPINCLUDES = -I$(FIRMWAREDIR)/include $(INCLUDES) |
diff --git a/uisimulator/win32/atoi.h b/uisimulator/win32/atoi.h new file mode 100644 index 0000000000..c95cfca64f --- /dev/null +++ b/uisimulator/win32/atoi.h | |||
@@ -0,0 +1,20 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2002 by Daniel Stenberg <daniel@haxx.se> | ||
11 | * | ||
12 | * All files in this archive are subject to the GNU General Public License. | ||
13 | * See the file COPYING in the source tree root for full license agreement. | ||
14 | * | ||
15 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
16 | * KIND, either express or implied. | ||
17 | * | ||
18 | ****************************************************************************/ | ||
19 | |||
20 | int atoi(const char *); | ||
diff --git a/uisimulator/win32/dir-win32.c b/uisimulator/win32/dir-win32.c index 09ca45c354..4441003657 100644 --- a/uisimulator/win32/dir-win32.c +++ b/uisimulator/win32/dir-win32.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include <windows.h> | 21 | #include <windows.h> |
22 | #include <malloc.h> | 22 | #include <malloc.h> |
23 | #include "dir-win32.h" | 23 | #include "dir-win32.h" |
24 | #include "dir.h" | ||
25 | 24 | ||
26 | // Directory operations | 25 | // Directory operations |
27 | // | 26 | // |
diff --git a/uisimulator/win32/dir-win32.h b/uisimulator/win32/dir-win32.h index 6a19b5c535..67b37dfc74 100644 --- a/uisimulator/win32/dir-win32.h +++ b/uisimulator/win32/dir-win32.h | |||
@@ -23,7 +23,7 @@ | |||
23 | #define mkdir(x) dos_mkdir(x) | 23 | #define mkdir(x) dos_mkdir(x) |
24 | 24 | ||
25 | #include <io.h> | 25 | #include <io.h> |
26 | #include "dir.h" | 26 | #include "../../firmware/include/dir.h" |
27 | 27 | ||
28 | 28 | ||
29 | #endif // #ifndef __FILE_WIN32_H__ | 29 | #endif // #ifndef __FILE_WIN32_H__ |
diff --git a/uisimulator/win32/file.h b/uisimulator/win32/file.h index eb1ab82fa9..81fe3dd86a 100644 --- a/uisimulator/win32/file.h +++ b/uisimulator/win32/file.h | |||
@@ -24,5 +24,5 @@ int win32_rename(char *oldpath, char *newpath); | |||
24 | 24 | ||
25 | #define rename(x,y) win32_rename(x,y) | 25 | #define rename(x,y) win32_rename(x,y) |
26 | 26 | ||
27 | #include "../../firmware/common/file.h" | 27 | #include "../../firmware/include/file.h" |
28 | 28 | ||