summaryrefslogtreecommitdiffstats
path: root/uisimulator
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2003-02-07 10:21:50 +0000
committerDaniel Stenberg <daniel@haxx.se>2003-02-07 10:21:50 +0000
commit3d84988597e932a3a891d6927217484d9c5209a0 (patch)
treee65f7cf8f5d3d491c6d99c8a5d71ad6c2f59f523 /uisimulator
parent910cc29d92d8e1091b8c1409c3511bc1d1b4bab8 (diff)
downloadrockbox-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')
-rw-r--r--uisimulator/win32/Makefile8
-rw-r--r--uisimulator/win32/atoi.h20
-rw-r--r--uisimulator/win32/dir-win32.c1
-rw-r--r--uisimulator/win32/dir-win32.h2
-rw-r--r--uisimulator/win32/file.h2
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
PREVAPPDIR= ..
FIRMWAREDIR = ../../firmware
+
+# build some sources from these dirs
DRIVERS = $(FIRMWAREDIR)/drivers
COMMON = $(FIRMWAREDIR)/common
-LIBMADDIR = $(PREVAPPDIR)/common/libmad
+
+# include here:
+EXPORT = $(FIRMWAREDIR)/export
TOOLSDIR = ../../tools
DOCSDIR = ../../docs
@@ -54,7 +58,7 @@ $(KEYPAD) $(DISPLAY) -DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) $(RTC)
LDFLAGS = -lgdi32 -luser32 -mwindows
# Use this for simulator-only files
-INCLUDES = -I. -I$(DRIVERS) -I$(COMMON) -I$(FIRMWAREDIR) -I$(APPDIR) -I$(MACHINEDIR) -I../common -I$(MACHINEDIR) -I$(OBJDIR)
+INCLUDES = -I. -I$(EXPORT) -I$(APPDIR) -I$(MACHINEDIR) -I../common -I$(MACHINEDIR) -I$(OBJDIR)
# The true Rockbox Applications should use this include path:
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 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2002 by Daniel Stenberg <daniel@haxx.se>
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+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 @@
#include <windows.h>
#include <malloc.h>
#include "dir-win32.h"
-#include "dir.h"
// Directory operations
//
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 @@
#define mkdir(x) dos_mkdir(x)
#include <io.h>
-#include "dir.h"
+#include "../../firmware/include/dir.h"
#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);
#define rename(x,y) win32_rename(x,y)
-#include "../../firmware/common/file.h"
+#include "../../firmware/include/file.h"