From 9cf079d0549945ed6b7874d8b6c27c950e55c2e7 Mon Sep 17 00:00:00 2001
From: Elias Naur <elias.naur@gmail.com>
Date: Sun, 23 May 2004 19:08:16 +0000
Subject: [PATCH] Fixed bug in Window.cpp

---
 src/native/common/Makefile.am                | 11 +++++++----
 src/native/common/fmod/Makefile.am           | 11 +++++++++++
 src/native/linux/org_lwjgl_opengl_Window.cpp |  4 ++--
 3 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 src/native/common/fmod/Makefile.am

diff --git a/src/native/common/Makefile.am b/src/native/common/Makefile.am
index 167f4ab0..6de1fe5c 100644
--- a/src/native/common/Makefile.am
+++ b/src/native/common/Makefile.am
@@ -1,19 +1,22 @@
-noinst_LTLIBRARIES = libcommon.la
+noinst_LTLIBRARIES = libcommon.la libtools.la
 
 SUBDIRS = arb ati ext nv
 
 libcommon_la_SOURCES = $(COMMON)
 libcommon_la_LIBADD = $(DEP_LIBS)
 libcommon_la_DEPENDENCIES = $(DEP_LIBS)
-DEP_LIBS=arb/libarb.la ati/libati.la ext/libext.la nv/libnv.la
+libtools_la_SOURCES = $(TOOLS)
+DEP_LIBS=libtools.la arb/libarb.la ati/libati.la ext/libext.la nv/libnv.la
+
+TOOLS = \
+  common_tools.cpp \
+  common_tools.h
 
 COMMON = \
   extal.cpp \
   extal.h \
   extgl.cpp \
   extgl.h \
-  common_tools.cpp \
-  common_tools.h \
   org_lwjgl_Display.h \
   org_lwjgl_Sys.h \
   org_lwjgl_input_GamePad.h \
diff --git a/src/native/common/fmod/Makefile.am b/src/native/common/fmod/Makefile.am
new file mode 100644
index 00000000..9f27eadc
--- /dev/null
+++ b/src/native/common/fmod/Makefile.am
@@ -0,0 +1,11 @@
+lib_LTLIBRARIES = liblwjgl-fmod.la
+liblwjgl_fmod_la_SOURCES = $(FMOD_SOURCE)
+liblwjgl_fmod_la_LIBADD = $(DEP_LIBS)
+liblwjgl_fmod_la_DEPENDENCIES = $(DEP_LIBS)
+INCLUDES = -I..
+DEP_LIBS = ../libtools.la
+
+FMOD_SOURCE = extfmod.cpp \
+              org_lwjgl_fmod_FMOD.cpp \
+              org_lwjgl_fmod_FMusic.cpp \
+              org_lwjgl_fmod_FSound.cpp
diff --git a/src/native/linux/org_lwjgl_opengl_Window.cpp b/src/native/linux/org_lwjgl_opengl_Window.cpp
index 6ffc1301..1e42c6c4 100644
--- a/src/native/linux/org_lwjgl_opengl_Window.cpp
+++ b/src/native/linux/org_lwjgl_opengl_Window.cpp
@@ -504,6 +504,8 @@ static bool initWindowGLX13(JNIEnv *env, int screen, jstring title, int x, int y
 		return false;
 	}
 	bool window_created = createWindow(env, screen, vis_info, title, x, y, width, height, fscreen, undecorated);
+	if (isDebugEnabled())
+		dumpVisualInfo(vis_info);
 	XFree(vis_info);
 	if (!window_created) {
 		glXDestroyContext(getDisplay(), context);
@@ -512,8 +514,6 @@ static bool initWindowGLX13(JNIEnv *env, int screen, jstring title, int x, int y
 	}
 	glx_window = glXCreateWindow(getDisplay(), configs[0], getCurrentWindow(), NULL);
 	makeCurrent();
-	if (isDebugEnabled())
-		dumpVisualInfo(vis_info);
 	XFree(configs);
 	if (!checkXError(env)) {
 		glXDestroyWindow(getDisplay(), glx_window);