summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBradley Smith2008-05-16 20:54:40 +0100
committerBradley Smith2008-05-16 20:54:40 +0100
commitb4a4a5c100d91df3e9876512fcd0f7cf8b5cd2e8 (patch)
tree6aa4fa65e203429b3c0c0d6e62207b3406e79f12
parentAdd initial UI design. (diff)
downloadgnurobots-b4a4a5c100d91df3e9876512fcd0f7cf8b5cd2e8.tar.gz
Add temporary uitest build.
Signed-off-by: Bradley Smith <brad@brad-smith.co.uk>
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac5
-rw-r--r--ui/Makefile.am25
-rw-r--r--ui/design.glade2
-rw-r--r--ui/main.c6
-rwxr-xr-xui/uitestbin0 -> 7633 bytes
7 files changed, 43 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6c9ba35..152b6a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-16 Bradley Smith <brad@brad-smith.co.uk>
+
+ * configure.ac Makefile.am ui/*:
+ Add temporary uitest build.
+
2008-05-14 Bradley Smith <brad@brad-smith.co.uk>
* configure.ac:
diff --git a/Makefile.am b/Makefile.am
index c40dc2a..45c2cfe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
AUTOMAKE_OPTIONS = 1.8.5
-SUBDIRS = contrib doc include maps scheme src xpm
+SUBDIRS = contrib doc include maps scheme src xpm ui
EXTRA_DIST = build
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure
diff --git a/configure.ac b/configure.ac
index 732d8dd..7831ef5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,6 +79,10 @@ PKG_CHECK_MODULES(GLIB2,glib-2.0 >= 2.4 gobject-2.0 gmodule-2.0,HAVE_GLIB2=yes,H
AC_SUBST(GLIB2_LIBS)
AC_SUBST(GLIB2_CFLAGS)
+PKG_CHECK_MODULES(GTK,gtk+-2.0 >= 2.4, HAVE_GTK=yes,HAVE_GTK=no)
+AC_SUBST(GTK_LIBS)
+AC_SUBST(GTK_CFLAGS)
+
schemedir="\$(pkgdatadir)/scheme"
AC_SUBST(schemedir)
@@ -132,6 +136,7 @@ AC_CONFIG_FILES([Makefile
maps/Makefile
scheme/Makefile
src/Makefile
+ ui/Makefile
])
AC_OUTPUT
diff --git a/ui/Makefile.am b/ui/Makefile.am
new file mode 100644
index 0000000..fd75fcb
--- /dev/null
+++ b/ui/Makefile.am
@@ -0,0 +1,25 @@
+## Copyright (C) 2008 Bradley Smith <brad@brad-smith.co.uk>
+##
+## src/Makefile.am
+##
+## GNU Robots is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## GNU Robots is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with GNU Robots; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+bin_PROGRAMS = uitest
+
+INCLUDES = $(GTK_CFLAGS) \
+ -I$(top_builddir)/ui/include
+
+uitest_SOURCES = main.c
+uitest_LDFLAGS = $(GTK_LIBS)
diff --git a/ui/design.glade b/ui/design.glade
index 4243222..b8d6fba 100644
--- a/ui/design.glade
+++ b/ui/design.glade
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Fri May 16 02:00:03 2008 -->
+<!--Generated with glade3 3.4.5 on Fri May 16 20:44:59 2008 -->
<glade-interface>
<widget class="GtkWindow" id="window1">
<child>
diff --git a/ui/main.c b/ui/main.c
new file mode 100644
index 0000000..2346eb4
--- /dev/null
+++ b/ui/main.c
@@ -0,0 +1,6 @@
+#include <gtk/gtk.h>
+
+int main(int argc, char* argv[])
+{
+ return 0;
+}
diff --git a/ui/uitest b/ui/uitest
new file mode 100755
index 0000000..dce4636
--- /dev/null
+++ b/ui/uitest
Binary files differ