aboutsummaryrefslogtreecommitdiffstats
path: root/make/Makefile2
diff options
context:
space:
mode:
Diffstat (limited to 'make/Makefile2')
-rw-r--r--make/Makefile227
1 files changed, 16 insertions, 11 deletions
diff --git a/make/Makefile2 b/make/Makefile2
index e68cffa30..cc3ad9b4e 100644
--- a/make/Makefile2
+++ b/make/Makefile2
@@ -367,7 +367,7 @@ GENSRC_GL_NATIVE_DIR=$(GENSRC_NATIVE_DIR)/jogl
JOGL_DIR=$(SRC_DIR)/net/java/games/jogl
JOGL_IMPL_DIR=$(SRC_DIR)/net/java/games/jogl/impl
-JOGL_UTIL_DIR=$(SRC_DIR)/net/java/games/util
+JOGL_UTIL_DIR=$(SRC_DIR)/net/java/games/jogl/util
GENSRC_JOGL_DIR=$(GENSRC_JAVA_DIR)/net/java/games/jogl
GENSRC_JOGL_IMPL_DIR=$(GENSRC_JAVA_DIR)/net/java/games/jogl/impl
@@ -381,6 +381,7 @@ JOGL_STUB_INCLUDES_DIR_OPENGL=$(JOGL_STUB_INCLUDES_DIR)/opengl
JOGL_OBJ_DIR = $(OBJ_DIR)/jogl
JOGL_DSO_DIR = $(DSO_DIR)
JOGL_DSO=$(JOGL_DSO_DIR)/$(DSO_PREFIX_PD)jogl.$(DSO_EXTENSION_PD)
+JOGL_JAR=$(BUILD_DIR)/jogl.jar
JOGL_JAVAFILES_WINDOWS = \
$(JOGL_IMPL_DIR)/windows/WindowsGLContext.java \
@@ -583,9 +584,6 @@ JOGL_JAVAFILES_FIRST_PASS = \
$(JOGL_UTIL_DIR)/BitmapFontRec.java \
$(JOGL_UTIL_DIR)/BufferUtils.java \
$(JOGL_UTIL_DIR)/CoordRec.java \
- $(JOGL_UTIL_DIR)/DDSReader.java \
- $(JOGL_UTIL_DIR)/DurationTimer.java \
- $(JOGL_UTIL_DIR)/DxTex.java \
$(JOGL_UTIL_DIR)/GLUT.java \
$(JOGL_UTIL_DIR)/GLUTBitmap8x13.java \
$(JOGL_UTIL_DIR)/GLUTBitmap9x15.java \
@@ -596,11 +594,9 @@ JOGL_JAVAFILES_FIRST_PASS = \
$(JOGL_UTIL_DIR)/GLUTBitmapTimesRoman24.java \
$(JOGL_UTIL_DIR)/GLUTStrokeMonoRoman.java \
$(JOGL_UTIL_DIR)/GLUTStrokeRoman.java \
- $(JOGL_UTIL_DIR)/LEDataInputStream.java \
$(JOGL_UTIL_DIR)/StrokeCharRec.java \
$(JOGL_UTIL_DIR)/StrokeFontRec.java \
$(JOGL_UTIL_DIR)/StrokeRec.java \
- $(JOGL_UTIL_DIR)/TGAImage.java \
$(JOGL_JAVAFILES_PD) \
$(JOGL_GENERATED_JAVAFILES)
@@ -654,7 +650,7 @@ doc:
-public -sourcepath "$(SRC_DIR)$(CP_SEPARATOR)$(GENSRC_JAVA_DIR)" \
net.java.games.jogl \
net.java.games.gluegen.runtime \
- net.java.games.util
+ net.java.games.jogl.util
devdoc:
mkdir -p $(JAVADOC_DIR_DEVDOC)
@@ -671,15 +667,15 @@ devdoc:
net.java.games.gluegen.opengl \
net.java.games.gluegen.pcpp \
net.java.games.gluegen.runtime \
- net.java.games.util
+ net.java.games.jogl.util
# (Iff we are not on macosx): print an error if the user has not set JAVA_HOME, since that will cause
# builds to fail
ifneq ($(JAVA_HOME),)
-win32: WIN32_COMPILER_SPECIFIED $(OUTPUT_DIRS) $(JOGL_CLASSFILES) $(JOGL_DSO)
-x11: $(OUTPUT_DIRS) $(JOGL_CLASSFILES) $(JOGL_DSO)
-macosx: $(OUTPUT_DIRS) $(JOGL_CLASSFILES) $(JOGL_DSO)
+win32: WIN32_COMPILER_SPECIFIED $(OUTPUT_DIRS) $(JOGL_JAR) $(JOGL_DSO)
+x11: $(OUTPUT_DIRS) $(JOGL_JAR) $(JOGL_DSO)
+macosx: $(OUTPUT_DIRS) $(JOGL_JAR) $(JOGL_DSO)
gluegen: $(GG_CLASSFILES)
else
@@ -820,3 +816,12 @@ $(JOGL_OBJ_DIR)/%.$(OBJ_FILE_EXT) : $(GENSRC_GL_NATIVE_DIR)/%.c
$(JOGL_DSO): $(JOGL_OBJ_FILES)
$(GL_C_LINK_DSO_CMD) $(JOGL_OBJ_FILES)
+
+#
+# jar build rule
+#
+
+$(JOGL_JAR): $(JOGL_CLASSFILES)
+ rm -f $@
+ cd $(CLASSES_DIR) ; \
+ jar cvf ../jogl.jar *