add jvm_gw windows project and add system_getproperty function 03/2603/3
Antoine ELIAS [Thu, 25 Nov 2010 15:11:25 +0000 (16:11 +0100)]
Change-Id: I2caa6001a8ea44c9285caae98be8e3d5c51f5252

18 files changed:
scilab/Scilab.sln
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/modules/functions_manager/includes/module_declaration.hxx
scilab/modules/functions_manager/src/cpp/funcmanager.cpp
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/jvm/includes/dynlib_jvm_gw.h [new file with mode: 0644]
scilab/modules/jvm/includes/gw_jvm.h
scilab/modules/jvm/includes/jvm_gw.hxx [new file with mode: 0644]
scilab/modules/jvm/includes/system_getproperty.h [moved from scilab/modules/jvm/src/c/system_getproperty.h with 88% similarity]
scilab/modules/jvm/libjvm.vcproj
scilab/modules/jvm/sci_gateway/c/gw_jvm.c
scilab/modules/jvm/sci_gateway/c/sci_system_getproperty.c [deleted file]
scilab/modules/jvm/sci_gateway/cpp/jvm_gw.cpp [new file with mode: 0644]
scilab/modules/jvm/sci_gateway/cpp/libjvm_gw.vcproj [new file with mode: 0644]
scilab/modules/jvm/sci_gateway/cpp/sci_system_getproperty.cpp [new file with mode: 0644]
scilab/modules/jvm/src/nojvm/nojvm_gw.cpp [new file with mode: 0644]

index b139bc9..94ad06c 100644 (file)
@@ -1233,6 +1233,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "functions_manager", "module
        ProjectSection(ProjectDependencies) = postProject
                {764FAC09-369D-4C11-A0FF-CE097D9A4FAF} = {764FAC09-369D-4C11-A0FF-CE097D9A4FAF}
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {2D02DD0E-CBF5-493E-AA06-1E289ED24666} = {2D02DD0E-CBF5-493E-AA06-1E289ED24666}
                {45CA5B12-7601-4968-AE16-16069FD1A152} = {45CA5B12-7601-4968-AE16-16069FD1A152}
                {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD} = {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD}
                {28305722-6486-481D-BD0F-B4398D8A09C5} = {28305722-6486-481D-BD0F-B4398D8A09C5}
@@ -1606,6 +1607,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "localization_gw", "modules\
                {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF} = {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}
        EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjvm_gw", "modules\jvm\sci_gateway\cpp\libjvm_gw.vcproj", "{2D02DD0E-CBF5-493E-AA06-1E289ED24666}"
