Changeset 15892 for release-kits/shared/search4j/search4j.cpp

Timestamp:

2008-06-06T11:13:01+12:00 (16 years ago)

Author:

oranfry

Message:

change to search4j: using libraries and headers the proper way

File:

• release-kits/shared/search4j/search4j.cpp (modified) (4 diffs)

release-kits/shared/search4j/search4j.cpp

@@ -144 +144 @@
             cout << foundJvm.getVersion() << endl;
         } else if ( jvmProperty == Executable ) {
+            #ifdef WINDOWS
             if ( useJavaw ) {
                 cout << foundJvm.getWinExecutable() << endl;
@@ -149 +150 @@
                 cout << foundJvm.getExecutable() << endl;
             }
+            #else
+            cout << foundJvm.getExecutable() << endl;
+            #endif
         } else {
             return -1; //should never happen
@@ -179 +183 @@
         
         string cmd = "\"", output = "";
+        #ifdef WINDOWS
         if ( useJavaw ) {
             cmd.append( foundJvm.getWinExecutable() );
@@ -184 +189 @@
             cmd.append( foundJvm.getExecutable() );
         }
+        #else
+        cmd.append( foundJvm.getExecutable() );
+        #endif
         cmd.append( "\" -jar " );
         cmd.append( arg1 );