From 8ead8635c247853eab56c5acdcea144b99a90380 Mon Sep 17 00:00:00 2001 From: Matthew Bowra-Dean Date: Sat, 1 Jan 2011 17:18:21 +1300 Subject: [PATCH] Updated dependencies for gtk launcher, statically link libmicrohttpd --- Makefile | 4 ++-- packaging/linux/deb/DEBIAN/control | 2 +- packaging/linux/pkgbuild/PKGBUILD | 2 +- packaging/linux/rpm/openra.spec | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b2e49478a1..c46e7a5938 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ COMMON_LIBS = System.dll System.Core.dll System.Drawing.dll System.Xml.dll third PHONY = core tools package all mods clean distclean CC = gcc -CFLAGS = -g -Wall +CFLAGS = -O2 -Wall .SUFFIXES: core: game renderers mod_ra mod_cnc @@ -181,7 +181,7 @@ gtklaunch_SRCS = $(shell find OpenRA.Launcher.Gtk/ -iname '*.c') gtklaunch: $(gtklaunch_HEADERS) $(gtklaunch_SRCS) @echo CC launcher - @$(CC) $(CFLAGS) $(shell pkg-config --cflags --libs gtk+-2.0 webkit-1.0 libmicrohttpd) -o gtklaunch $(gtklaunch_SRCS) + @$(CC) $(CFLAGS) $(shell pkg-config --cflags --libs gtk+-2.0 webkit-1.0) -I/usr/include/ -lgcrypt -o gtklaunch $(gtklaunch_SRCS) /usr/lib/libmicrohttpd.a .PHONY: $(PHONY) $(PROGRAMS) diff --git a/packaging/linux/deb/DEBIAN/control b/packaging/linux/deb/DEBIAN/control index 5bdccb0bcb..cbe99097dd 100644 --- a/packaging/linux/deb/DEBIAN/control +++ b/packaging/linux/deb/DEBIAN/control @@ -4,7 +4,7 @@ Architecture: all Maintainer: Matthew Bowra-Dean Uploaders: Maikel van den Hout , Paul Chote Installed-Size: {SIZE} -Depends: libopenal1, mono-runtime, libmono-winforms2.0-cil, libfreetype6, libsdl1.2debian, libgl1-mesa-glx, libgl1-mesa-dri, libmono-i18n2.0-cil +Depends: libopenal1, mono-runtime, libmono-winforms2.0-cil, libfreetype6, libsdl1.2debian, libgl1-mesa-glx, libgl1-mesa-dri, libmono-i18n2.0-cil, libgtk2.0-0, libwebkit-1.0-2 Section: games Priority: extra Homepage: http://www.open-ra.org/ diff --git a/packaging/linux/pkgbuild/PKGBUILD b/packaging/linux/pkgbuild/PKGBUILD index b0e84ec461..91617eb149 100644 --- a/packaging/linux/pkgbuild/PKGBUILD +++ b/packaging/linux/pkgbuild/PKGBUILD @@ -7,7 +7,7 @@ arch=(any) url="http://open-ra.org" license=('GPL3') groups=() -depends=('mono' 'openal' 'mesa' 'freetype2' 'sdl') +depends=('mono' 'openal' 'mesa' 'freetype2' 'sdl' 'gtk2' 'libwebkit') makedepends=('git' 'unzip' 'wget') optdepends=() provides=() diff --git a/packaging/linux/rpm/openra.spec b/packaging/linux/rpm/openra.spec index e3000c24f9..5217b0e6ab 100644 --- a/packaging/linux/rpm/openra.spec +++ b/packaging/linux/rpm/openra.spec @@ -9,7 +9,7 @@ License: GPL3 URL: http://open-ra.org Group: Amusements/Games Packager: Matthew Bowra-Dean -Requires: mono-core mono-devel SDL openal mesa-dri-drivers-experimental +Requires: mono-core mono-devel SDL openal mesa-dri-drivers-experimental gtk2 webkitgtk Prefix: /usr Source: %{name}-%{version}.tar.gz Buildroot: /tmp/openra