+       ProjectSection(ProjectDependencies) = postProject
+               {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F} = {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}
+               {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
+               {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
+               {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF} = {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}
+               {7CA60AEF-9AFA-4D06-AF28-613C0AA27640} = {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}
+       EndProjectSection
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -2966,6 +2977,14 @@ Global
                {7A68EDC6-F0AF-47D1-BB16-B8A9DCD9202D}.Release|Win32.Build.0 = Release|Win32
                {7A68EDC6-F0AF-47D1-BB16-B8A9DCD9202D}.Release|x64.ActiveCfg = Release|x64
                {7A68EDC6-F0AF-47D1-BB16-B8A9DCD9202D}.Release|x64.Build.0 = Release|x64
+               {2D02DD0E-CBF5-493E-AA06-1E289ED24666}.Debug|Win32.ActiveCfg = Debug|Win32
+               {2D02DD0E-CBF5-493E-AA06-1E289ED24666}.Debug|Win32.Build.0 = Debug|Win32
+               {2D02DD0E-CBF5-493E-AA06-1E289ED24666}.Debug|x64.ActiveCfg = Debug|x64
+               {2D02DD0E-CBF5-493E-AA06-1E289ED24666}.Debug|x64.Build.0 = Debug|x64
+               {2D02DD0E-CBF5-493E-AA06-1E289ED24666}.Release|Win32.ActiveCfg = Release|Win32
+               {2D02DD0E-CBF5-493E-AA06-1E289ED24666}.Release|Win32.Build.0 = Release|Win32
+               {2D02DD0E-CBF5-493E-AA06-1E289ED24666}.Release|x64.ActiveCfg = Release|x64
+               {2D02DD0E-CBF5-493E-AA06-1E289ED24666}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index 58af496..16078e3 100644 (file)
@@ -31,5 +31,6 @@
     <module name="scinotes" activate="@GUI_ENABLE@"/>
     <module name="data_structures" activate="yes"/>
     <module name="localization" activate="yes"/>
+    <module name="jvm" activate="@JAVA_ENABLE@"/>
 </modules>
 
index dd92c69..fb56149 100644 (file)
@@ -32,5 +32,6 @@
     <module name="data_structures" activate="yes"/>
     <module name="localization" activate="yes"/>
     <module name="windows_tools" activate="yes"/>
+    <module name="jvm" activate="yes"/>
 </modules>
 
index b2e5779..2e60295 100644 (file)
@@ -29,5 +29,6 @@
 #include "../../scinotes/includes/scinotes_gw.hxx"
 #include "../../localization/includes/localization_gw.hxx"
 #include "../../windows_tools/includes/windows_tools_gw.hxx"
+#include "../../jvm/includes/jvm_gw.hxx"
 
 #endif /* !__MODULE_DECLARATION_HXX__ */
index 85d4eba..186f4a7 100644 (file)
@@ -24,6 +24,7 @@
 #include <libxml/xmlreader.h>
 
 #include "MALLOC.h"
+#include "sci_mode.h"
 #include "funcmanager.hxx"
 #include "configvariable.hxx"
 #include "module_declaration.hxx"
@@ -298,6 +299,10 @@ bool FuncManager::CreateModuleList(void)
     m_ModuleMap.insert(pair<wstring, GW_MOD>(L"string", &StringModule::Load));
     m_ModuleMap.insert(pair<wstring, GW_MOD>(L"scinotes", &ScinotesModule::Load));
     m_ModuleMap.insert(pair<wstring, GW_MOD>(L"localization", &LocalizationModule::Load));
+    if (ConfigVariable::getScilabMode() != SCILAB_NWNI)
+    {
+        m_ModuleMap.insert(pair<wstring, GW_MOD>(L"jvm", &JvmModule::Load));
+    }
 #ifdef _MSC_VER
     m_ModuleMap.insert(pair<wstring, GW_MOD>(L"windows_tools", &WindowsToolsModule::Load));
 #endif
index d973c14..654c4b3 100644 (file)
@@ -22,9 +22,6 @@ libscijvm_la_root_DATA = changelog.txt license.txt readme.txt version.xml
 libscijvm_la_etcdir = $(mydatadir)/etc
 libscijvm_la_etc_DATA = etc/jvm.quit etc/jvm.start
 
-
-
-
 libscijvm_la_CFLAGS=   $(JAVA_JNI_INCLUDE) \
                        -I$(top_srcdir)/libs/MALLOC/includes/ \
                        -I$(top_srcdir)/libs/dynamiclibrary/includes/ \
@@ -40,6 +37,15 @@ libscijvm_la_CFLAGS=         $(JAVA_JNI_INCLUDE) \
                        -I$(top_srcdir)/modules/operations/includes/ \
                        -I$(top_srcdir)/modules/system_env/includes/
 
+libscijvm_la_CPPFLAGS=-I$(srcdir)/includes/ \
+                       -I$(top_srcdir)/modules/abstractSyntaxTree/includes/ \
+                       -I$(top_srcdir)/modules/types/includes/ \
+                       -I$(top_srcdir)/modules/symbol/includes/ \
+                       -I$(top_srcdir)/modules/output_stream/includes/ \
+                       -I$(top_srcdir)/modules/localization/includes/ \
+                       -I$(top_srcdir)/modules/functions_manager/includes/ \
+                       -I$(top_srcdir)/modules/system_env/includes/
+
 pkglib_LTLIBRARIES = libscijvm-disable.la
 
 if GUI
@@ -71,13 +77,14 @@ includes/addToClasspath.h \
 includes/addToLibrarypath.h \
 includes/getScilabObject.h
 
-GATEWAY_C_SOURCES = sci_gateway/c/sci_system_getproperty.c \
-sci_gateway/c/sci_system_setproperty.c \
+GATEWAY_C_SOURCES = sci_gateway/c/sci_system_setproperty.c \
 sci_gateway/c/sci_with_embedded_jre.c \
 sci_gateway/c/sci_javaclasspath.c \
 sci_gateway/c/gw_jvm.c \
 sci_gateway/c/sci_javalibrarypath.c
 
+GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_system_getproperty.cpp \
+                                         sci_gateway/cpp/jvm_gw.cpp
 
 JVM_C_SOURCES = src/c/InitializeJVM.c \
 src/c/TerminateJVM.c \
@@ -98,15 +105,24 @@ src/c/getLibrarypath.c \
 src/c/addToLibrarypath.c \
 src/c/getJvmOptions.c
 
-libscijvm_disable_la_SOURCES = src/nojvm/nojvm.c
+JVM_DISABLE_C_SOURCES = src/nojvm/nojvm.c
+JVM_DISABLE_CPP_SOURCES = src/nojvm/nojvm_gw.cpp
+libscijvm_disable_la_SOURCES = $(JVM_DISABLE_C_SOURCES) $(JVM_DISABLE_CPP_SOURCES)
 libscijvm_disable_la_CFLAGS = -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/modules/call_scilab/includes \
                        -I$(srcdir)/src/c \
                        -I$(top_srcdir)/modules/api_scilab/includes \
             -I$(top_srcdir)/modules/operations/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/
+libscijvm_disable_la_CPPFLAGS = -I$(srcdir)/includes/ \
+                       -I$(top_srcdir)/modules/abstractSyntaxTree/includes/ \
+                       -I$(top_srcdir)/modules/types/includes/ \
+                       -I$(top_srcdir)/modules/symbol/includes/ \
+                       -I$(top_srcdir)/modules/output_stream/includes/ \
+                       -I$(top_srcdir)/modules/localization/includes/ \
+                       -I$(top_srcdir)/modules/functions_manager/includes/
 
-libscijvm_la_SOURCES = $(JVM_C_SOURCES) $(GATEWAY_C_SOURCES)
+libscijvm_la_SOURCES = $(JVM_C_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
 
 # For the code check (splint)
 CHECK_SRC= $(libscijvm_la_SOURCES)
index a201799..8efd158 100644 (file)
@@ -124,18 +124,16 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libscijvm_la_includedir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libscijvm_disable_la_LIBADD =
-am_libscijvm_disable_la_OBJECTS = libscijvm_disable_la-nojvm.lo
+am__objects_1 = libscijvm_disable_la-nojvm.lo
+am__objects_2 = libscijvm_disable_la-nojvm_gw.lo
+am_libscijvm_disable_la_OBJECTS = $(am__objects_1) $(am__objects_2)
 libscijvm_disable_la_OBJECTS = $(am_libscijvm_disable_la_OBJECTS)
-libscijvm_disable_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(libscijvm_disable_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-       $(LDFLAGS) -o $@
 libscijvm_la_DEPENDENCIES =  \
        $(top_builddir)/libs/MALLOC/libscimalloc.la \
        $(top_builddir)/modules/fileio/libscifileio.la \
        $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la
-am__objects_1 = libscijvm_la-InitializeJVM.lo \
+am__objects_3 = libscijvm_la-InitializeJVM.lo \
        libscijvm_la-TerminateJVM.lo libscijvm_la-JVM_Unix.lo \
        libscijvm_la-JVM.lo libscijvm_la-addToClasspath.lo \
        libscijvm_la-loadOnUseClassPath.lo \
@@ -149,16 +147,18 @@ am__objects_1 = libscijvm_la-InitializeJVM.lo \
        libscijvm_la-catchIfJavaException.lo \
        libscijvm_la-loadLibrarypath.lo libscijvm_la-getLibrarypath.lo \
        libscijvm_la-addToLibrarypath.lo libscijvm_la-getJvmOptions.lo
-am__objects_2 = libscijvm_la-sci_system_getproperty.lo \
-       libscijvm_la-sci_system_setproperty.lo \
+am__objects_4 = libscijvm_la-sci_system_setproperty.lo \
        libscijvm_la-sci_with_embedded_jre.lo \
        libscijvm_la-sci_javaclasspath.lo libscijvm_la-gw_jvm.lo \
        libscijvm_la-sci_javalibrarypath.lo
-am_libscijvm_la_OBJECTS = $(am__objects_1) $(am__objects_2)
+am__objects_5 = libscijvm_la-sci_system_getproperty.lo \
+       libscijvm_la-jvm_gw.lo
+am_libscijvm_la_OBJECTS = $(am__objects_3) $(am__objects_4) \
+       $(am__objects_5)
 libscijvm_la_OBJECTS = $(am_libscijvm_la_OBJECTS)
-libscijvm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libscijvm_la_CFLAGS) \
-       $(CFLAGS) $(libscijvm_la_LDFLAGS) $(LDFLAGS) -o $@
+libscijvm_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+       $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+       $(CXXFLAGS) $(libscijvm_la_LDFLAGS) $(LDFLAGS) -o $@
 @GUI_TRUE@am_libscijvm_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
@@ -173,6 +173,15 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+       --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+       --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+       $(LDFLAGS) -o $@
 SOURCES = $(libscijvm_disable_la_SOURCES) $(libscijvm_la_SOURCES)
 DIST_SOURCES = $(libscijvm_disable_la_SOURCES) $(libscijvm_la_SOURCES)
 DATA = $(libscijvm_la_etc_DATA) $(libscijvm_la_root_DATA) \
@@ -457,6 +466,15 @@ libscijvm_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
                        -I$(top_srcdir)/modules/operations/includes/ \
                        -I$(top_srcdir)/modules/system_env/includes/
 
+libscijvm_la_CPPFLAGS = -I$(srcdir)/includes/ \
+                       -I$(top_srcdir)/modules/abstractSyntaxTree/includes/ \
+                       -I$(top_srcdir)/modules/types/includes/ \
+                       -I$(top_srcdir)/modules/symbol/includes/ \
+                       -I$(top_srcdir)/modules/output_stream/includes/ \
+                       -I$(top_srcdir)/modules/localization/includes/ \
+                       -I$(top_srcdir)/modules/functions_manager/includes/ \
+                       -I$(top_srcdir)/modules/system_env/includes/
+
 pkglib_LTLIBRARIES = libscijvm-disable.la $(am__append_1)
 @GUI_TRUE@USEANT = 1
 libscijvm_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) \
@@ -479,13 +497,15 @@ includes/addToClasspath.h \
 includes/addToLibrarypath.h \
 includes/getScilabObject.h
 
-GATEWAY_C_SOURCES = sci_gateway/c/sci_system_getproperty.c \
-sci_gateway/c/sci_system_setproperty.c \
+GATEWAY_C_SOURCES = sci_gateway/c/sci_system_setproperty.c \
 sci_gateway/c/sci_with_embedded_jre.c \
 sci_gateway/c/sci_javaclasspath.c \
 sci_gateway/c/gw_jvm.c \
 sci_gateway/c/sci_javalibrarypath.c
 
+GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_system_getproperty.cpp \
+                                         sci_gateway/cpp/jvm_gw.cpp
+
 JVM_C_SOURCES = src/c/InitializeJVM.c \
 src/c/TerminateJVM.c \
 src/c/JVM_Unix.c \
@@ -505,7 +525,9 @@ src/c/getLibrarypath.c \
 src/c/addToLibrarypath.c \
 src/c/getJvmOptions.c
 
-libscijvm_disable_la_SOURCES = src/nojvm/nojvm.c
+JVM_DISABLE_C_SOURCES = src/nojvm/nojvm.c
+JVM_DISABLE_CPP_SOURCES = src/nojvm/nojvm_gw.cpp
+libscijvm_disable_la_SOURCES = $(JVM_DISABLE_C_SOURCES) $(JVM_DISABLE_CPP_SOURCES)
 libscijvm_disable_la_CFLAGS = -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/modules/call_scilab/includes \
                        -I$(srcdir)/src/c \
@@ -513,7 +535,15 @@ libscijvm_disable_la_CFLAGS = -I$(srcdir)/includes/ \
             -I$(top_srcdir)/modules/operations/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/
 
-libscijvm_la_SOURCES = $(JVM_C_SOURCES) $(GATEWAY_C_SOURCES)
+libscijvm_disable_la_CPPFLAGS = -I$(srcdir)/includes/ \
+                       -I$(top_srcdir)/modules/abstractSyntaxTree/includes/ \
+                       -I$(top_srcdir)/modules/types/includes/ \
+                       -I$(top_srcdir)/modules/symbol/includes/ \
+                       -I$(top_srcdir)/modules/output_stream/includes/ \
+                       -I$(top_srcdir)/modules/localization/includes/ \
+                       -I$(top_srcdir)/modules/functions_manager/includes/
+
+libscijvm_la_SOURCES = $(JVM_C_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
 
 # For the code check (splint)
 CHECK_SRC = $(libscijvm_la_SOURCES)
@@ -584,7 +614,7 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .sci .bin .c .lo .o .obj
+.SUFFIXES: .sci .bin .c .cpp .lo .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.incl.am $(am__configure_deps)
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
@@ -647,7 +677,7 @@ clean-pkglibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 libscijvm-disable.la: $(libscijvm_disable_la_OBJECTS) $(libscijvm_disable_la_DEPENDENCIES) 
-       $(libscijvm_disable_la_LINK) -rpath $(pkglibdir) $(libscijvm_disable_la_OBJECTS) $(libscijvm_disable_la_LIBADD) $(LIBS)
+       $(CXXLINK) -rpath $(pkglibdir) $(libscijvm_disable_la_OBJECTS) $(libscijvm_disable_la_LIBADD) $(LIBS)
 libscijvm.la: $(libscijvm_la_OBJECTS) $(libscijvm_la_DEPENDENCIES) 
        $(libscijvm_la_LINK) $(am_libscijvm_la_rpath) $(libscijvm_la_OBJECTS) $(libscijvm_la_LIBADD) $(LIBS)
 
@@ -658,6 +688,7 @@ distclean-compile:
        -rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscijvm_disable_la-nojvm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscijvm_disable_la-nojvm_gw.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscijvm_la-InitializeJVM.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscijvm_la-JVM.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscijvm_la-JVM_Unix.Plo@am__quote@
@@ -671,6 +702,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscijvm_la-getJvmOptions.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscijvm_la-getLibrarypath.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscijvm_la-gw_jvm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscijvm_la-jvm_gw.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscijvm_la-loadBackGroundClassPath.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscijvm_la-loadClasspath.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscijvm_la-loadLibrarypath.Plo@am__quote@
@@ -705,179 +737,214 @@ distclean-compile:
 @am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
 
 libscijvm_disable_la-nojvm.lo: src/nojvm/nojvm.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_disable_la_CFLAGS) $(CFLAGS) -MT libscijvm_disable_la-nojvm.lo -MD -MP -MF $(DEPDIR)/libscijvm_disable_la-nojvm.Tpo -c -o libscijvm_disable_la-nojvm.lo `test -f 'src/nojvm/nojvm.c' || echo '$(srcdir)/'`src/nojvm/nojvm.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_disable_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_disable_la_CFLAGS) $(CFLAGS) -MT libscijvm_disable_la-nojvm.lo -MD -MP -MF $(DEPDIR)/libscijvm_disable_la-nojvm.Tpo -c -o libscijvm_disable_la-nojvm.lo `test -f 'src/nojvm/nojvm.c' || echo '$(srcdir)/'`src/nojvm/nojvm.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscijvm_disable_la-nojvm.Tpo $(DEPDIR)/libscijvm_disable_la-nojvm.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/nojvm/nojvm.c' object='libscijvm_disable_la-nojvm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_disable_la_CFLAGS) $(CFLAGS) -c -o libscijvm_disable_la-nojvm.lo `test -f 'src/nojvm/nojvm.c' || echo '$(srcdir)/'`src/nojvm/nojvm.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_disable_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_disable_la_CFLAGS) $(CFLAGS) -c -o libscijvm_disable_la-nojvm.lo `test -f 'src/nojvm/nojvm.c' || echo '$(srcdir)/'`src/nojvm/nojvm.c
 
 libscijvm_la-InitializeJVM.lo: src/c/InitializeJVM.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-InitializeJVM.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-InitializeJVM.Tpo -c -o libscijvm_la-InitializeJVM.lo `test -f 'src/c/InitializeJVM.c' || echo '$(srcdir)/'`src/c/InitializeJVM.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-InitializeJVM.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-InitializeJVM.Tpo -c -o libscijvm_la-InitializeJVM.lo `test -f 'src/c/InitializeJVM.c' || echo '$(srcdir)/'`src/c/InitializeJVM.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscijvm_la-InitializeJVM.Tpo $(DEPDIR)/libscijvm_la-InitializeJVM.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/InitializeJVM.c' object='libscijvm_la-InitializeJVM.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-InitializeJVM.lo `test -f 'src/c/InitializeJVM.c' || echo '$(srcdir)/'`src/c/InitializeJVM.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-InitializeJVM.lo `test -f 'src/c/InitializeJVM.c' || echo '$(srcdir)/'`src/c/InitializeJVM.c
 
 libscijvm_la-TerminateJVM.lo: src/c/TerminateJVM.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-TerminateJVM.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-TerminateJVM.Tpo -c -o libscijvm_la-TerminateJVM.lo `test -f 'src/c/TerminateJVM.c' || echo '$(srcdir)/'`src/c/TerminateJVM.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-TerminateJVM.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-TerminateJVM.Tpo -c -o libscijvm_la-TerminateJVM.lo `test -f 'src/c/TerminateJVM.c' || echo '$(srcdir)/'`src/c/TerminateJVM.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscijvm_la-TerminateJVM.Tpo $(DEPDIR)/libscijvm_la-TerminateJVM.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/TerminateJVM.c' object='libscijvm_la-TerminateJVM.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-TerminateJVM.lo `test -f 'src/c/TerminateJVM.c' || echo '$(srcdir)/'`src/c/TerminateJVM.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-TerminateJVM.lo `test -f 'src/c/TerminateJVM.c' || echo '$(srcdir)/'`src/c/TerminateJVM.c
 
 libscijvm_la-JVM_Unix.lo: src/c/JVM_Unix.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-JVM_Unix.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-JVM_Unix.Tpo -c -o libscijvm_la-JVM_Unix.lo `test -f 'src/c/JVM_Unix.c' || echo '$(srcdir)/'`src/c/JVM_Unix.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-JVM_Unix.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-JVM_Unix.Tpo -c -o libscijvm_la-JVM_Unix.lo `test -f 'src/c/JVM_Unix.c' || echo '$(srcdir)/'`src/c/JVM_Unix.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscijvm_la-JVM_Unix.Tpo $(DEPDIR)/libscijvm_la-JVM_Unix.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/JVM_Unix.c' object='libscijvm_la-JVM_Unix.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-JVM_Unix.lo `test -f 'src/c/JVM_Unix.c' || echo '$(srcdir)/'`src/c/JVM_Unix.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-JVM_Unix.lo `test -f 'src/c/JVM_Unix.c' || echo '$(srcdir)/'`src/c/JVM_Unix.c
 
 libscijvm_la-JVM.lo: src/c/JVM.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-JVM.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-JVM.Tpo -c -o libscijvm_la-JVM.lo `test -f 'src/c/JVM.c' || echo '$(srcdir)/'`src/c/JVM.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-JVM.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-JVM.Tpo -c -o libscijvm_la-JVM.lo `test -f 'src/c/JVM.c' || echo '$(srcdir)/'`src/c/JVM.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscijvm_la-JVM.Tpo $(DEPDIR)/libscijvm_la-JVM.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/JVM.c' object='libscijvm_la-JVM.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-JVM.lo `test -f 'src/c/JVM.c' || echo '$(srcdir)/'`src/c/JVM.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-JVM.lo `test -f 'src/c/JVM.c' || echo '$(srcdir)/'`src/c/JVM.c
 
 libscijvm_la-addToClasspath.lo: src/c/addToClasspath.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-addToClasspath.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-addToClasspath.Tpo -c -o libscijvm_la-addToClasspath.lo `test -f 'src/c/addToClasspath.c' || echo '$(srcdir)/'`src/c/addToClasspath.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-addToClasspath.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-addToClasspath.Tpo -c -o libscijvm_la-addToClasspath.lo `test -f 'src/c/addToClasspath.c' || echo '$(srcdir)/'`src/c/addToClasspath.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscijvm_la-addToClasspath.Tpo $(DEPDIR)/libscijvm_la-addToClasspath.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/addToClasspath.c' object='libscijvm_la-addToClasspath.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-addToClasspath.lo `test -f 'src/c/addToClasspath.c' || echo '$(srcdir)/'`src/c/addToClasspath.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-addToClasspath.lo `test -f 'src/c/addToClasspath.c' || echo '$(srcdir)/'`src/c/addToClasspath.c
 
 libscijvm_la-loadOnUseClassPath.lo: src/c/loadOnUseClassPath.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-loadOnUseClassPath.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-loadOnUseClassPath.Tpo -c -o libscijvm_la-loadOnUseClassPath.lo `test -f 'src/c/loadOnUseClassPath.c' || echo '$(srcdir)/'`src/c/loadOnUseClassPath.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-loadOnUseClassPath.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-loadOnUseClassPath.Tpo -c -o libscijvm_la-loadOnUseClassPath.lo `test -f 'src/c/loadOnUseClassPath.c' || echo '$(srcdir)/'`src/c/loadOnUseClassPath.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscijvm_la-loadOnUseClassPath.Tpo $(DEPDIR)/libscijvm_la-loadOnUseClassPath.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/loadOnUseClassPath.c' object='libscijvm_la-loadOnUseClassPath.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-loadOnUseClassPath.lo `test -f 'src/c/loadOnUseClassPath.c' || echo '$(srcdir)/'`src/c/loadOnUseClassPath.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-loadOnUseClassPath.lo `test -f 'src/c/loadOnUseClassPath.c' || echo '$(srcdir)/'`src/c/loadOnUseClassPath.c
 
 libscijvm_la-loadBackGroundClassPath.lo: src/c/loadBackGroundClassPath.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-loadBackGroundClassPath.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-loadBackGroundClassPath.Tpo -c -o libscijvm_la-loadBackGroundClassPath.lo `test -f 'src/c/loadBackGroundClassPath.c' || echo '$(srcdir)/'`src/c/loadBackGroundClassPath.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-loadBackGroundClassPath.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-loadBackGroundClassPath.Tpo -c -o libscijvm_la-loadBackGroundClassPath.lo `test -f 'src/c/loadBackGroundClassPath.c' || echo '$(srcdir)/'`src/c/loadBackGroundClassPath.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscijvm_la-loadBackGroundClassPath.Tpo $(DEPDIR)/libscijvm_la-loadBackGroundClassPath.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/loadBackGroundClassPath.c' object='libscijvm_la-loadBackGroundClassPath.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-loadBackGroundClassPath.lo `test -f 'src/c/loadBackGroundClassPath.c' || echo '$(srcdir)/'`src/c/loadBackGroundClassPath.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-loadBackGroundClassPath.lo `test -f 'src/c/loadBackGroundClassPath.c' || echo '$(srcdir)/'`src/c/loadBackGroundClassPath.c
 
 libscijvm_la-getClasspath.lo: src/c/getClasspath.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-getClasspath.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-getClasspath.Tpo -c -o libscijvm_la-getClasspath.lo `test -f 'src/c/getClasspath.c' || echo '$(srcdir)/'`src/c/getClasspath.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-getClasspath.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-getClasspath.Tpo -c -o libscijvm_la-getClasspath.lo `test -f 'src/c/getClasspath.c' || echo '$(srcdir)/'`src/c/getClasspath.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscijvm_la-getClasspath.Tpo $(DEPDIR)/libscijvm_la-getClasspath.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/getClasspath.c' object='libscijvm_la-getClasspath.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-getClasspath.lo `test -f 'src/c/getClasspath.c' || echo '$(srcdir)/'`src/c/getClasspath.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-getClasspath.lo `test -f 'src/c/getClasspath.c' || echo '$(srcdir)/'`src/c/getClasspath.c
 
 libscijvm_la-system_getproperty.lo: src/c/system_getproperty.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-system_getproperty.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-system_getproperty.Tpo -c -o libscijvm_la-system_getproperty.lo `test -f 'src/c/system_getproperty.c' || echo '$(srcdir)/'`src/c/system_getproperty.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-system_getproperty.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-system_getproperty.Tpo -c -o libscijvm_la-system_getproperty.lo `test -f 'src/c/system_getproperty.c' || echo '$(srcdir)/'`src/c/system_getproperty.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscijvm_la-system_getproperty.Tpo $(DEPDIR)/libscijvm_la-system_getproperty.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/system_getproperty.c' object='libscijvm_la-system_getproperty.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-system_getproperty.lo `test -f 'src/c/system_getproperty.c' || echo '$(srcdir)/'`src/c/system_getproperty.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-system_getproperty.lo `test -f 'src/c/system_getproperty.c' || echo '$(srcdir)/'`src/c/system_getproperty.c
 
 libscijvm_la-system_setproperty.lo: src/c/system_setproperty.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-system_setproperty.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-system_setproperty.Tpo -c -o libscijvm_la-system_setproperty.lo `test -f 'src/c/system_setproperty.c' || echo '$(srcdir)/'`src/c/system_setproperty.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-system_setproperty.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-system_setproperty.Tpo -c -o libscijvm_la-system_setproperty.lo `test -f 'src/c/system_setproperty.c' || echo '$(srcdir)/'`src/c/system_setproperty.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscijvm_la-system_setproperty.Tpo $(DEPDIR)/libscijvm_la-system_setproperty.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/system_setproperty.c' object='libscijvm_la-system_setproperty.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-system_setproperty.lo `test -f 'src/c/system_setproperty.c' || echo '$(srcdir)/'`src/c/system_setproperty.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-system_setproperty.lo `test -f 'src/c/system_setproperty.c' || echo '$(srcdir)/'`src/c/system_setproperty.c
 
 libscijvm_la-loadClasspath.lo: src/c/loadClasspath.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-loadClasspath.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-loadClasspath.Tpo -c -o libscijvm_la-loadClasspath.lo `test -f 'src/c/loadClasspath.c' || echo '$(srcdir)/'`src/c/loadClasspath.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-loadClasspath.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-loadClasspath.Tpo -c -o libscijvm_la-loadClasspath.lo `test -f 'src/c/loadClasspath.c' || echo '$(srcdir)/'`src/c/loadClasspath.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscijvm_la-loadClasspath.Tpo $(DEPDIR)/libscijvm_la-loadClasspath.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/loadClasspath.c' object='libscijvm_la-loadClasspath.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-loadClasspath.lo `test -f 'src/c/loadClasspath.c' || echo '$(srcdir)/'`src/c/loadClasspath.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-loadClasspath.lo `test -f 'src/c/loadClasspath.c' || echo '$(srcdir)/'`src/c/loadClasspath.c
 
 libscijvm_la-createMainScilabObject.lo: src/c/createMainScilabObject.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-createMainScilabObject.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-createMainScilabObject.Tpo -c -o libscijvm_la-createMainScilabObject.lo `test -f 'src/c/createMainScilabObject.c' || echo '$(srcdir)/'`src/c/createMainScilabObject.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-createMainScilabObject.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-createMainScilabObject.Tpo -c -o libscijvm_la-createMainScilabObject.lo `test -f 'src/c/createMainScilabObject.c' || echo '$(srcdir)/'`src/c/createMainScilabObject.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscijvm_la-createMainScilabObject.Tpo $(DEPDIR)/libscijvm_la-createMainScilabObject.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/createMainScilabObject.c' object='libscijvm_la-createMainScilabObject.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-createMainScilabObject.lo `test -f 'src/c/createMainScilabObject.c' || echo '$(srcdir)/'`src/c/createMainScilabObject.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-createMainScilabObject.lo `test -f 'src/c/createMainScilabObject.c' || echo '$(srcdir)/'`src/c/createMainScilabObject.c
 
 libscijvm_la-JVM_commons.lo: src/c/JVM_commons.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-JVM_commons.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-JVM_commons.Tpo -c -o libscijvm_la-JVM_commons.lo `test -f 'src/c/JVM_commons.c' || echo '$(srcdir)/'`src/c/JVM_commons.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-JVM_commons.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-JVM_commons.Tpo -c -o libscijvm_la-JVM_commons.lo `test -f 'src/c/JVM_commons.c' || echo '$(srcdir)/'`src/c/JVM_commons.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscijvm_la-JVM_commons.Tpo $(DEPDIR)/libscijvm_la-JVM_commons.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/JVM_commons.c' object='libscijvm_la-JVM_commons.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-JVM_commons.lo `test -f 'src/c/JVM_commons.c' || echo '$(srcdir)/'`src/c/JVM_commons.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-JVM_commons.lo `test -f 'src/c/JVM_commons.c' || echo '$(srcdir)/'`src/c/JVM_commons.c
 
 libscijvm_la-catchIfJavaException.lo: src/c/catchIfJavaException.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-catchIfJavaException.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-catchIfJavaException.Tpo -c -o libscijvm_la-catchIfJavaException.lo `test -f 'src/c/catchIfJavaException.c' || echo '$(srcdir)/'`src/c/catchIfJavaException.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-catchIfJavaException.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-catchIfJavaException.Tpo -c -o libscijvm_la-catchIfJavaException.lo `test -f 'src/c/catchIfJavaException.c' || echo '$(srcdir)/'`src/c/catchIfJavaException.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscijvm_la-catchIfJavaException.Tpo $(DEPDIR)/libscijvm_la-catchIfJavaException.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/catchIfJavaException.c' object='libscijvm_la-catchIfJavaException.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-catchIfJavaException.lo `test -f 'src/c/catchIfJavaException.c' || echo '$(srcdir)/'`src/c/catchIfJavaException.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-catchIfJavaException.lo `test -f 'src/c/catchIfJavaException.c' || echo '$(srcdir)/'`src/c/catchIfJavaException.c
 
 libscijvm_la-loadLibrarypath.lo: src/c/loadLibrarypath.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-loadLibrarypath.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-loadLibrarypath.Tpo -c -o libscijvm_la-loadLibrarypath.lo `test -f 'src/c/loadLibrarypath.c' || echo '$(srcdir)/'`src/c/loadLibrarypath.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-loadLibrarypath.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-loadLibrarypath.Tpo -c -o libscijvm_la-loadLibrarypath.lo `test -f 'src/c/loadLibrarypath.c' || echo '$(srcdir)/'`src/c/loadLibrarypath.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscijvm_la-loadLibrarypath.Tpo $(DEPDIR)/libscijvm_la-loadLibrarypath.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/loadLibrarypath.c' object='libscijvm_la-loadLibrarypath.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-loadLibrarypath.lo `test -f 'src/c/loadLibrarypath.c' || echo '$(srcdir)/'`src/c/loadLibrarypath.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-loadLibrarypath.lo `test -f 'src/c/loadLibrarypath.c' || echo '$(srcdir)/'`src/c/loadLibrarypath.c
 
 libscijvm_la-getLibrarypath.lo: src/c/getLibrarypath.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-getLibrarypath.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-getLibrarypath.Tpo -c -o libscijvm_la-getLibrarypath.lo `test -f 'src/c/getLibrarypath.c' || echo '$(srcdir)/'`src/c/getLibrarypath.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-getLibrarypath.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-getLibrarypath.Tpo -c -o libscijvm_la-getLibrarypath.lo `test -f 'src/c/getLibrarypath.c' || echo '$(srcdir)/'`src/c/getLibrarypath.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscijvm_la-getLibrarypath.Tpo $(DEPDIR)/libscijvm_la-getLibrarypath.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/getLibrarypath.c' object='libscijvm_la-getLibrarypath.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-getLibrarypath.lo `test -f 'src/c/getLibrarypath.c' || echo '$(srcdir)/'`src/c/getLibrarypath.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-getLibrarypath.lo `test -f 'src/c/getLibrarypath.c' || echo '$(srcdir)/'`src/c/getLibrarypath.c
 
 libscijvm_la-addToLibrarypath.lo: src/c/addToLibrarypath.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-addToLibrarypath.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-addToLibrarypath.Tpo -c -o libscijvm_la-addToLibrarypath.lo `test -f 'src/c/addToLibrarypath.c' || echo '$(srcdir)/'`src/c/addToLibrarypath.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-addToLibrarypath.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-addToLibrarypath.Tpo -c -o libscijvm_la-addToLibrarypath.lo `test -f 'src/c/addToLibrarypath.c' || echo '$(srcdir)/'`src/c/addToLibrarypath.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscijvm_la-addToLibrarypath.Tpo $(DEPDIR)/libscijvm_la-addToLibrarypath.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/addToLibrarypath.c' object='libscijvm_la-addToLibrarypath.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-addToLibrarypath.lo `test -f 'src/c/addToLibrarypath.c' || echo '$(srcdir)/'`src/c/addToLibrarypath.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-addToLibrarypath.lo `test -f 'src/c/addToLibrarypath.c' || echo '$(srcdir)/'`src/c/addToLibrarypath.c
 
 libscijvm_la-getJvmOptions.lo: src/c/getJvmOptions.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-getJvmOptions.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-getJvmOptions.Tpo -c -o libscijvm_la-getJvmOptions.lo `test -f 'src/c/getJvmOptions.c' || echo '$(srcdir)/'`src/c/getJvmOptions.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-getJvmOptions.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-getJvmOptions.Tpo -c -o libscijvm_la-getJvmOptions.lo `test -f 'src/c/getJvmOptions.c' || echo '$(srcdir)/'`src/c/getJvmOptions.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscijvm_la-getJvmOptions.Tpo $(DEPDIR)/libscijvm_la-getJvmOptions.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/getJvmOptions.c' object='libscijvm_la-getJvmOptions.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-getJvmOptions.lo `test -f 'src/c/getJvmOptions.c' || echo '$(srcdir)/'`src/c/getJvmOptions.c
