michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed bug in Window.cpp

This commit is contained in:
Elias Naur 2004-05-23 19:08:16 +00:00
parent 093cd19d82
commit 9cf079d054
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/native/common/Makefile.am
View File

@ -1,19 +1,22 @@
noinst_LTLIBRARIES = libcommon.la noinst_LTLIBRARIES = libcommon.la libtools.la
SUBDIRS = arb ati ext nv SUBDIRS = arb ati ext nv
libcommon_la_SOURCES = $(COMMON) libcommon_la_SOURCES = $(COMMON)
libcommon_la_LIBADD = $(DEP_LIBS) libcommon_la_LIBADD = $(DEP_LIBS)
libcommon_la_DEPENDENCIES = $(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 = \ COMMON = \
extal.cpp \ extal.cpp \
extal.h \ extal.h \
extgl.cpp \ extgl.cpp \
extgl.h \ extgl.h \
common_tools.cpp \
common_tools.h \
org_lwjgl_Display.h \ org_lwjgl_Display.h \
org_lwjgl_Sys.h \ org_lwjgl_Sys.h \
org_lwjgl_input_GamePad.h \ org_lwjgl_input_GamePad.h \

11
src/native/common/fmod/Makefile.am Normal file
View File

@ -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

4
src/native/linux/org_lwjgl_opengl_Window.cpp
View File

@ -504,6 +504,8 @@ static bool initWindowGLX13(JNIEnv *env, int screen, jstring title, int x, int y
return false; return false;
} }
bool window_created = createWindow(env, screen, vis_info, title, x, y, width, height, fscreen, undecorated); bool window_created = createWindow(env, screen, vis_info, title, x, y, width, height, fscreen, undecorated);
if (isDebugEnabled())
dumpVisualInfo(vis_info);
XFree(vis_info); XFree(vis_info);
if (!window_created) { if (!window_created) {
glXDestroyContext(getDisplay(), context); 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); glx_window = glXCreateWindow(getDisplay(), configs[0], getCurrentWindow(), NULL);
makeCurrent(); makeCurrent();
if (isDebugEnabled())
dumpVisualInfo(vis_info);
XFree(configs); XFree(configs);
if (!checkXError(env)) { if (!checkXError(env)) {
glXDestroyWindow(getDisplay(), glx_window); glXDestroyWindow(getDisplay(), glx_window);