--- Frodo4/Src/main.cpp	2003/07/01 17:09:43	1.1
+++ Frodo4/Src/main.cpp	2003/07/01 19:04:37	1.4
@@ -1,7 +1,7 @@
 /*
  *  main.cpp - Main program
  *
- *  Frodo (C) 1994-1997,2002 Christian Bauer
+ *  Frodo (C) 1994-1997,2002-2003 Christian Bauer
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -32,16 +32,20 @@ char AppDirPath[1024];	// Path of applic
 
 
 // ROM file names
+#ifndef DATADIR
+#define DATADIR
+#endif
+
 #ifdef __riscos__
 #define BASIC_ROM_FILE	"FrodoRsrc:Basic_ROM"
 #define KERNAL_ROM_FILE	"FrodoRsrc:Kernal_ROM"
 #define CHAR_ROM_FILE	"FrodoRsrc:Char_ROM"
 #define FLOPPY_ROM_FILE	"FrodoRsrc:1541_ROM"
 #else
-#define BASIC_ROM_FILE	"Basic ROM"
-#define KERNAL_ROM_FILE	"Kernal ROM"
-#define CHAR_ROM_FILE	"Char ROM"
-#define FLOPPY_ROM_FILE	"1541 ROM"
+#define BASIC_ROM_FILE DATADIR "Basic ROM"
+#define KERNAL_ROM_FILE DATADIR "Kernal ROM"
+#define CHAR_ROM_FILE DATADIR "Char ROM"
+#define FLOPPY_ROM_FILE DATADIR "1541 ROM"
 #endif
 
 
@@ -49,7 +53,6 @@ char AppDirPath[1024];	// Path of applic
  *  Load C64 ROM files
  */
 
-#ifndef __PSXOS__
 bool Frodo::load_rom_files(void)
 {
 	FILE *file;
@@ -104,7 +107,6 @@ bool Frodo::load_rom_files(void)
 
 	return true;
 }
-#endif
 
 
 #ifdef __BEOS__