Do not pick up SDLmain from sdl-1.x. Use SDL2main from sdl-2.x instead.

Reported by sthen@ and ajacoutot@, thanks!
This commit is contained in:
kirby 2018-09-02 21:13:35 +00:00
parent 0d01b9552a
commit f072393fa5
2 changed files with 16 additions and 1 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.74 2018/08/26 12:24:50 kirby Exp $
# $OpenBSD: Makefile,v 1.75 2018/09/02 21:13:35 kirby Exp $
PORTROACH = limitw:1,even
@ -6,6 +6,7 @@ BROKEN-hppa = missing atomic ops
COMMENT= fantasy turn-based strategy game
DISTNAME= wesnoth-1.14.4
REVISION= 0
CATEGORIES= games x11

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-cmake_FindSDL2_cmake,v 1.1 2018/09/02 21:13:35 kirby Exp $
Index: cmake/FindSDL2.cmake
--- cmake/FindSDL2.cmake.orig
+++ cmake/FindSDL2.cmake
@@ -132,7 +132,7 @@ if(NOT SDL2_BUILDING_LIBRARY)
# seem to provide SDLmain for compatibility even though they don't
# necessarily need it.
find_library(SDL2MAIN_LIBRARY
- NAMES SDLmain SDLmain-1.1
+ NAMES SDL2main
HINTS
ENV SDL2DIR
PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX}