* SUPPORT_FMOD: Removed.

[cacao.git] / src / vm / global.h

diff --git a/src/vm/global.h b/src/vm/global.h
index 1ed8d88034f4786e25107d619c953cb670db1898..0664da6b368e3d85e62e8ec276049cdd0626a09a 100644 (file)
--- a/src/vm/global.h
+++ b/src/vm/global.h
@@ -33,7 +33,7 @@
             Joseph Wenninger
             Christian Thalinger
 
-   $Id: global.h 2591 2005-06-08 11:03:00Z twisti $
+   $Id: global.h 3811 2005-11-28 16:23:40Z edwin $
 
 */
 
@@ -76,24 +76,17 @@ typedef struct java_objectheader java_objectheader;
 typedef struct java_objectarray java_objectarray;
 
 
-/* define some cacao paths ****************************************************/
+/* define some CACAO paths ****************************************************/
 
-#define CACAO_JRE_DIR               "/jre"
-#define CACAO_LIBRARY_PATH          "/jre/lib/"ARCH_DIR"/"
-#define CACAO_RT_JAR_PATH           "/jre/lib/rt.jar"
-#define CACAO_EXT_DIR               "/jre/lib/ext"
-
-#if defined(WITH_EXTERNAL_CLASSPATH)
-#define CACAO_VM_ZIP_PATH           "/jre/lib/vm.zip"
+#define CACAO_VM_ZIP_PATH           "/share/cacao/vm.zip"
 #define CLASSPATH_LIBRARY_PATH      "/lib/classpath"
-#define CLASSPATH_GLIBJ_ZIP_PATH    "/share/classpath/glibj.zip"
-#endif
+#define CLASSPATH_GLIBJ_ZIP_PATH    "/share/classpath/" GLIBJZ_STRING
 
 
 /*
- * CACAO_TYPECHECK activates typechecking (part of bytecode verification)
+ * ENABLE_VERIFIER activates bytecode verification and other checks
  */
-#define CACAO_TYPECHECK
+#define ENABLE_VERIFIER
 
 /*
  * TYPECHECK_STACK_COMPCAT activates full checking of computational
@@ -146,10 +139,16 @@ typedef struct java_objectarray java_objectarray;
 #define PRIMITIVETYPE_DUMMY2  9            /* not used! */
 #define PRIMITIVETYPE_VOID    TYPE_VOID
 
+/* some Java related defines **************************************************/
+
+#define JAVA_VERSION    "1.4.2"         /* this version is supported by CACAO */
+#define CLASS_VERSION   "49.0"
+
+
 /* Java class file constants **************************************************/
 
 #define MAGIC             0xCAFEBABE
-#define MAJOR_VERSION     48
+#define MAJOR_VERSION     49
 #define MINOR_VERSION     0