-
-libscijvm_la-sci_system_getproperty.lo: sci_gateway/c/sci_system_getproperty.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-sci_system_getproperty.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-sci_system_getproperty.Tpo -c -o libscijvm_la-sci_system_getproperty.lo `test -f 'sci_gateway/c/sci_system_getproperty.c' || echo '$(srcdir)/'`sci_gateway/c/sci_system_getproperty.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscijvm_la-sci_system_getproperty.Tpo $(DEPDIR)/libscijvm_la-sci_system_getproperty.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_system_getproperty.c' object='libscijvm_la-sci_system_getproperty.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-sci_system_getproperty.lo `test -f 'sci_gateway/c/sci_system_getproperty.c' || echo '$(srcdir)/'`sci_gateway/c/sci_system_getproperty.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-getJvmOptions.lo `test -f 'src/c/getJvmOptions.c' || echo '$(srcdir)/'`src/c/getJvmOptions.c
 
 libscijvm_la-sci_system_setproperty.lo: sci_gateway/c/sci_system_setproperty.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-sci_system_setproperty.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-sci_system_setproperty.Tpo -c -o libscijvm_la-sci_system_setproperty.lo `test -f 'sci_gateway/c/sci_system_setproperty.c' || echo '$(srcdir)/'`sci_gateway/c/sci_system_setproperty.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-sci_system_setproperty.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-sci_system_setproperty.Tpo -c -o libscijvm_la-sci_system_setproperty.lo `test -f 'sci_gateway/c/sci_system_setproperty.c' || echo '$(srcdir)/'`sci_gateway/c/sci_system_setproperty.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscijvm_la-sci_system_setproperty.Tpo $(DEPDIR)/libscijvm_la-sci_system_setproperty.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_system_setproperty.c' object='libscijvm_la-sci_system_setproperty.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-sci_system_setproperty.lo `test -f 'sci_gateway/c/sci_system_setproperty.c' || echo '$(srcdir)/'`sci_gateway/c/sci_system_setproperty.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-sci_system_setproperty.lo `test -f 'sci_gateway/c/sci_system_setproperty.c' || echo '$(srcdir)/'`sci_gateway/c/sci_system_setproperty.c
 
 libscijvm_la-sci_with_embedded_jre.lo: sci_gateway/c/sci_with_embedded_jre.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-sci_with_embedded_jre.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-sci_with_embedded_jre.Tpo -c -o libscijvm_la-sci_with_embedded_jre.lo `test -f 'sci_gateway/c/sci_with_embedded_jre.c' || echo '$(srcdir)/'`sci_gateway/c/sci_with_embedded_jre.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-sci_with_embedded_jre.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-sci_with_embedded_jre.Tpo -c -o libscijvm_la-sci_with_embedded_jre.lo `test -f 'sci_gateway/c/sci_with_embedded_jre.c' || echo '$(srcdir)/'`sci_gateway/c/sci_with_embedded_jre.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscijvm_la-sci_with_embedded_jre.Tpo $(DEPDIR)/libscijvm_la-sci_with_embedded_jre.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_with_embedded_jre.c' object='libscijvm_la-sci_with_embedded_jre.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-sci_with_embedded_jre.lo `test -f 'sci_gateway/c/sci_with_embedded_jre.c' || echo '$(srcdir)/'`sci_gateway/c/sci_with_embedded_jre.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-sci_with_embedded_jre.lo `test -f 'sci_gateway/c/sci_with_embedded_jre.c' || echo '$(srcdir)/'`sci_gateway/c/sci_with_embedded_jre.c
 
 libscijvm_la-sci_javaclasspath.lo: sci_gateway/c/sci_javaclasspath.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-sci_javaclasspath.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-sci_javaclasspath.Tpo -c -o libscijvm_la-sci_javaclasspath.lo `test -f 'sci_gateway/c/sci_javaclasspath.c' || echo '$(srcdir)/'`sci_gateway/c/sci_javaclasspath.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-sci_javaclasspath.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-sci_javaclasspath.Tpo -c -o libscijvm_la-sci_javaclasspath.lo `test -f 'sci_gateway/c/sci_javaclasspath.c' || echo '$(srcdir)/'`sci_gateway/c/sci_javaclasspath.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscijvm_la-sci_javaclasspath.Tpo $(DEPDIR)/libscijvm_la-sci_javaclasspath.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_javaclasspath.c' object='libscijvm_la-sci_javaclasspath.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-sci_javaclasspath.lo `test -f 'sci_gateway/c/sci_javaclasspath.c' || echo '$(srcdir)/'`sci_gateway/c/sci_javaclasspath.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-sci_javaclasspath.lo `test -f 'sci_gateway/c/sci_javaclasspath.c' || echo '$(srcdir)/'`sci_gateway/c/sci_javaclasspath.c
 
 libscijvm_la-gw_jvm.lo: sci_gateway/c/gw_jvm.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-gw_jvm.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-gw_jvm.Tpo -c -o libscijvm_la-gw_jvm.lo `test -f 'sci_gateway/c/gw_jvm.c' || echo '$(srcdir)/'`sci_gateway/c/gw_jvm.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-gw_jvm.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-gw_jvm.Tpo -c -o libscijvm_la-gw_jvm.lo `test -f 'sci_gateway/c/gw_jvm.c' || echo '$(srcdir)/'`sci_gateway/c/gw_jvm.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscijvm_la-gw_jvm.Tpo $(DEPDIR)/libscijvm_la-gw_jvm.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/gw_jvm.c' object='libscijvm_la-gw_jvm.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-gw_jvm.lo `test -f 'sci_gateway/c/gw_jvm.c' || echo '$(srcdir)/'`sci_gateway/c/gw_jvm.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-gw_jvm.lo `test -f 'sci_gateway/c/gw_jvm.c' || echo '$(srcdir)/'`sci_gateway/c/gw_jvm.c
 
 libscijvm_la-sci_javalibrarypath.lo: sci_gateway/c/sci_javalibrarypath.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-sci_javalibrarypath.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-sci_javalibrarypath.Tpo -c -o libscijvm_la-sci_javalibrarypath.lo `test -f 'sci_gateway/c/sci_javalibrarypath.c' || echo '$(srcdir)/'`sci_gateway/c/sci_javalibrarypath.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -MT libscijvm_la-sci_javalibrarypath.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-sci_javalibrarypath.Tpo -c -o libscijvm_la-sci_javalibrarypath.lo `test -f 'sci_gateway/c/sci_javalibrarypath.c' || echo '$(srcdir)/'`sci_gateway/c/sci_javalibrarypath.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscijvm_la-sci_javalibrarypath.Tpo $(DEPDIR)/libscijvm_la-sci_javalibrarypath.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_javalibrarypath.c' object='libscijvm_la-sci_javalibrarypath.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-sci_javalibrarypath.lo `test -f 'sci_gateway/c/sci_javalibrarypath.c' || echo '$(srcdir)/'`sci_gateway/c/sci_javalibrarypath.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(libscijvm_la_CFLAGS) $(CFLAGS) -c -o libscijvm_la-sci_javalibrarypath.lo `test -f 'sci_gateway/c/sci_javalibrarypath.c' || echo '$(srcdir)/'`sci_gateway/c/sci_javalibrarypath.c
