From 23b4d3e8a1ed17e3cc9eba344c2e05e554fa5623 Mon Sep 17 00:00:00 2001
From: Per Inge Mathisen <per@wz2100.net>
Date: Thu, 28 Jul 2011 01:32:09 +0200
Subject: [PATCH] Add map/tools to ordinary build system.

---
 Makefile.am           |  1 +
 configure.ac          |  1 +
 tools/map/Makefile.am | 26 ++++++++++++++++++++++++++
 tools/map/mapload.h   |  5 +++++
 4 files changed, 33 insertions(+)
 create mode 100644 tools/map/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 47cfb3153..7ab9b072c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,7 @@ SUBDIRS = \
 	  lib/netplay \
 	  lib/widget \
 	  lib/qtgame \
+	  tools/map \
 	  src \
 	  data \
 	  po \
diff --git a/configure.ac b/configure.ac
index 0e9ded64e..8f7efa71e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -458,6 +458,7 @@ AC_CONFIG_FILES([Makefile
 		lib/sound/Makefile
 		lib/widget/Makefile
 		lib/qtgame/Makefile
+		tools/map/Makefile
 		src/Makefile])
 AC_OUTPUT
 
diff --git a/tools/map/Makefile.am b/tools/map/Makefile.am
new file mode 100644
index 000000000..9906c0b47
--- /dev/null
+++ b/tools/map/Makefile.am
@@ -0,0 +1,26 @@
+AM_CPPFLAGS = -DYY_NO_INPUT $(PHYSFS_CFLAGS) $(PNG_CFLAGS) $(OPENGLC_CFLAGS) $(OPENGL_CFLAGS) $(WZ_CPPFLAGS) $(GLEW_CFLAGS)
+AM_CFLAGS = $(WZ_CFLAGS)
+AM_CXXFLAGS = $(WZ_CXXFLAGS) $(QT4_CFLAGS) -I../..
+
+BUILT_SOURCES = 
+CLEANFILES = $(BUILT_SOURCES)
+EXTRA_DIST = 
+bin_PROGRAMS = mapconv mapinfo map2lnd map2preview map2png
+noinst_HEADERS = maplib.h mapload.h pngsave.h wzconfig.h
+
+LIBLIST = $(LTLIBINTL) $(PHYSFS_LIBS) $(PNG_LIBS) $(OPENGLC_LIBS) $(OPENGL_LIBS) $(QT4_LIBS) $(QJSON_LIBS) $(GLEW_LIBS) $(X_LIBS) $(X_EXTRA_LIBS)
+
+mapconv_SOURCES = mapconv.cpp mapload.cpp maplib.cpp pngsave.cpp
+mapconv_LDADD = $(LIBLIST)
+
+mapinfo_SOURCES = mapinfo.cpp mapload.cpp maplib.cpp
+mapinfo_LDADD = $(LIBLIST)
+
+map2lnd_SOURCES = map2lnd.cpp mapload.cpp maplib.cpp
+map2lnd_LDADD = $(LIBLIST)
+
+map2png_SOURCES = map2png.cpp mapload.cpp maplib.cpp pngsave.cpp
+map2png_LDADD = $(LIBLIST)
+
+map2preview_SOURCES = map2preview.cpp mapload.cpp maplib.cpp wzconfig.cpp
+map2preview_LDADD = $(LIBLIST)
diff --git a/tools/map/mapload.h b/tools/map/mapload.h
index 371f15995..5928f000f 100644
--- a/tools/map/mapload.h
+++ b/tools/map/mapload.h
@@ -21,6 +21,11 @@
 #ifndef __INCLUDED_TOOLS_MAPLOAD_H__
 #define __INCLUDED_TOOLS_MAPLOAD_H__
 
+#include <stdint.h>
+#include <stdbool.h>
+#include "lib/framework/wzglobal.h"
+#include "lib/framework/physfs_ext.h"
+
 #define MAX_LEVEL_SIZE	20
 #define TILE_HEIGHT	128
 #define TILE_WIDTH	128