boot OK

yoyo8293 · Jun 10, 2012 · 80aedb6 · 80aedb6
1 parent b05912e
commit 80aedb6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/bin/jwrapper.xml b/bin/jwrapper.xml
@@ -1,9 +1,9 @@
 <java>
  <debug>true</debug>
 
- <javahome>C:\dummy_java_home</javahome>
+ <javahome>${JAVA_HOME}</javahome>
 
- <jvmtype>hotspot</jvmtype>
+ <jvmtype>client</jvmtype>
 
  <mainclass>Hello</mainclass>
 

diff --git a/src/JavaLauncher.cpp b/src/JavaLauncher.cpp
@@ -47,7 +47,7 @@ int JavaLauncher::launchJavaApp(int argc, char** argv)
 
  // 3, 获取创建JVM的函数指针
  typedef jint(JNICALL * CreateJVMFun)(JavaVM**, void**, void*);
- CreateJVMFun createJVMFun = (CreateJVMFun)jvmDll.getFunction("JNI_CreateJavaJVM");
+ CreateJVMFun createJVMFun = (CreateJVMFun)jvmDll.getFunction("JNI_CreateJavaVM");
  if(NULL == createJVMFun) {
  fprintf(stderr, "Load JVM error %s\n", jvmPath.c_str());
  return -1;

diff --git a/src/jwrapper.cpp b/src/jwrapper.cpp
@@ -15,6 +15,7 @@
  */
 #include "JavaConfig.h"
 #include "JWUtil.h"
+#include "JavaLauncher.h"
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -24,8 +25,9 @@ int main(int argc, char** argv)
  bool result = JavaConfig::getInstance()->load();
  if(result) {
  JavaConfig::getInstance()->printAll();
+
+ return JavaLauncher::getInstance()->launchJavaApp(argc, argv);
  }
 
- system("PAUSE");
- return 0;
+ return -1;
 }