+
+.cpp.o:
+@am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@  $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+libscijvm_disable_la-nojvm_gw.lo: src/nojvm/nojvm_gw.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscijvm_disable_la-nojvm_gw.lo -MD -MP -MF $(DEPDIR)/libscijvm_disable_la-nojvm_gw.Tpo -c -o libscijvm_disable_la-nojvm_gw.lo `test -f 'src/nojvm/nojvm_gw.cpp' || echo '$(srcdir)/'`src/nojvm/nojvm_gw.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscijvm_disable_la-nojvm_gw.Tpo $(DEPDIR)/libscijvm_disable_la-nojvm_gw.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/nojvm/nojvm_gw.cpp' object='libscijvm_disable_la-nojvm_gw.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscijvm_disable_la-nojvm_gw.lo `test -f 'src/nojvm/nojvm_gw.cpp' || echo '$(srcdir)/'`src/nojvm/nojvm_gw.cpp
+
+libscijvm_la-sci_system_getproperty.lo: sci_gateway/cpp/sci_system_getproperty.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscijvm_la-sci_system_getproperty.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-sci_system_getproperty.Tpo -c -o libscijvm_la-sci_system_getproperty.lo `test -f 'sci_gateway/cpp/sci_system_getproperty.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_system_getproperty.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscijvm_la-sci_system_getproperty.Tpo $(DEPDIR)/libscijvm_la-sci_system_getproperty.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_system_getproperty.cpp' object='libscijvm_la-sci_system_getproperty.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscijvm_la-sci_system_getproperty.lo `test -f 'sci_gateway/cpp/sci_system_getproperty.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_system_getproperty.cpp
+
+libscijvm_la-jvm_gw.lo: sci_gateway/cpp/jvm_gw.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscijvm_la-jvm_gw.lo -MD -MP -MF $(DEPDIR)/libscijvm_la-jvm_gw.Tpo -c -o libscijvm_la-jvm_gw.lo `test -f 'sci_gateway/cpp/jvm_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/jvm_gw.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscijvm_la-jvm_gw.Tpo $(DEPDIR)/libscijvm_la-jvm_gw.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/jvm_gw.cpp' object='libscijvm_la-jvm_gw.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscijvm_la-jvm_gw.lo `test -f 'sci_gateway/cpp/jvm_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/jvm_gw.cpp
 
 mostlyclean-libtool:
        -rm -f *.lo
