From 3c01d729cdcc8a324c84da4724a38a7442e4d86b Mon Sep 17 00:00:00 2001
From: steffen <steffen>
Date: Wed, 5 Feb 2014 23:09:46 +0000
Subject: [PATCH] WindowsCE version

---
 ChangeLog            | 1 +
 Makefile             | 3 ++-
 Makefile.rules.wince | 6 +++---
 wince/wince_main.c   | 6 +++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8733186..94b0b9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
                OSMroute already.
 =============================================================================
 (2014-02-05):
+- fixed: windowsCE version is running again.
 - fixed: pressing the button long time did not work.
 
 (2014-01-20):
diff --git a/Makefile b/Makefile
index 5dcfaae..6a8fb44 100644
--- a/Makefile
+++ b/Makefile
@@ -95,7 +95,8 @@ sposmroutece.exe:
 	do if ! make -C $$i; then \
 		exit -2; \
 	fi done
-	$(CC) -o sposmroutece.exe wince/wince.rsc -lwince -lmapsys -ldraw -lbase -lgui -lmain -Lbase -Lmain -Ldraw -Lgui -Lmapsys -Lwince $(LIBS) $(DEBUG)
+	$(CC) -o sposmroutece.exe wince/wince.rsc `for i in \`make -sf wince/Makefile displayobj\`; do echo wince/$$i; done` -ldraw -lmapsys -lgui -lmain -lbase -Lbase -Lmain -Ldraw -Lgui -Lmapsys -Lwince $(LIBS) $(DEBUG)
+#	$(CC) -o sposmroutece.exe wince/wince.rsc -lwince -lmapsys -ldraw -lbase -lgui -lmain -Lbase -Lmain -Ldraw -Lgui -Lmapsys -Lwince $(LIBS) $(DEBUG)
 
 cleanapp:
 	rm -rf sposmroutece.exe
diff --git a/Makefile.rules.wince b/Makefile.rules.wince
index ccb4a67..a2cb6a0 100644
--- a/Makefile.rules.wince
+++ b/Makefile.rules.wince
@@ -3,10 +3,10 @@
 WINCEVERSION  = 1
 DEPENDFILE = .depend
 DEBUG  = -ggdb
-AR	   = /opt/mingw32ce/bin/arm-mingw32ce-ar
-CC     = /opt/mingw32ce/bin/arm-mingw32ce-gcc
+AR	   = arm-mingw32ce-ar
+CC     = arm-mingw32ce-gcc
 CFLAGS = -Wall -g -I../main -I../ -I../mapsys -I../gui -I../wince -I../draw -I../base -DSPOSMROUTE -DHAVE_WINAPI -D_WIN32_IE=0x400 $(DEBUG)
-WINRES = /opt/mingw32ce/bin/arm-mingw32ce-windres
+WINRES = arm-mingw32ce-windres
 LIBS   = -lcommctrl -laygshell -lws2
 
 %.o: %.c
diff --git a/wince/wince_main.c b/wince/wince_main.c
index e7590c8..6a18d79 100644
--- a/wince/wince_main.c
+++ b/wince/wince_main.c
@@ -415,10 +415,10 @@ LRESULT CALLBACK WndProcedure(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
 			draw_mousemove (x, y, -1);
 			break;		
 		case WM_CHAR:
-			if (wParam < ' ') gevent.keyval = 0xff00 | wParam;
-			else gevent.keyval = wParam;
+			if (wParam < ' ') gevent.keychar = 0xff00 | wParam;
+			else gevent.keychar = wParam;
 			gevent.event = EGUI_KEYCHAR;
-			d_printf ("char wParam:%x keyval:%x", wParam, gevent.keyval);
+			d_printf ("char wParam:%x keyval:%x", wParam, gevent.keychar);
 			if (gui_event (gevent) != 0) draw();
 			break;
 //		case WM_KEYUP: