Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-05 20:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: fix for win32; remove constants that belong in cegcc; etc.

Browse source
This commit is contained in:
ehouse 2008-06-07 14:42:20 +00:00
parent 5e06c72f5d
commit 51a42ce2a2
4 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
wince/Makefile
View file

@ -57,11 +57,12 @@ CELIBS = -L${CEOPT_ROOT}/${CE_ARCH}/lib/ -lws2
endif endif
TARGET_OS_DEF = -DTARGET_OS_WINCE TARGET_OS_DEF = -DTARGET_OS_WINCE
STANDALONE = -DXWFEATURE_STANDALONE_ONLY STANDALONE = -DXWFEATURE_STANDALONE_ONLY
CFLAGS += -D_WIN32_WCE=400 -D_WIN32_IE=0x0400 -DUNDER_CE -DMY_COLOR_SEL \ COLOR_SEL = -DMY_COLOR_SEL
CFLAGS += -D_WIN32_WCE=400 -D_WIN32_IE=0x0400 -DUNDER_CE \
$(STANDALONE) $(USE_RAW_MINGW) -DDRAW_LINK_DIRECT \ $(STANDALONE) $(USE_RAW_MINGW) -DDRAW_LINK_DIRECT \
-DXWFEATURE_TURNCHANGENOTIFY \ -DXWFEATURE_TURNCHANGENOTIFY \
-fdollars-in-identifiers -D__W32API_USE_DLLIMPORT__ -fdollars-in-identifiers -D__W32API_USE_DLLIMPORT__
RESFLAGS += -DMY_COLOR_SEL -D_WIN32_WCE=400 RESFLAGS += -D_WIN32_WCE=400
LFLAGS += -Wl,--major-subsystem-version,4,--minor-subsystem-version,20 LFLAGS += -Wl,--major-subsystem-version,4,--minor-subsystem-version,20
ifdef HAVE_COMMCTRL ifdef HAVE_COMMCTRL
CELIBS += -lcommctrl -laygshell CELIBS += -lcommctrl -laygshell
@ -78,6 +79,7 @@ WINDRES = i586-mingw32msvc-windres
STRIP = i586-mingw32msvc-strip STRIP = i586-mingw32msvc-strip
TARGET_OS_DEF = -DTARGET_OS_WIN32 TARGET_OS_DEF = -DTARGET_OS_WIN32
CELIBS += -lws2_32 CELIBS += -lws2_32
CFLAGS += -DCANT_DO_CMDBAR -DDRAW_LINK_DIRECT -DXWFEATURE_TURNCHANGENOTIFY CFLAGS += -DCANT_DO_CMDBAR -DDRAW_LINK_DIRECT -DXWFEATURE_TURNCHANGENOTIFY
#CFLAGS += -DFORCE_HEIGHT=240 -DFORCE_WIDTH=320 #CFLAGS += -DFORCE_HEIGHT=240 -DFORCE_WIDTH=320
endif endif
@ -87,7 +89,7 @@ CFLAGS += -DARM -I./ -I../common -I../relay
CFLAGS += -Wall -Wunused-parameter CFLAGS += -Wall -Wunused-parameter
CFLAGS += $(BLUETOOTH) $(RELAY) $(STANDALONE) CFLAGS += $(BLUETOOTH) $(RELAY) $(STANDALONE) $(COLOR_SEL)
SVNDEF = -DSVN_REV='\"$(SVNREV)\"' SVNDEF = -DSVN_REV='\"$(SVNREV)\"'
CFLAGS += $(SVNDEF) CFLAGS += $(SVNDEF)
@ -164,7 +166,7 @@ XW_BOTH_DEFINES = \
CFLAGS += $(XW_BOTH_DEFINES) -DARM CFLAGS += $(XW_BOTH_DEFINES) -DARM
RESFLAGS += $(XW_BOTH_DEFINES) $(STANDALONE) $(BLUETOOTH) $(RELAY) \ RESFLAGS += $(XW_BOTH_DEFINES) $(STANDALONE) $(BLUETOOTH) $(RELAY) \
-D_WIN32 -D_WIN32_IE=0x0400 -D_WIN32 -D_WIN32_IE=0x0400 $(COLOR_SEL)
#################################################################### ####################################################################
# Rules start here # Rules start here

1
wince/cedebug.c
View file

@ -72,6 +72,7 @@ messageToStr( UINT message )
CASE_STR( WM_CTLCOLOREDIT ); CASE_STR( WM_CTLCOLOREDIT );
CASE_STR( WM_NCDESTROY ); CASE_STR( WM_NCDESTROY );
CASE_STR( WM_NOTIFY ); CASE_STR( WM_NOTIFY );
CASE_STR( WM_NCHITTEST );
default: default:
str = "<unknown>"; str = "<unknown>";
} }

2
wince/cesvdgms.c
View file

@ -20,7 +20,9 @@
#include <windowsx.h> #include <windowsx.h>
#include "stdafx.h" #include "stdafx.h"
#include <commdlg.h> #include <commdlg.h>
#ifdef _win32_wce
#include <aygshell.h> #include <aygshell.h>
#endif
#include "cemain.h" #include "cemain.h"
#include "cesvdgms.h" #include "cesvdgms.h"

12
wince/debhacks.h
View file

@ -67,18 +67,6 @@ BOOL DH(ResetEvent)(HANDLE);
#endif /* USE_RAW_MINGW */ #endif /* USE_RAW_MINGW */
#ifdef _WIN32_WCE
/* from http://forums.microsoft.com/MSDN/ShowPost.aspx?PostID=1733046&SiteID=1 */
# define SHMBOF_NODEFAULT 0x00000001 // do not do default handling of this key
# define SHMBOF_NOTIFY 0x00000002 // send us the WM_* messages for this key
# define SHCMBM_OVERRIDEKEY (WM_USER + 403)
# define VK_TBACK VK_ESCAPE
#endif
#if 0 #if 0
/* http://forums.microsoft.com/MSDN/ShowPost.aspx?PostID=1591512&SiteID=1 */ /* http://forums.microsoft.com/MSDN/ShowPost.aspx?PostID=1591512&SiteID=1 */
#define IM_SPELL 0 #define IM_SPELL 0