diff --git a/scilab/modules/jvm/includes/dynlib_jvm_gw.h b/scilab/modules/jvm/includes/dynlib_jvm_gw.h
new file mode 100644 (file)
index 0000000..ab732bd
--- /dev/null
@@ -0,0 +1,28 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) DIGITEO - 2010 - Antoine ELIAS
+* 
+* This file must be used under the terms of the CeCILL.
+* This source file is licensed as described in the file COPYING, which
+* you should have received as part of this distribution.  The terms
+* are also available at    
+* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+*
+*/
+
+/*--------------------------------------------------------------------------*/ 
+#ifndef __DYNLIB_JVM_GW_H__
+#define __DYNLIB_JVM_GW_H__
+
+#ifdef _MSC_VER
+       #ifdef LIBJVM_GW_EXPORTS
+               #define JVM_GW_IMPEXP __declspec(dllexport)
+       #else
+               #define JVM_GW_IMPEXP __declspec(dllimport)
+       #endif
+#else
+       #define JVM_GW_IMPEXP 
+#endif
+
+#endif /* __DYNLIB_JVM_GW_H__ */
+/*--------------------------------------------------------------------------*/ 
index 39711dc..9a3e86f 100644 (file)
@@ -16,7 +16,6 @@
 #define __GW_JVM_H__
 /*--------------------------------------------------------------------------*/
 #include "dynlib_jvm.h"
