diff options
34 files changed, 59 insertions, 40 deletions
diff --git a/C2J/gl-enum-auto.java b/C2J/gl-enum-auto.java index 97860ad..b5007bb 100644 --- a/C2J/gl-enum-auto.java +++ b/C2J/gl-enum-auto.java @@ -1,7 +1,7 @@ /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: gl-enum-auto.orig . . . + * Reading from file: gl-enum-auto.orig.h . . . * Destination-Class: gl4java_GLEnum ! */ diff --git a/C2J/gl-funcnames.skel b/C2J/gl-funcnames.skel index e2298a4..22415de 100644 --- a/C2J/gl-funcnames.skel +++ b/C2J/gl-funcnames.skel @@ -1,7 +1,7 @@ /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: gl-proto-auto.orig . . . + * Reading from file: gl-proto-auto.orig.h . . . * Destination-Class: gl4java_GLFuncJauJNI ! */ diff --git a/C2J/gl-proto-auto.java b/C2J/gl-proto-auto.java index 386ea7a..c910ac8 100644 --- a/C2J/gl-proto-auto.java +++ b/C2J/gl-proto-auto.java @@ -1,7 +1,7 @@ /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: gl-proto-auto.orig . . . + * Reading from file: gl-proto-auto.orig.h . . . * Destination-Class: gl4java_GLFuncJauJNI ! */ diff --git a/C2J/gl-proto-dynauto-jni12.c b/C2J/gl-proto-dynauto-jni12.c index 2861745..ae738d5 100644 --- a/C2J/gl-proto-dynauto-jni12.c +++ b/C2J/gl-proto-dynauto-jni12.c @@ -1,7 +1,7 @@ /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: gl-proto-auto.orig . . . + * Reading from file: gl-proto-auto.orig.h . . . * Destination-Class: gl4java_GLFuncJauJNI ! */ diff --git a/C2J/gl-proto-dynauto-tst-jni12.c b/C2J/gl-proto-dynauto-tst-jni12.c index cc3e88b..f55d893 100644 --- a/C2J/gl-proto-dynauto-tst-jni12.c +++ b/C2J/gl-proto-dynauto-tst-jni12.c @@ -1,7 +1,7 @@ /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: gl-proto-auto.orig . . . + * Reading from file: gl-proto-auto.orig.h . . . * Destination-Class: gl4java_GLFuncJauJNI ! */ diff --git a/C2J/gl-proto-dynauto-tst.c b/C2J/gl-proto-dynauto-tst.c index 648c2d7..071b35e 100644 --- a/C2J/gl-proto-dynauto-tst.c +++ b/C2J/gl-proto-dynauto-tst.c @@ -1,7 +1,7 @@ /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: gl-proto-auto.orig . . . + * Reading from file: gl-proto-auto.orig.h . . . * Destination-Class: gl4java_GLFuncJauJNI ! */ diff --git a/C2J/gl-proto-dynauto.c b/C2J/gl-proto-dynauto.c index 242ea4e..5c61d43 100644 --- a/C2J/gl-proto-dynauto.c +++ b/C2J/gl-proto-dynauto.c @@ -1,7 +1,7 @@ /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: gl-proto-auto.orig . . . + * Reading from file: gl-proto-auto.orig.h . . . * Destination-Class: gl4java_GLFuncJauJNI ! */ diff --git a/C2J/gl-protoVirt-auto.java b/C2J/gl-protoVirt-auto.java index 9a8608a..43f33f9 100644 --- a/C2J/gl-protoVirt-auto.java +++ b/C2J/gl-protoVirt-auto.java @@ -1,7 +1,7 @@ /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: gl-proto-auto.orig . . . + * Reading from file: gl-proto-auto.orig.h . . . * Destination-Class: gl4java_GLFuncJauJNI ! */ diff --git a/C2J/glu-enum-auto.java b/C2J/glu-enum-auto.java index f4d11a2..3f46261 100644 --- a/C2J/glu-enum-auto.java +++ b/C2J/glu-enum-auto.java @@ -1,7 +1,7 @@ /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: glu-enum-auto.orig . . . + * Reading from file: glu-enum-auto.orig.h . . . * Destination-Class: gl4java_GLUEnum ! */ diff --git a/C2J/glu-proto-auto-jni12.c b/C2J/glu-proto-auto-jni12.c index a554136..da4dcd0 100644 --- a/C2J/glu-proto-auto-jni12.c +++ b/C2J/glu-proto-auto-jni12.c @@ -1,7 +1,7 @@ /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: glu-proto-auto.orig . . . + * Reading from file: glu-proto-auto.orig.h . . . * Destination-Class: gl4java_GLUFuncJauJNI ! */ diff --git a/C2J/glu-proto-auto-tst-jni12.c b/C2J/glu-proto-auto-tst-jni12.c index 6141f7d..c56efed 100644 --- a/C2J/glu-proto-auto-tst-jni12.c +++ b/C2J/glu-proto-auto-tst-jni12.c @@ -1,7 +1,7 @@ /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: glu-proto-auto.orig . . . + * Reading from file: glu-proto-auto.orig.h . . . * Destination-Class: gl4java_GLUFuncJauJNI ! */ diff --git a/C2J/glu-proto-auto-tst.c b/C2J/glu-proto-auto-tst.c index 79de449..3af5a20 100644 --- a/C2J/glu-proto-auto-tst.c +++ b/C2J/glu-proto-auto-tst.c @@ -1,7 +1,7 @@ /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: glu-proto-auto.orig . . . + * Reading from file: glu-proto-auto.orig.h . . . * Destination-Class: gl4java_GLUFuncJauJNI ! */ diff --git a/C2J/glu-proto-auto.c b/C2J/glu-proto-auto.c index b7ffe28..a17b337 100644 --- a/C2J/glu-proto-auto.c +++ b/C2J/glu-proto-auto.c @@ -1,7 +1,7 @@ /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: glu-proto-auto.orig . . . + * Reading from file: glu-proto-auto.orig.h . . . * Destination-Class: gl4java_GLUFuncJauJNI ! */ diff --git a/C2J/glu-proto-auto.java b/C2J/glu-proto-auto.java index 427639b..8366474 100644 --- a/C2J/glu-proto-auto.java +++ b/C2J/glu-proto-auto.java @@ -1,7 +1,7 @@ /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: glu-proto-auto.orig . . . + * Reading from file: glu-proto-auto.orig.h . . . * Destination-Class: gl4java_GLUFuncJauJNI ! */ diff --git a/C2J/glu-protoVirt-auto.java b/C2J/glu-protoVirt-auto.java index 4fcc4ca..49e8364 100644 --- a/C2J/glu-protoVirt-auto.java +++ b/C2J/glu-protoVirt-auto.java @@ -1,7 +1,7 @@ /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: glu-proto-auto.orig . . . + * Reading from file: glu-proto-auto.orig.h . . . * Destination-Class: gl4java_GLUFuncJauJNI ! */ diff --git a/CNativeCode/OpenGLU_JauJNI12_funcs.c b/CNativeCode/OpenGLU_JauJNI12_funcs.c index e7489ab..32fb88d 100644 --- a/CNativeCode/OpenGLU_JauJNI12_funcs.c +++ b/CNativeCode/OpenGLU_JauJNI12_funcs.c @@ -275,7 +275,7 @@ Java_gl4java_GLUFuncJauJNI_gluDeleteTess( JNIEnv *env, jobject obj, /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: glu-proto-auto.orig . . . + * Reading from file: glu-proto-auto.orig.h . . . * Destination-Class: gl4java_GLUFuncJauJNI ! */ diff --git a/CNativeCode/OpenGLU_JauJNI12tst_funcs.c b/CNativeCode/OpenGLU_JauJNI12tst_funcs.c index 82c6f5d..9b78767 100644 --- a/CNativeCode/OpenGLU_JauJNI12tst_funcs.c +++ b/CNativeCode/OpenGLU_JauJNI12tst_funcs.c @@ -275,7 +275,7 @@ Java_gl4java_GLUFuncJauJNI_gluDeleteTess( JNIEnv *env, jobject obj, /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: glu-proto-auto.orig . . . + * Reading from file: glu-proto-auto.orig.h . . . * Destination-Class: gl4java_GLUFuncJauJNI ! */ diff --git a/CNativeCode/OpenGLU_JauJNI_funcs.c b/CNativeCode/OpenGLU_JauJNI_funcs.c index 32abe13..55b3351 100644 --- a/CNativeCode/OpenGLU_JauJNI_funcs.c +++ b/CNativeCode/OpenGLU_JauJNI_funcs.c @@ -275,7 +275,7 @@ Java_gl4java_GLUFuncJauJNI_gluDeleteTess( JNIEnv *env, jobject obj, /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: glu-proto-auto.orig . . . + * Reading from file: glu-proto-auto.orig.h . . . * Destination-Class: gl4java_GLUFuncJauJNI ! */ diff --git a/CNativeCode/OpenGLU_JauJNInf_funcs.c b/CNativeCode/OpenGLU_JauJNInf_funcs.c index d37588d..25ac6eb 100644 --- a/CNativeCode/OpenGLU_JauJNInf_funcs.c +++ b/CNativeCode/OpenGLU_JauJNInf_funcs.c @@ -275,7 +275,7 @@ Java_gl4java_GLUFuncJauJNInf_gluDeleteTess( JNIEnv *env, jobject obj, /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: glu-proto-auto.orig . . . + * Reading from file: glu-proto-auto.orig.h . . . * Destination-Class: gl4java_GLUFuncJauJNInf ! */ diff --git a/CNativeCode/OpenGLU_JauJNItst_funcs.c b/CNativeCode/OpenGLU_JauJNItst_funcs.c index 82c6f5d..9b78767 100644 --- a/CNativeCode/OpenGLU_JauJNItst_funcs.c +++ b/CNativeCode/OpenGLU_JauJNItst_funcs.c @@ -275,7 +275,7 @@ Java_gl4java_GLUFuncJauJNI_gluDeleteTess( JNIEnv *env, jobject obj, /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: glu-proto-auto.orig . . . + * Reading from file: glu-proto-auto.orig.h . . . * Destination-Class: gl4java_GLUFuncJauJNI ! */ diff --git a/CNativeCode/OpenGL_JauJNI12_dynfuncs.c b/CNativeCode/OpenGL_JauJNI12_dynfuncs.c index e0e7d43..41fd742 100644 --- a/CNativeCode/OpenGL_JauJNI12_dynfuncs.c +++ b/CNativeCode/OpenGL_JauJNI12_dynfuncs.c @@ -85,7 +85,7 @@ Java_gl4java_GLFuncJauJNI_getNativeVersion ( JNIEnv *env, jobject obj ) /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: gl-proto-auto.orig . . . + * Reading from file: gl-proto-auto.orig.h . . . * Destination-Class: gl4java_GLFuncJauJNI ! */ diff --git a/CNativeCode/OpenGL_JauJNI12tst_dynfuncs.c b/CNativeCode/OpenGL_JauJNI12tst_dynfuncs.c index c47667c..129181f 100644 --- a/CNativeCode/OpenGL_JauJNI12tst_dynfuncs.c +++ b/CNativeCode/OpenGL_JauJNI12tst_dynfuncs.c @@ -85,7 +85,7 @@ Java_gl4java_GLFuncJauJNI_getNativeVersion ( JNIEnv *env, jobject obj ) /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: gl-proto-auto.orig . . . + * Reading from file: gl-proto-auto.orig.h . . . * Destination-Class: gl4java_GLFuncJauJNI ! */ diff --git a/CNativeCode/OpenGL_JauJNI_dynfuncs.c b/CNativeCode/OpenGL_JauJNI_dynfuncs.c index 534d61e..c3d42db 100644 --- a/CNativeCode/OpenGL_JauJNI_dynfuncs.c +++ b/CNativeCode/OpenGL_JauJNI_dynfuncs.c @@ -85,7 +85,7 @@ Java_gl4java_GLFuncJauJNI_getNativeVersion ( JNIEnv *env, jobject obj ) /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: gl-proto-auto.orig . . . + * Reading from file: gl-proto-auto.orig.h . . . * Destination-Class: gl4java_GLFuncJauJNI ! */ diff --git a/CNativeCode/OpenGL_JauJNInf_dynfuncs.c b/CNativeCode/OpenGL_JauJNInf_dynfuncs.c index 9bc6a0c..455d7df 100644 --- a/CNativeCode/OpenGL_JauJNInf_dynfuncs.c +++ b/CNativeCode/OpenGL_JauJNInf_dynfuncs.c @@ -85,7 +85,7 @@ Java_gl4java_GLFuncJauJNInf_getNativeVersion ( JNIEnv *env, jobject obj ) /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: gl-proto-auto.orig . . . + * Reading from file: gl-proto-auto.orig.h . . . * Destination-Class: gl4java_GLFuncJauJNInf ! */ diff --git a/CNativeCode/OpenGL_JauJNItst_dynfuncs.c b/CNativeCode/OpenGL_JauJNItst_dynfuncs.c index 1782e0c..dfd5950 100644 --- a/CNativeCode/OpenGL_JauJNItst_dynfuncs.c +++ b/CNativeCode/OpenGL_JauJNItst_dynfuncs.c @@ -85,7 +85,7 @@ Java_gl4java_GLFuncJauJNI_getNativeVersion ( JNIEnv *env, jobject obj ) /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: gl-proto-auto.orig . . . + * Reading from file: gl-proto-auto.orig.h . . . * Destination-Class: gl4java_GLFuncJauJNI ! */ diff --git a/gl4java/GLEnum.java b/gl4java/GLEnum.java index b331159..ee53d8b 100644 --- a/gl4java/GLEnum.java +++ b/gl4java/GLEnum.java @@ -27,7 +27,7 @@ public interface GLEnum /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: gl-enum-auto.orig . . . + * Reading from file: gl-enum-auto.orig.h . . . * Destination-Class: gl4java_GLEnum ! */ diff --git a/gl4java/GLFunc.java b/gl4java/GLFunc.java index e80d9da..3879569 100644 --- a/gl4java/GLFunc.java +++ b/gl4java/GLFunc.java @@ -33,7 +33,7 @@ public static final String[] GL_PROC_NAMES = { /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: gl-proto-auto.orig . . . + * Reading from file: gl-proto-auto.orig.h . . . * Destination-Class: gl4java_GLFuncJauJNI ! */ @@ -480,7 +480,7 @@ public static final String[] GL_PROC_NAMES = { /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: gl-proto-auto.orig . . . + * Reading from file: gl-proto-auto.orig.h . . . * Destination-Class: gl4java_GLFuncJauJNI ! */ diff --git a/gl4java/GLFuncJauJNI.java b/gl4java/GLFuncJauJNI.java index 0293576..7887860 100644 --- a/gl4java/GLFuncJauJNI.java +++ b/gl4java/GLFuncJauJNI.java @@ -39,7 +39,7 @@ public final String getClassVersion ( ) /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: gl-proto-auto.orig . . . + * Reading from file: gl-proto-auto.orig.h . . . * Destination-Class: gl4java_GLFuncJauJNI ! */ diff --git a/gl4java/GLFuncJauJNInf.java b/gl4java/GLFuncJauJNInf.java index 7ef0155..5187e83 100644 --- a/gl4java/GLFuncJauJNInf.java +++ b/gl4java/GLFuncJauJNInf.java @@ -39,7 +39,7 @@ public String getClassVersion ( ) /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: gl-proto-auto.orig . . . + * Reading from file: gl-proto-auto.orig.h . . . * Destination-Class: gl4java_GLFuncJauJNInf ! */ diff --git a/gl4java/GLUEnum.java b/gl4java/GLUEnum.java index accda94..41982b5 100644 --- a/gl4java/GLUEnum.java +++ b/gl4java/GLUEnum.java @@ -24,7 +24,7 @@ public interface GLUEnum /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: glu-enum-auto.orig . . . + * Reading from file: glu-enum-auto.orig.h . . . * Destination-Class: gl4java_GLUEnum ! */ diff --git a/gl4java/GLUFunc.java b/gl4java/GLUFunc.java index 0232eae..a36448d 100644 --- a/gl4java/GLUFunc.java +++ b/gl4java/GLUFunc.java @@ -67,7 +67,7 @@ public void gluDeleteTess( int tobj ); /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: glu-proto-auto.orig . . . + * Reading from file: glu-proto-auto.orig.h . . . * Destination-Class: gl4java_GLUFuncJauJNI ! */ diff --git a/gl4java/GLUFuncJauJNI.java b/gl4java/GLUFuncJauJNI.java index 12843f7..439a758 100644 --- a/gl4java/GLUFuncJauJNI.java +++ b/gl4java/GLUFuncJauJNI.java @@ -141,7 +141,7 @@ public final native void gluDeleteTess( int tobj ); /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: glu-proto-auto.orig . . . + * Reading from file: glu-proto-auto.orig.h . . . * Destination-Class: gl4java_GLUFuncJauJNI ! */ diff --git a/gl4java/GLUFuncJauJNInf.java b/gl4java/GLUFuncJauJNInf.java index 51cdbb9..b1ea21a 100644 --- a/gl4java/GLUFuncJauJNInf.java +++ b/gl4java/GLUFuncJauJNInf.java @@ -141,7 +141,7 @@ public native void gluDeleteTess( int tobj ); /** * C2J Parser Version 1.4 Beta * Jausoft - Sven Goethel Software Development - * Reading from file: glu-proto-auto.orig . . . + * Reading from file: glu-proto-auto.orig.h . . . * Destination-Class: gl4java_GLUFuncJauJNInf ! */ @@ -419,7 +419,7 @@ mac : cleanup gljni \ $(CNATIVEDIR)/winstuff.h -w32 : cleanup gljni \ +w32 : cleanupw32 gljni \ $(FILES_w32.class) \ $(FILES_msw32.class) \ $(FILES.class) \ @@ -626,9 +626,28 @@ $(CNATIVEDIR)/GLUCallbackJNI.o: $(CNATIVEDIR)/jnitools.h \ # ###################################################################### -cleanup: +cleanup: $(CHEADERDIR) archive binpkg rm -f errors +cleanupw32: cleanup Win32VC6/libs Win32VC6/temp + + +Win32VC6/libs: + mkdir -p Win32VC6/libs + +Win32VC6/temp: + mkdir -p Win32VC6/temp + +archive: + mkdir archive + +binpkg: + mkdir binpkg + + +$(CHEADERDIR): + mkdir $(CHEADERDIR) + # clean out the *.o files and machine generated files from javah cleannative: rm -f `find . -name \*~ -o -name \*.swp -o -name \*.bak -o -name \*.obj -o -name \*.o` \ @@ -644,7 +663,7 @@ cleannative: # clean out the *.o files and machine generated files from javah clean: cleannative - rm -f CClassHeaders/* errors gl4java/*~ CNativeCode/*~ \ + rm -f $(CHEADERDIR)/* errors gl4java/*~ CNativeCode/*~ \ $(FILE.gen1.h) $(FILE.gen2.h) \ $(FILE.gen3.h) $(FILE.gen4.h) $(FILE.gen5.h) \ gl4java/GLContext.java @@ -827,15 +846,15 @@ archivsrc: archivclean GL4Java/*.txt GL4Java/symbols.mak.* GL4Java/makefile \ GL4Java/capsapi_classes.zip \ GL4Java/*.html GL4Java/C2J \ - GL4Java/CClassHeaders GL4Java/CNativeCode GL4Java/gl4java \ + GL4Java/$(CHEADERDIR) GL4Java/CNativeCode GL4Java/gl4java \ GL4Java/Win32VC6 \ GL4Java/MacOS9PPC/MacOS9PPC \ GL4Java/MacOS9PPC/java11X \ GL4Java/docs-src GL4Java/mklibs \ GL4Java/Installer/*.java GL4Java/Installer/*.skel \ GL4Java/Installer/*.sh GL4Java/Installer/*.bat \ - GL4Java/Installer/*.txt GL4Java/Installer/*.html \ - GL4Java/Installer/*.crt + GL4Java/Installer/*.txt GL4Java/Installer/*.html + cd archive; \ $(GZIP) -9 GL4Java$(LIBMAJOR).$(LIBMINOR).$(LIBBUGFIX).$(RELEASE)-src.tar |