summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtools/buildzip.pl2
-rwxr-xr-xtools/configure8
-rw-r--r--tools/root.make4
-rw-r--r--uisimulator/common/io.c6
4 files changed, 10 insertions, 10 deletions
diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index 6e25f79e8e..73902541be 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -423,7 +423,7 @@ sub runone {
}
if($sim) {
- system("cp -r .rockbox archos/ >/dev/null");
+ system("cp -r .rockbox simdisk/ >/dev/null");
}
else {
system("$ziptool $output .rockbox $target >/dev/null");
diff --git a/tools/configure b/tools/configure
index 952ed17de7..9b3f108185 100755
--- a/tools/configure
+++ b/tools/configure
@@ -2132,11 +2132,11 @@ if [ "yes" = "$simulator" ]; then
# setup compiler and things for simulator
simcc
- if [ -d "archos" ]; then
- echo "sub directory archos already present"
+ if [ -d "simdisk" ]; then
+ echo "Subdirectory 'simdisk' already present"
else
- mkdir archos
- echo "created an archos subdirectory for simulating the hard disk"
+ mkdir simdisk
+ echo "Created a 'simdisk' subdirectory for simulating the hard disk"
fi
fi
diff --git a/tools/root.make b/tools/root.make
index 154b734a75..54da3159b7 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -252,12 +252,12 @@ endif
ifdef SIMVER
install:
- @echo "Installing your build in your archos dir"
+ @echo "Installing your build in your 'simdisk' dir"
$(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \
$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -t \"$(MODELNAME)$$feat\" -i \"$(TARGET_ID)\" -s -r "$(ROOTDIR)" -f 0 $(TARGET) $(BINARY)
fullinstall:
- @echo "Installing a full setup in your archos dir"
+ @echo "Installing a full setup in your 'simdisk' dir"
$(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \
$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -t \"$(MODELNAME)$$feat\" -i \"$(TARGET_ID)\" -s -r "$(ROOTDIR)" -f 2 $(TARGET) $(BINARY)
diff --git a/uisimulator/common/io.c b/uisimulator/common/io.c
index 5827508d97..52df94901b 100644
--- a/uisimulator/common/io.c
+++ b/uisimulator/common/io.c
@@ -144,7 +144,7 @@ void dircache_rename(const char *oldpath, const char *newpath);
#endif
-#define SIMULATOR_DEFAULT_ROOT "archos"
+#define SIMULATOR_DEFAULT_ROOT "simdisk"
extern const char *sim_root_dir;
static int num_openfiles = 0;
@@ -585,7 +585,7 @@ int sim_fsync(int fd)
#include <dlfcn.h>
#endif
-#define TEMP_CODEC_FILE "archos/_temp_codec%d.dll"
+#define TEMP_CODEC_FILE SIMULATOR_DEFAULT_ROOT "/_temp_codec%d.dll"
void *sim_codec_load_ram(char* codecptr, int size, void **pd)
{
@@ -657,7 +657,7 @@ void *sim_plugin_load(char *plugin, void **pd)
char buf[MAX_PATH];
#endif
- snprintf(path, sizeof(path), "archos%s", plugin);
+ snprintf(path, sizeof(path), SIMULATOR_DEFAULT_ROOT "%s", plugin);
*pd = NULL;