-#include "api_scilab.h"
 /*--------------------------------------------------------------------------*/
 JVM_IMPEXP int gw_jvm(void);
 /*--------------------------------------------------------------------------*/
@@ -24,7 +23,6 @@ JVM_IMPEXP int gw_jvm(void);
 /* used in sci_gateway */
 JVM_IMPEXP int sci_with_embedded_jre(char *fname,unsigned long fname_len);
 JVM_IMPEXP int sci_system_setproperty(char *fname,unsigned long fname_len);
-JVM_IMPEXP int sci_system_getproperty(char *fname,unsigned long fname_len);
 JVM_IMPEXP int sci_javaclasspath(char *fname,unsigned long fname_len);
 JVM_IMPEXP int sci_javalibrarypath(char *fname,unsigned long fname_len);
 /*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/jvm/includes/jvm_gw.hxx b/scilab/modules/jvm/includes/jvm_gw.hxx
new file mode 100644 (file)
index 0000000..5a6822e
--- /dev/null
@@ -0,0 +1,36 @@
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2010 - DIGITEO - Antoine ELIAS
+ *
+ *  This file must be used under the terms of the CeCILL.
+ *  This source file is licensed as described in the file COPYING, which
+ *  you should have received as part of this distribution.  The terms
+ *  are also available at
+ *  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#ifndef __JVM_GW_HXX__
+#define __JVM_GW_HXX__
+
+
+#include "funcmanager.hxx"
+#include "context.hxx"
+
+extern "C"
+{
+#include "dynlib_jvm_gw.h"
+}
+
+class JvmModule
+{
+private :
+  JvmModule() {};
+  ~JvmModule() {};
+
+public :
+  JVM_GW_IMPEXP static bool Load();
+};
+CPP_GATEWAY_PROTOTYPE(sci_system_getproperty);
+
+#endif /* !__JVM_GW_HXX__ */
 #ifndef __SYSTEM_GETPROPERTY_H__
 #define __SYSTEM_GETPROPERTY_H__
 
+#include "dynlib_jvm.h"
 /**
 * get system property
 * @param property name
 * @return property value
 */
-char * system_getproperty(char *property,char *defaultproperty);
+JVM_IMPEXP char * system_getproperty(char *property,char *defaultproperty);
 
 #endif /* __SYSTEM_GETPROPERTY_H__ */
 /*--------------------------------------------------------------------------*/ 
index 6e69f65..1a4593b 100644 (file)
@@ -35,7 +35,9 @@
                        <Tool
                                Name="VCXMLDataGeneratorTool"
                        />
-
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
                        <Tool
                                Name="VCMIDLTool"
                        />
@@ -50,7 +52,6 @@
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
-                               
                                DebugInformationFormat="3"
                                CompileAs="1"
                        />
                        <Tool
                                Name="VCXMLDataGeneratorTool"
                        />
-
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
                        <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
-                               
                                DebugInformationFormat="3"
                                CompileAs="1"
                        />
                        <Tool
                                Name="VCXMLDataGeneratorTool"
                        />
-
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
                        <Tool
                                Name="VCMIDLTool"
                        />
                                EnableEnhancedInstructionSet="0"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
-                               
                                DebugInformationFormat="0"
                        />
                        <Tool
                        <Tool
                                Name="VCXMLDataGeneratorTool"
                        />
-
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
                        <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                                EnableEnhancedInstructionSet="0"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
-                               
                                DebugInformationFormat="0"
                        />
                        <Tool
                                >
                        </File>
                        <File
-                               RelativePath=".\sci_gateway\c\sci_system_getproperty.c"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\sci_gateway\c\sci_system_setproperty.c"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\system_getproperty.h"
+                               RelativePath=".\includes\system_getproperty.h"
                                >
                        </File>
                        <File
index 875963b..46fdb40 100644 (file)
@@ -23,7 +23,7 @@ static gw_generic_table  Tab[]=
 {
        {sci_with_embedded_jre,"with_embedded_jre"},
        {sci_system_setproperty,"system_setproperty"},
-       {sci_system_getproperty,"system_getproperty"},
+       {NULL, ""}, //system_getproperty
        {sci_javaclasspath,"javaclasspath"},
        {sci_javalibrarypath,"javalibrarypath"}
 };
