mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-25 04:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the Linux makefile of the Qt sample

Browse Source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1145 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
laurentgom 2009-06-17 07:55:46 +00:00
parent 1e8cb5827d
commit 0ad6295ff4
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/qt/Makefile
View File

@ -7,7 +7,7 @@ qt: $(OBJ)
$(CC) $(LDFLAGS) -o $(EXECPATH)/$@ $(OBJ) -lsfml-graphics -lsfml-window -lsfml-system -lQtCore -lQtGui -lX11 $(CC) $(LDFLAGS) -o $(EXECPATH)/$@ $(OBJ) -lsfml-graphics -lsfml-window -lsfml-system -lQtCore -lQtGui -lX11
%.o: %.cpp %.o: %.cpp
$(CC) -o $@ -c $< $(CFLAGS) -I/usr/include/qt4 $(CC) -o $@ -c $< $(CFLAGS) -I/usr/include/qt4 -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui
.PHONY: clean mrproper .PHONY: clean mrproper

13
src/SFML/Window/Linux/WindowImplX11.cpp
View File

@ -349,20 +349,11 @@ WindowImplX11::~WindowImplX11()
// Close the display // Close the display
CloseDisplay(); CloseDisplay();
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Check if there's an active context on the current thread /// Check if there's an active context on the current thread
////////////////////
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Filter the received events
/// (only allow those matching a specific window)
////////////////////////////////////////////////////////////
Bool CheckEvent(::Display*, XEvent* Event, XPointer UserData)
{
// Just check if the event matches our window
return Event->xany.window == reinterpret_cast< ::Window >(UserData);
}////////////////////////////////////////
bool WindowImplX11::IsContextActive() bool WindowImplX11::IsContextActive()
{ {
return glXGetCurrentContext() != NULL; return glXGetCurrentContext() != NULL;