From 2787a66207bd67db61a0bf2b6d6d0808d8c0be05 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Wed, 3 Sep 2003 15:42:37 +0000 Subject: [PATCH] *** empty log message *** --- src/native/Makefile.am | 2 +- src/native/common/Makefile.am | 50 +++++++++++++++++------------------ src/native/configure.in | 4 +-- src/native/dummy.cpp | 2 -- src/native/linux/Makefile.am | 18 ++++++------- 5 files changed, 37 insertions(+), 39 deletions(-) delete mode 100644 src/native/dummy.cpp diff --git a/src/native/Makefile.am b/src/native/Makefile.am index bd514d35..e54ddcda 100644 --- a/src/native/Makefile.am +++ b/src/native/Makefile.am @@ -1,6 +1,6 @@ #SUBDIRS = common linux lib_LTLIBRARIES = liblwjgl.la -liblwjgl_la_SOURCES = dummy.cpp +liblwjgl_la_SOURCES = dummy.cc #liblwjgl_la_LIBADD = common/libcommon.la linux/liblinux.la #liblwjgl_la_DEPENDENCIES = common/libcommon.la linux/liblinux.la diff --git a/src/native/common/Makefile.am b/src/native/common/Makefile.am index eb3e6400..3346a179 100644 --- a/src/native/common/Makefile.am +++ b/src/native/common/Makefile.am @@ -15,30 +15,30 @@ COMMON = \ org_lwjgl_input_Mouse.h \ org_lwjgl_Math.cpp \ org_lwjgl_Math.h \ -# org_lwjgl_openal_ALC.cpp \ -# org_lwjgl_openal_ALC.h \ -# org_lwjgl_openal_BaseAL.cpp \ -# org_lwjgl_openal_BaseAL.h \ -# org_lwjgl_openal_CoreAL.cpp \ -# org_lwjgl_openal_CoreAL.h \ -# org_lwjgl_openal_eax_BaseEAX.cpp \ -# org_lwjgl_openal_eax_BaseEAX.h \ -# org_lwjgl_openal_eax_CoreEAX.cpp \ -# org_lwjgl_openal_eax_CoreEAX.h \ -# org_lwjgl_openal_eax_EAXBufferProperties.cpp \ -# org_lwjgl_openal_eax_EAXBufferProperties.h \ -# org_lwjgl_openal_eax_EAXListenerProperties.cpp \ -# org_lwjgl_openal_eax_EAXListenerProperties.h \ -# org_lwjgl_opengl_CoreGL11.cpp \ -# org_lwjgl_opengl_CoreGL11.h \ -# org_lwjgl_opengl_CoreGL12.cpp \ -# org_lwjgl_opengl_CoreGL12.h \ -# org_lwjgl_opengl_CoreGL13.cpp \ -# org_lwjgl_opengl_CoreGL13.h \ -# org_lwjgl_opengl_CoreGL14.cpp \ -# org_lwjgl_opengl_CoreGL15.h \ -# org_lwjgl_opengl_GL.cpp \ -# org_lwjgl_opengl_GL.h \ -# org_lwjgl_opengl_GLU.cpp \ + org_lwjgl_openal_ALC.cpp \ + org_lwjgl_openal_ALC.h \ + org_lwjgl_openal_BaseAL.cpp \ + org_lwjgl_openal_BaseAL.h \ + org_lwjgl_openal_CoreAL.cpp \ + org_lwjgl_openal_CoreAL.h \ + org_lwjgl_openal_eax_BaseEAX.cpp \ + org_lwjgl_openal_eax_BaseEAX.h \ + org_lwjgl_openal_eax_CoreEAX.cpp \ + org_lwjgl_openal_eax_CoreEAX.h \ + org_lwjgl_openal_eax_EAXBufferProperties.cpp \ + org_lwjgl_openal_eax_EAXBufferProperties.h \ + org_lwjgl_openal_eax_EAXListenerProperties.cpp \ + org_lwjgl_openal_eax_EAXListenerProperties.h \ + org_lwjgl_opengl_CoreGL11.cpp \ + org_lwjgl_opengl_CoreGL11.h \ + org_lwjgl_opengl_CoreGL12.cpp \ + org_lwjgl_opengl_CoreGL12.h \ + org_lwjgl_opengl_CoreGL13.cpp \ + org_lwjgl_opengl_CoreGL13.h \ + org_lwjgl_opengl_CoreGL14.cpp \ + org_lwjgl_opengl_CoreGL15.h \ + org_lwjgl_opengl_GL.cpp \ + org_lwjgl_opengl_GL.h \ + org_lwjgl_opengl_GLU.cpp \ org_lwjgl_opengl_GLU.h diff --git a/src/native/configure.in b/src/native/configure.in index 026342a4..5332a795 100644 --- a/src/native/configure.in +++ b/src/native/configure.in @@ -4,7 +4,7 @@ AC_PREREQ(2.57) AC_INIT AM_INIT_AUTOMAKE(LWJGL, 0.7) -AC_CONFIG_SRCDIR([dummy.cpp]) +AC_CONFIG_SRCDIR([autogen.sh]) AM_CONFIG_HEADER([config.h]) #AC_DISABLE_STATIC @@ -17,7 +17,7 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET -CC=$CXX +#LD=$CXX AC_PROG_LIBTOOL case "$host_os" in diff --git a/src/native/dummy.cpp b/src/native/dummy.cpp deleted file mode 100644 index 16eedc1d..00000000 --- a/src/native/dummy.cpp +++ /dev/null @@ -1,2 +0,0 @@ -void _dummy() { -} diff --git a/src/native/linux/Makefile.am b/src/native/linux/Makefile.am index 686d148a..4e534277 100644 --- a/src/native/linux/Makefile.am +++ b/src/native/linux/Makefile.am @@ -5,13 +5,13 @@ INCLUDES = -I../common NATIVE = \ org_lwjgl_Display.cpp \ -# org_lwjgl_Sys.cpp \ -# org_lwjgl_input_Controller.cpp \ -# org_lwjgl_input_Keyboard.cpp \ -# org_lwjgl_input_Mouse.cpp \ -# org_lwjgl_input_Cursor.cpp \ -# org_lwjgl_opengl_Window.cpp \ -# org_lwjgl_opengl_GLCaps.cpp \ -# org_lwjgl_opengl_Pbuffer.cpp \ -# extxcursor.cpp + org_lwjgl_Sys.cpp \ + org_lwjgl_input_Controller.cpp \ + org_lwjgl_input_Keyboard.cpp \ + org_lwjgl_input_Mouse.cpp \ + org_lwjgl_input_Cursor.cpp \ + org_lwjgl_opengl_Window.cpp \ + org_lwjgl_opengl_GLCaps.cpp \ + org_lwjgl_opengl_Pbuffer.cpp \ + extxcursor.cpp