diff --git a/scilab/modules/jvm/sci_gateway/c/sci_system_getproperty.c b/scilab/modules/jvm/sci_gateway/c/sci_system_getproperty.c
deleted file mode 100644 (file)
index 199f427..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - Allan CORNET
- * 
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at    
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-
-/*--------------------------------------------------------------------------*/
-#include <string.h>
-#include "gw_jvm.h"
-#include "MALLOC.h"
-#include "stack-c.h"
-#include "system_getproperty.h"
-#include "Scierror.h"
-#include "localization.h"
-/*--------------------------------------------------------------------------*/
-int sci_system_getproperty(char *fname,unsigned long fname_len)
-{
-       Rhs = Max(Rhs,0);
-       CheckRhs(1,1);
-       CheckLhs(0,1);
-
-       if ( GetType(1) == sci_strings )
-       {
-               static int m1,n1=0,l1=0;
-               char *propertyName = NULL;
-               char *propertyValue = NULL;
-
-               GetRhsVar(1,STRING_DATATYPE,&m1,&n1,&l1);
-               propertyName=cstk(l1);
-               propertyValue=system_getproperty(propertyName,"unknown");
-
-               n1=1;
-               CreateVarFromPtr(Rhs+1,STRING_DATATYPE,(m1=(int)strlen(propertyValue), &m1),&n1,&propertyValue);
-               LhsVar(1)=Rhs+1;
-               C2F(putlhsvar)();
-               if (propertyValue) {FREE(propertyValue);propertyValue=NULL;}
-       }
-       else
-       {
-               Scierror(999,_("%s: Wrong type for input argument #%d: String expected.\n"),fname, 1);
-               return 0;
-       }
-       return 0;
-}
-
-/*--------------------------------------------------------------------------*/
-
diff --git a/scilab/modules/jvm/sci_gateway/cpp/jvm_gw.cpp b/scilab/modules/jvm/sci_gateway/cpp/jvm_gw.cpp
new file mode 100644 (file)
index 0000000..c512e05
--- /dev/null
@@ -0,0 +1,28 @@
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2010 - DIGITEO - Antoine ELIAS
+ * 
+ *  This file must be used under the terms of the CeCILL.
+ *  This source file is licensed as described in the file COPYING, which
+ *  you should have received as part of this distribution.  The terms
+ *  are also available at
+ *  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ * 
+ */
+
+#include "jvm_gw.hxx"
+
+#pragma comment(lib,"../../../../bin/libintl.lib")
+
+extern "C"
+{
+    #include "gw_jvm.h"
+}
+
+#define MODULE_NAME L"jvm"
+
+bool JvmModule::Load()
+{
+    symbol::Context::getInstance()->AddFunction(Function::createFunction(L"system_getproperty", &sci_system_getproperty, MODULE_NAME));
+    return true;
+}
diff --git a/scilab/modules/jvm/sci_gateway/cpp/libjvm_gw.vcproj b/scilab/modules/jvm/sci_gateway/cpp/libjvm_gw.vcproj
new file mode 100644 (file)
index 0000000..f635468
--- /dev/null
@@ -0,0 +1,371 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="9,00"
+       Name="libjvm_gw"
+       ProjectGUID="{2D02DD0E-CBF5-493E-AA06-1E289ED24666}"
+       RootNamespace="libjvm_gw"
+       Keyword="Win32Proj"
+       TargetFrameworkVersion="196613"
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+               <Platform
+                       Name="x64"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="1"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               AdditionalIncludeDirectories="..\..\includes;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\abstractSyntaxTree\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../string/includes;../../../output_stream/includes"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBJVM_GW_EXPORTS"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="4"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               OutputFile="&quot;$(SolutionDir)bin\$(ProjectName).dll&quot;"
+                               LinkIncremental="2"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               TargetMachine="1"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="1"
+                       WholeProgramOptimization="1"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="2"
+                               EnableIntrinsicFunctions="true"
+                               AdditionalIncludeDirectories="..\..\includes;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\abstractSyntaxTree\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../string/includes;../../../output_stream/includes"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBJVM_GW_EXPORTS"
+                               RuntimeLibrary="2"
+                               EnableFunctionLevelLinking="true"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               OutputFile="&quot;$(SolutionDir)bin\$(ProjectName).dll&quot;"
+                               LinkIncremental="1"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               TargetMachine="1"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug|x64"
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="1"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               AdditionalIncludeDirectories="..\..\includes;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\abstractSyntaxTree\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../string/includes;../../../output_stream/includes"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBJVM_GW_EXPORTS"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               OutputFile="&quot;$(SolutionDir)bin\$(ProjectName).dll&quot;"
+                               LinkIncremental="2"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               TargetMachine="17"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|x64"
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="1"
+                       WholeProgramOptimization="1"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="2"
+                               EnableIntrinsicFunctions="true"
+                               AdditionalIncludeDirectories="..\..\includes;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\abstractSyntaxTree\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../string/includes;../../../output_stream/includes"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBJVM_GW_EXPORTS"
+                               RuntimeLibrary="2"
+                               EnableFunctionLevelLinking="true"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               OutputFile="&quot;$(SolutionDir)bin\$(ProjectName).dll&quot;"
+                               LinkIncremental="1"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               TargetMachine="17"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <Filter
+                       Name="Source Files"
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+                       >
+                       <File
+                               RelativePath=".\jvm_gw.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\sci_system_getproperty.cpp"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Header Files"
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+                       >
+                       <File
+                               RelativePath="..\..\includes\dynlib_jvm_gw.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\includes\jvm_gw.hxx"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Resource Files"
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+                       >
+               </Filter>
+               <File
+                       RelativePath="..\..\..\..\bin\blasplus.lib"
+                       >
+               </File>
+               <File
+                       RelativePath="..\..\..\..\bin\lapack.lib"
+                       >
+               </File>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>
diff --git a/scilab/modules/jvm/sci_gateway/cpp/sci_system_getproperty.cpp b/scilab/modules/jvm/sci_gateway/cpp/sci_system_getproperty.cpp
new file mode 100644 (file)
index 0000000..fbbaf39
--- /dev/null
@@ -0,0 +1,81 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA - Allan CORNET
+ * Copyright (C) 2010 - DIGITEO - Antoine ELIAS
+ * 
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at    
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+/*--------------------------------------------------------------------------*/
+#include "funcmanager.hxx"
+#include "jvm_gw.hxx"
+
+extern "C"
+{
+#include <string.h>
+#include "system_getproperty.h"
+#include "Scierror.h"
+#include "localization.h"
+#include "sci_mode.h"
+}
+/*--------------------------------------------------------------------------*/
+Function::ReturnValue sci_system_getproperty(typed_list &in, int _piRetCount, typed_list &out)
+{
+    if(in.size() != 1)
+    {
+        ScierrorW(999, _W("%ls: Wrong number of input arguments: at least %d expected.\n"), L"system_getproperty", 1);
+        return Function::Error;
+    }
+
+    if(in[0]->isString() == false || in[0]->getAsString()->size_get() != 1)
+    {
+        ScierrorW(999, _W("%ls: Wrong type for input argument #%d: A string expected.\n"), L"system_getproperty" ,1);
+        return Function::Error;
+    }
+
+    if (getScilabMode() == SCILAB_NWNI)
+    {
+               ScierrorW(999, _W("JVM interface disabled in -nogui or -nwni modes.\n"));
+        return Function::Error;
+    }
+
+    char* pstProperty   = wide_string_to_UTF8(in[0]->getAsString()->string_get(0));
+    char* pstValue      = system_getproperty(pstProperty, "unknown");
+    String* pS          = new String(pstValue);
+    out.push_back(pS);
+
+    return Function::OK;
+       //Rhs = Max(Rhs,0);
+       //CheckRhs(1,1);
+       //CheckLhs(0,1);
+
+       //if ( GetType(1) == sci_strings )
+       //{
+       //      static int m1,n1=0,l1=0;
+       //      char *propertyName = NULL;
+       //      char *propertyValue = NULL;
+
+       //      GetRhsVar(1,STRING_DATATYPE,&m1,&n1,&l1);
+       //      propertyName=cstk(l1);
+       //      propertyValue=system_getproperty(propertyName,"unknown");
+
+       //      n1=1;
+       //      CreateVarFromPtr(Rhs+1,STRING_DATATYPE,(m1=(int)strlen(propertyValue), &m1),&n1,&propertyValue);
+       //      LhsVar(1)=Rhs+1;
+       //      C2F(putlhsvar)();
+       //      if (propertyValue) {FREE(propertyValue);propertyValue=NULL;}
+       //}
+       //else
+       //{
+       //      Scierror(999,_("%s: Wrong type for input argument #%d: String expected.\n"),fname, 1);
+       //      return 0;
+       //}
+       //return 0;
+}
+
+/*--------------------------------------------------------------------------*/
+
diff --git a/scilab/modules/jvm/src/nojvm/nojvm_gw.cpp b/scilab/modules/jvm/src/nojvm/nojvm_gw.cpp
new file mode 100644 (file)
index 0000000..c58eedf
--- /dev/null
@@ -0,0 +1,20 @@
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2010-2010 - DIGITEO - Vincent COUVERT
+ *
+ *  This file must be used under the terms of the CeCILL.
+ *  This source file is licensed as described in the file COPYING, which
+ *  you should have received as part of this distribution.  The terms
+ *  are also available at
+ *  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+
+#include "jvm_gw.hxx"
+
+
+bool JvmModule::Load()
+{
+    /* Do Nothing */
+    return true;
+}