summaryrefslogtreecommitdiffstats
path: root/package/games
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2009-07-25 09:13:44 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2009-07-25 09:13:44 +0200
commit441c122606e3a921a947f4126a414c9974d64533 (patch)
treea6ad7f810150142b2d0f2a51ee49a1ddbff285a5 /package/games
parent8c1fc169ab7330ddaed774d1e780b9d81edb4f25 (diff)
parent74ecbaa23da486182a1bb20b43361aaf2a478877 (diff)
downloadbuildroot-novena-441c122606e3a921a947f4126a414c9974d64533.tar.gz
buildroot-novena-441c122606e3a921a947f4126a414c9974d64533.zip
Merge branch 'xorg' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/games')
-rw-r--r--package/games/ace_of_penguins/Config.in2
-rw-r--r--package/games/ace_of_penguins/ace_of_penguins.mk2
-rw-r--r--package/games/lxdoom/Config.in2
3 files changed, 3 insertions, 3 deletions
diff --git a/package/games/ace_of_penguins/Config.in b/package/games/ace_of_penguins/Config.in
index 3e1a9db2f..edbaf26ce 100644
--- a/package/games/ace_of_penguins/Config.in
+++ b/package/games/ace_of_penguins/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_ACE_OF_PENGUINS
bool "ace_of_penguins"
select BR2_PACKAGE_LIBPNG
- depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7
+ depends on BR2_PACKAGE_XORG7
help
The Ace of Penguins is a set of Unix/X solitaire games based
on the ones available for Windows but with a number of
diff --git a/package/games/ace_of_penguins/ace_of_penguins.mk b/package/games/ace_of_penguins/ace_of_penguins.mk
index 2aaf7aac8..2e4fda6e9 100644
--- a/package/games/ace_of_penguins/ace_of_penguins.mk
+++ b/package/games/ace_of_penguins/ace_of_penguins.mk
@@ -10,6 +10,6 @@ ACE_OF_PENGUINS_AUTORECONF = YES
ACE_OF_PENGUINS_STAGING = NO
ACE_OF_PENGUINS_TARGET = YES
-ACE_OF_PENGUINS_DEPENDENCIES = uclibc libpng $(XSERVER)
+ACE_OF_PENGUINS_DEPENDENCIES = uclibc libpng xserver_xorg-server
$(eval $(call AUTOTARGETS,package/games,ace_of_penguins))
diff --git a/package/games/lxdoom/Config.in b/package/games/lxdoom/Config.in
index 8eb7d5280..ebef9f5e6 100644
--- a/package/games/lxdoom/Config.in
+++ b/package/games/lxdoom/Config.in
@@ -1,5 +1,5 @@
config BR2_PACKAGE_LXDOOM
bool "lxdoom"
- depends on !BR2_PACKAGE_XSERVER_none
+ depends on BR2_PACKAGE_XORG7
help
This is the linux version of the popular doom game.