z80: move to sdl2
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
From c12487107cc52aa13841533fd151362e37f37ff6 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Fri, 13 Mar 2015 01:40:33 +0100
|
||||
Subject: [PATCH] use pkg-config to find sdl
|
||||
Subject: [PATCH] use pkg-config to find sdl2
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
@@ -12,20 +12,20 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index de4782b..0dfc7ce 100644
|
||||
index 1144f9b..9bfef24 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -27,8 +27,8 @@ LIBS:= -L/usr/lib -lz
|
||||
CFLAGS+= -DDEBUG=$(DEBUG)
|
||||
@@ -27,8 +27,8 @@ LIBS:= -lz
|
||||
#CFLAGS+= -DDEBUG=$(DEBUG)
|
||||
|
||||
# SDL libraries and cflags
|
||||
-SDL_LIB:= $(shell sdl-config --libs)
|
||||
-SDL_INC:= $(shell sdl-config --cflags)
|
||||
+SDL_LIB:= $(shell pkg-config --libs sdl)
|
||||
+SDL_INC:= $(shell pkg-config --cflags sdl)
|
||||
-SDL_LIB:= $(shell sdl2-config --libs)
|
||||
-SDL_INC:= $(shell sdl2-config --cflags)
|
||||
+SDL_LIB:= $(shell pkg-config --libs sdl2)
|
||||
+SDL_INC:= $(shell pkg-config --cflags sdl2)
|
||||
|
||||
# Expat libraries and cflags
|
||||
EXPAT_LIB:= -L/usr/pkg/lib -lexpat
|
||||
--
|
||||
1.9.3
|
||||
2.5.5
|
||||
|
||||
|
||||
@@ -5,26 +5,26 @@ LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/schnitzeltony/z80.git;branch=master \
|
||||
git://github.com/schnitzeltony/z80.git;branch=sdl2 \
|
||||
file://0001-use-pkg-config-to-find-sdl.patch \
|
||||
file://cgenie.desktop \
|
||||
file://trs80.desktop \
|
||||
"
|
||||
|
||||
SRCREV= "413ca44336c4423ac0e39b55d75fce95ff4c31fc"
|
||||
SRCREV= "ec721e4a7f06f22a67e1a9c48f4d681143852e42"
|
||||
PV = "0.3.1+git${SRCPV}"
|
||||
|
||||
inherit pkgconfig
|
||||
|
||||
DEPENDS = "expat libsdl"
|
||||
DEPENDS = "expat libsdl2"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
EXTRA_OEMAKE = "-e MAKEFLAGS="
|
||||
|
||||
do_compile() {
|
||||
SDL_INC=$(pkg-config --cflags sdl)
|
||||
SDL_LIB=$(pkg-config --libs sdl)
|
||||
SDL_INC=$(pkg-config --cflags sdl2)
|
||||
SDL_LIB=$(pkg-config --libs sdl2)
|
||||
EXPAT_LIB=$(pkg-config --libs expat)
|
||||
|
||||
mkdir -p ${S}/obj/trs80
|
||||
|
||||
Reference in New Issue
Block a user