diff options
| author | Sky <git@bunnies.cc> | 2013-10-07 08:02:59 -0700 |
|---|---|---|
| committer | Sky <git@bunnies.cc> | 2013-10-07 08:02:59 -0700 |
| commit | 0bf8d9df5cc102fcec496ba3c5cf15477e726516 (patch) | |
| tree | 47a22f0353953061a532f103c9d9a92a18a427f9 /logic/JavaUtils.h | |
| parent | d5e4802adef575d1d2d20a3e6e5addd4b5f4d2ca (diff) | |
| parent | b30a97d4c9315e482341ec863dc5722bf78c4631 (diff) | |
| download | MultiMC-0bf8d9df5cc102fcec496ba3c5cf15477e726516.tar MultiMC-0bf8d9df5cc102fcec496ba3c5cf15477e726516.tar.gz MultiMC-0bf8d9df5cc102fcec496ba3c5cf15477e726516.tar.lz MultiMC-0bf8d9df5cc102fcec496ba3c5cf15477e726516.tar.xz MultiMC-0bf8d9df5cc102fcec496ba3c5cf15477e726516.zip | |
Merge pull request #3 from Drayshak/develop
Fix window size setting for 1.6+, improve Windows Java detection
Diffstat (limited to 'logic/JavaUtils.h')
| -rw-r--r-- | logic/JavaUtils.h | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/logic/JavaUtils.h b/logic/JavaUtils.h index fef2a1bf..63daac12 100644 --- a/logic/JavaUtils.h +++ b/logic/JavaUtils.h @@ -17,10 +17,28 @@ #include <QStringList> +#include "osutils.h" + +#if WINDOWS + #include <windows.h> +#endif + +#define JI_ID 0 +#define JI_ARCH 1 +#define JI_PATH 2 +#define JI_REC 3 +typedef std::tuple<QString, QString, QString, bool> java_install; + class JavaUtils { public: JavaUtils(); - QStringList FindJavaPath(); + std::vector<java_install> FindJavaPaths(); + +private: + std::vector<java_install> GetDefaultJava(); +#if WINDOWS + std::vector<java_install> FindJavaFromRegistryKey(DWORD keyType, QString keyName); +#endif }; |