Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-29 08:34:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

Turn off experimental multi-device features; up copyright; define XP_UCHAR as signed char to fix lots of warnings.

Browse source
This commit is contained in:
ehouse 2008-01-19 16:34:21 +00:00
parent f90b6d35e8
commit 211100c247
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
xwords4/wince/Makefile
View file

@ -29,13 +29,13 @@ HAVE_COMMCTRL = 1
ifeq ($(TARGET_OS),wince)
# BLUETOOTH = -DXWFEATURE_BLUETOOTH
RELAY = -DXWFEATURE_RELAY -DCOMMS_HEARTBEAT
# RELAY = -DXWFEATURE_RELAY -DCOMMS_HEARTBEAT
CC = arm-wince-pe-gcc
WINDRES = arm-wince-pe-windres
STRIP = arm-wince-pe-strip
CELIBS = -L/usr/arm-wince-pe/lib
TARGET_OS_DEF = -DTARGET_OS_WINCE
#STANDALONE = -DXWFEATURE_STANDALONE_ONLY
STANDALONE = -DXWFEATURE_STANDALONE_ONLY
CFLAGS += -D_WIN32_WCE=400 -DUNDER_CE -DMY_COLOR_SEL \
$(STANDALONE) -DDRAW_LINK_DIRECT \
-fdollars-in-identifiers -D__W32API_USE_DLLIMPORT__
@ -48,8 +48,9 @@ CFLAGS += -DCANT_DO_CMDBAR
endif
else # ifeq ($(TARGET_OS),wince)
ifeq ($(TARGET_OS),win32)
BLUETOOTH = -DXWFEATURE_BLUETOOTH
RELAY = -DXWFEATURE_RELAY
STANDALONE = -DXWFEATURE_STANDALONE_ONLY
#BLUETOOTH = -DXWFEATURE_BLUETOOTH
#RELAY = -DXWFEATURE_RELAY
CC = i586-mingw32msvc-gcc
WINDRES = i586-mingw32msvc-windres
STRIP = i586-mingw32msvc-strip
@ -64,7 +65,7 @@ CFLAGS += -DARM -I$(MINGW_INC_PATH) -I./ -I../common -I../relay
CFLAGS += -Wall -Wunused-parameter
CFLAGS += $(BLUETOOTH) $(RELAY)
CFLAGS += $(BLUETOOTH) $(RELAY) $(STANDALONE)
SVNDEF = -DSVN_REV='\"$(SVNREV)\"'
CFLAGS += $(SVNDEF)

2
xwords4/wince/xptypes.h
View file

@ -43,7 +43,7 @@ typedef signed short XP_S16;
typedef unsigned long XP_U32;
typedef signed long XP_S32;
typedef unsigned char XP_UCHAR;
typedef char XP_UCHAR;
typedef signed short XP_FontCode; /* not sure how I'm using this yet */
typedef BOOL XP_Bool;

6
xwords4/wince/xwords4.rc
View file

@ -149,12 +149,12 @@ CAPTION "About Crosswords"
FONT 8, "System"
BEGIN
ICON IDI_XWORDS4,IDC_STATIC,8,17,20,20
LTEXT "Crosswords 4.1 (rev " SVN_REV ") "\
"for PocketPC. Copyright 1998-2006 by "\
LTEXT "Crosswords 4.2a1 (rev " SVN_REV ") "\
"for PocketPC. Copyright 1998-2008 by "\
"Eric House. This software is released under the GNU "\
"Public License.\r\r"\
"For dictionaries, a manual, or source code go to "\
"http://xwords.sf.net.",
"http://xwords.sf.net or http://eehouse.org/xwords/.",
IDC_STATIC,32,4,86,101,SS_NOPREFIX
END