From 0a69e28183181ba44ff54a61f8244ae8327fa6a0 Mon Sep 17 00:00:00 2001
From: Ben Lynn <benlynn@gmail.com>
Date: Thu, 8 May 2014 21:13:21 -0700
Subject: [PATCH] v0.4.11
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Use intptr_t to stop compiler warnings.

Making a release because of the icons by Rusmir Duško.
---
 Makefile | 12 +++++-------
 README   |  2 +-
 main.c   |  5 ++---
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index e267c90..3499051 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-VERSION=0.4.10
-ALLFILES = *.[ch] Makefile LICENSE README copyright NEWS linux/*.[ch] win32/*.[ch] Vera.ttf
+VERSION=0.4.11
+ALLFILES = *.[ch] Makefile LICENSE README copyright linux/*.[ch] win32/*.[ch] Vera.ttf
 PROJNAME = netwalk
 OS ?= linux
 ifeq ("$(OS)", "win32")
@@ -7,6 +7,7 @@ CC = i586-mingw32msvc-gcc
 CFLAGS=-O2 -Wall -I /home/ben/cross/SDL/include/SDL -mwindows
 SDL_LIBS=-L /home/ben/cross/SDL/lib -lmingw32 -lSDLmain -lSDL
 LIBS = $(SDL_LIBS) -lSDL_ttf
+SHARE_DIR=.
 else
 CC = gcc
 CFLAGS=-Wall -O2 -fomit-frame-pointer `sdl-config --cflags`
@@ -14,6 +15,7 @@ SDL_LIBS=`sdl-config --libs`
 LIBS = $(SDL_LIBS) -lSDL_ttf
 INSTALL = /usr/bin/install
 PREFIX = /usr
+SHARE_DIR=$(PREFIX)/share/netwalk
 endif
 
 .PHONY: target clean dist
@@ -21,12 +23,8 @@ endif
 target : version.h sharedir.h $(PROJNAME)
 
 sharedir.h : ./Makefile
-ifeq ("$(OS)", "win32")
-	echo '#define NETWALK_SHARE_DIR "."' > sharedir.h
-else
-	echo '#define NETWALK_SHARE_DIR "'$(PREFIX)'/share/netwalk"' > sharedir.h
+	echo '#define NETWALK_SHARE_DIR "'$(SHARE_DIR)'"' > sharedir.h
 
-endif
 version.h : ./Makefile
 	echo '#define VERSION_STRING "'$(VERSION)'"' > version.h
 
diff --git a/README b/README
index b29dce7..1298cc1 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for NetWalk v0.4.10
+README for NetWalk v0.4.11
 Ben Lynn
 
 INTRODUCTION
diff --git a/main.c b/main.c
index c8c6dcd..f2a3510 100644
--- a/main.c
+++ b/main.c
@@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#include <assert.h>
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
@@ -1389,7 +1388,7 @@ void hs_close(widget_ptr w, void *data)
 
 void set_level(widget_ptr w, void *data)
 {
-    level = (int) data;
+    level = (intptr_t) data;
     new_game();
 }
 
@@ -1633,7 +1632,7 @@ int main(int argc, char *argv[])
 	menuitem_ptr it;
 	menu_t m1, m2;
 
-	int i;
+	intptr_t i;
 
 	menubar_init(menu);
 	window_add_widget(root, menu);
-- 
2.11.4.GIT