solve build error

yoyo8293 · Jun 10, 2012 · b74e58e · b74e58e
1 parent 02424f1
commit b74e58e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/project/jwrapper.vcproj b/project/jwrapper.vcproj
@@ -175,6 +175,10 @@
  Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
  UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
  >
+ <File
+ RelativePath="..\src\DLL.cpp"
+ >
+ </File>
  <File
  RelativePath="..\src\JavaConfig.cpp"
  >
@@ -193,6 +197,10 @@
  Filter="h;hpp;hxx;hm;inl;inc;xsd"
  UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
  >
+ <File
+ RelativePath="..\src\DLL.h"
+ >
+ </File>
  <File
  RelativePath="..\src\JavaConfig.h"
  >

diff --git a/src/DLL.cpp b/src/DLL.cpp
@@ -20,7 +20,7 @@ DLL::DLL(const char* file) : dll(NULL)
 {
  assert(NULL != file);
 
-#ifdef
+#ifdef WIN32
  this->dll = ::LoadLibraryA(file);
 #else
  this->dll = dlopen(file, RTLD_NOW + RTLD_GLOBAL);
@@ -33,7 +33,7 @@ DLL::DLL(const char* file) : dll(NULL)
 DLL::~DLL()
 {
  if(NULL != this->dll) {
-#ifdef
+#ifdef WIN32
  ::FreeLibrary(this->dll);
 #else
  ::dlclose(this->dll);

diff --git a/src/JavaConfig.cpp b/src/JavaConfig.cpp
@@ -59,6 +59,7 @@ bool JavaConfig::load()
  fprintf(stderr, "You must set JAVA_HOME environment variable or set it in config file.\n");
  return false;
  }
+ JWUtil::setEnv("JAVA_HOME", this->javaHome.c_str());
 
  // JVM Type
  this->jvmType = pt.get<string>("java.jvmtype");
@@ -114,9 +115,6 @@ bool JavaConfig::load()
  return false;
  }
 
-
- JWUtil::setEnv("JAVA_HOME", this->javaHome.c_str());
-
  return true;
 }