diff options
Diffstat (limited to 'find_java/src/source/find_java.h')
| -rwxr-xr-x | find_java/src/source/find_java.h | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/find_java/src/source/find_java.h b/find_java/src/source/find_java.h index 1181aa1..49b5fd9 100755 --- a/find_java/src/source/find_java.h +++ b/find_java/src/source/find_java.h @@ -21,15 +21,24 @@ #include "utils.h"
-// We currently search for a Java version for at least 1.6
+#define TO_JAVA_VERSION(major, minor) ((major) * 1000 + (minor))
+#define JAVA_MAJOR(version) ((version) / 1000)
+#define JAVA_MINOR(version) ((version) % 1000)
+
+// We currently search for a Java version for at least 1.6 by default
#define MIN_JAVA_VERSION_MAJOR 1
#define MIN_JAVA_VERSION_MINOR 6
-#define MIN_JAVA_VERSION (MIN_JAVA_VERSION_MAJOR * 1000 + MIN_JAVA_VERSION_MINOR)
+#define MIN_JAVA_VERSION TO_JAVA_VERSION(MIN_JAVA_VERSION_MAJOR, MIN_JAVA_VERSION_MINOR)
+int findJavaInPath(const CPath &path, CPath *outJavaPath, bool isJdk = false,
+ int minVersion = MIN_JAVA_VERSION);
+int findJavaInEnvPath(CPath *outJavaPath, bool isJdk = false,
+ int minVersion = MIN_JAVA_VERSION);
+int findJavaInRegistry(CPath *outJavaPath, bool isJdk = false,
+ int minVersion = MIN_JAVA_VERSION);
+int findJavaInProgramFiles(CPath *outJavaPath, bool isJdk = false,
+ int minVersion = MIN_JAVA_VERSION);
-int findJavaInEnvPath(CPath *outJavaPath);
-int findJavaInRegistry(CPath *outJavaPath);
-int findJavaInProgramFiles(CPath *outJavaPath);
bool getJavaVersion(CPath &javaPath, CString *outVersionStr, int *outVersionInt);
#endif /* _WIN32 */
|