Changeset 9780 for trunk/mgpp/jni

Timestamp:

2005-04-28T16:52:36+12:00 (19 years ago)

Author:

kjdon

Message:

added in the jni stuff for mgpp_passes. appears to be compiling and installing fine, but not working properly

File:

• trunk/mgpp/jni/win32.mak (modified) (3 diffs)

trunk/mgpp/jni/win32.mak

@@ -26 +26 @@
  
 MGPPHOME = ..
-
+GSDL3HOME = ..\..\..
 AR = lib
 CC = cl
 CPPFLAGS = -GX
 
-DEFS = -DQUIET -DSHORT_SUFFIX -DHAVE_STRING_H -D__WIN32__
+DEFS = -DQUIET -DHAVE_CONFIG_H -DSHORT_SUFFIX -DHAVE_STRING_H -D__WIN32__
 INCLUDES = -I"$(MGPPHOME)" -I"$(MGPPHOME)\lib" -I"$(MGPPHOME)\text" \
            -I"C:\j2sdk1~1.1_0\include" -I"C:\j2sdk1~1.1_0\include\win32"           
 
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS)
+COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES) 
  
 .SUFFIXES:
@@ -46 +46 @@
  
 HEADERS = \
-    MGPPWrapperImpl.h   org_greenstone_mgpp_MGPPWrapper.h
+    MGPPWrapperImpl.h   org_greenstone_mgpp_MGPPWrapper.h org_greenstone_mgpp_MGMGPPPassesWrapperImpl.h
 
 SOURCES = \
-    MGPPWrapperImpl.cpp
+    MGPPWrapperImpl.cpp MGPPPassesWrapperImpl.cpp
 
 OBJECTS = \
-    MGPPWrapperImpl$o   $(MGPPHOME)\text\libtextin.lib \
+    MGPPWrapperImpl$o  $(MGPPHOME)\text\libtextin.lib \
     $(MGPPHOME)\lib\libmgpp.lib
- 
+PASSES_OBJECTS = \
+    MGPPPassesWrapperImpl$o $(MGPPHOME)\text\libmgpppass.lib \
+    $(MGPPHOME)\lib\libmgpp.lib
+
 DISTFILES = Makefile.in $(HEADERS) $(SOURCES)
  
@@ -60 +63 @@
 
 compile:
-        $(COMPILE) MGPPWrapperImpl.cpp
+        $(COMPILE) MGPPWrapperImpl.cpp MGPPPassesWrapperImpl.cpp
 
 link:
         $(CC) -MD -LD $(OBJECTS) -Femgppjni.dll
+        $(CC) -MD -LD $(PASSES_OBJECTS) -Femgpppassjni.dll
 
 install: 
-
+    copy mgppjni.dll $(GSDL3HOME)\lib
+    copy mgpppassjni.dll $(GSDL3HOME)\lib
 clean:
-    del *$o 
+    del *$o mgppjni.dll mgppjni.exp mgppjni.lib mgpppassjni.dll mgpppassjni.exp mgpppassjni.lib