Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-11-16 07:48:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix curses-only compile: use glib even without gtk.

Browse source
This commit is contained in:
eehouse 2010-02-05 13:21:01 +00:00
parent 1ab1806a24
commit 3c26cd74ff
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
xwords4/common/engine.c
View file

@ -457,8 +457,11 @@ engine_findMove( EngineCtxt* engine, const ModelCtxt* model,
}
}
if ( !engine->searchHorizontal ||
(engine->isFirstMove && !searchLimits) ) {
if ( !engine->searchHorizontal
#ifdef XWFEATURE_SEARCHLIMIT
|| (engine->isFirstMove && !searchLimits)
#endif
) {
engine->searchInProgress = XP_FALSE;
break;
} else {
@ -499,7 +502,9 @@ findMovesOneRow( EngineCtxt* engine )
XP_U16 col, row = engine->curRow;
XP_S16 prevAnchor;
XP_U16 firstSearchCol, lastSearchCol;
#ifdef XWFEATURE_SEARCHLIMIT
const BdHintLimits* searchLimits = engine->searchLimits;
#endif
if ( 0 ) {
#ifdef XWFEATURE_SEARCHLIMIT

2
xwords4/linux/Makefile
View file

@ -170,6 +170,8 @@ ifdef BLUETOOTH
LIBS += -lbluetooth
endif
CFLAGS += `pkg-config --cflags glib-2.0`
LIBS += `pkg-config --libs glib-2.0`
ifneq (,$(findstring DPLATFORM_GTK,$(DEFINES)))
LIBS += `pkg-config --libs gtk+-2.0`
CFLAGS += `pkg-config --cflags gtk+-2.0` \

2
xwords4/linux/xptypes.h
View file

@ -28,8 +28,8 @@
#include <unistd.h>
#include <netinet/in.h>
#include <glib.h>
#ifdef PLATFORM_GTK
# include <glib.h>
# include <gdk/gdk.h>
# include <gtk/gtk.h>
#endif