diff options
| author | Kenneth Russel <[email protected]> | 2003-07-14 05:34:51 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2003-07-14 05:34:51 +0000 |
| commit | 32350278dd07c95bec7e8adcf19ca1601dd6c6b4 (patch) | |
| tree | 1e33a3c50e9c5173a2f8b08270e0cb4a1b692192 /make/Makefile2 | |
| parent | 4f936be964c9e8613a5e43e1d88490ff7f550ec9 (diff) | |
Added Ant build support, contributed by Rob Grzywinski and Artur
Biesiadowski. Modified their original build.xml to understand
dependencies between build phases (to avoid full rebuilds each time)
and to invoke the C compiler without requiring an external Makefile.
At this point the old Makefile/Makefile2 pair is obsolete and will be
deleted shortly, as soon as the Ant build has been tested on Linux and
Mac OS X. Additionally, Cygwin is no longer needed for the build; the
documentation will be updated to reflect this. Refactored some of the
stub_includes files to be common between platforms, yielding a build
process cleanup. Fixed bugs in Javadocs.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@19 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'make/Makefile2')
| -rw-r--r-- | make/Makefile2 | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/make/Makefile2 b/make/Makefile2 index 0c8f540ec..4fa84b2b0 100644 --- a/make/Makefile2 +++ b/make/Makefile2 @@ -301,7 +301,6 @@ DEFINES:=$(DEFINES) INCLUDES=-I$(JOGL_STUB_INCLUDES_DIR_OPENGL) -I"$(JAVA_INCLUDE_PATH)" -I"$(JAVA_INCLUDE_PATH_PD)" CFLAGS=$(OPTFLAGS) $(DEBUGFLAGS) OBJ_FILE_EXT=o -C_BUILD_OBJ_CMD=$(CC) -Dmacosx -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@ DSO_PREFIX_PD=lib DSO_EXTENSION_PD=jnilib endif # macosx @@ -353,7 +352,6 @@ INCLUDES=-I$(JOGL_STUB_INCLUDES_DIR_OPENGL) -I"$(JAVA_INCLUDE_PATH)" -I"$(JAVA_I # -I$(INCLUDE_PATH_ROOT_PD) CFLAGS=$(OPTFLAGS) $(DEBUGFLAGS) OBJ_FILE_EXT=o -C_BUILD_OBJ_CMD=$(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@ DSO_PREFIX_PD=lib DSO_EXTENSION_PD=so endif # x11 @@ -458,8 +456,6 @@ JOGL_GENERATED_CFILES_MACOSX = \ # JOGL_CFG Name of the gl.cfg file # JOGL_IMPL_CFG Name of the gl-impl.cfg file # JOGL_JAWT_CFG Name of the jawt.cfg file -# JOGL_WINDOW_SYSTEM_CFG Name of the e.g., gl-wgl-win32.cfg file which provides -# WGL, GLX, etc. extensions to GL # JOGL_WINDOW_SYSTEM_CFG Name of the e.g., wingdi.cfg file which provides internal # access to core routines in WGL, glX, etc. # JOGL_GENERATED_CFILES_PD Names of platform-dependent .c files @@ -481,7 +477,6 @@ JOGL_CFG=gl-win32.cfg JOGL_IMPL_CFG=gl-impl-win32.cfg JOGL_GLU_CFG=glu.cfg JOGL_GLU_IMPL_CFG=glu-impl-win32.cfg -JOGL_WINDOW_SYSTEM_CFG=gl-wgl-win32.cfg JOGL_JAWT_CFG=jawt-win32.cfg JOGL_WINDOW_SYSTEM_CFG=wingdi-win32.cfg JOGL_GENERATED_CFILES_PD=$(JOGL_GENERATED_CFILES_WINDOWS) @@ -507,7 +502,6 @@ JOGL_CFG=gl-x11.cfg JOGL_IMPL_CFG=gl-impl-x11.cfg JOGL_GLU_CFG=glu.cfg JOGL_GLU_IMPL_CFG=glu-impl-x11.cfg -JOGL_WINDOW_SYSTEM_CFG=gl-glx-x11.cfg JOGL_JAWT_CFG=jawt-x11.cfg JOGL_WINDOW_SYSTEM_CFG=glx-x11.cfg JOGL_GENERATED_CFILES_PD=$(JOGL_GENERATED_CFILES_X11) @@ -533,7 +527,6 @@ JOGL_CFG=gl-macosx.cfg JOGL_IMPL_CFG=gl-impl-macosx.cfg JOGL_GLU_CFG=glu.cfg JOGL_GLU_IMPL_CFG=glu-impl-macosx.cfg -JOGL_WINDOW_SYSTEM_CFG=gl-cgl-macosx.cfg JOGL_JAWT_CFG=jawt-macosx.cfg JOGL_WINDOW_SYSTEM_CFG=cgl-macosx.cfg JOGL_GENERATED_CFILES_PD=$(JOGL_GENERATED_CFILES_MACOSX) |