ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: Don't prepend folder name for SDL.h. 

This fixes pkgconfig SDL2 detection when SDL2 is installed in a non-standard location.

Signed-off-by: Dean M Greer <gcenx83@gmail.com>
Signed-off-by: Gijs Vermeulen <gijsvrm@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Dean M Greer 2020-12-02 21:31:15 +01:00 committed by Alexandre Julliard
parent 574ced0dc6
commit e4fbae832c
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -14966,12 +14966,12 @@ $as_echo "$as_me:${as_lineno-$LINENO}: sdl2 cflags: $SDL2_CFLAGS" >&5
$as_echo "$as_me:${as_lineno-$LINENO}: sdl2 libs: $SDL2_LIBS" >&5
ac_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $SDL2_CFLAGS"
for ac_header in SDL2/SDL.h
for ac_header in SDL.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "SDL2/SDL.h" "ac_cv_header_SDL2_SDL_h" "$ac_includes_default"
if test "x$ac_cv_header_SDL2_SDL_h" = xyes; then :
ac_fn_c_check_header_mongrel "$LINENO" "SDL.h" "ac_cv_header_SDL_h" "$ac_includes_default"
if test "x$ac_cv_header_SDL_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SDL2_SDL_H 1
#define HAVE_SDL_H 1
_ACEOF
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lSDL2" >&5
$as_echo_n "checking for -lSDL2... " >&6; }

2
configure.ac
View File

@ -1712,7 +1712,7 @@ dnl **** Check for libSDL2 ****
if test "x$with_sdl" != "xno"
then
WINE_PACKAGE_FLAGS(SDL2,[sdl2],[-lSDL2],,,
[AC_CHECK_HEADERS([SDL2/SDL.h],
[AC_CHECK_HEADERS([SDL.h],
[WINE_CHECK_SONAME(SDL2,SDL_Init,,,[$SDL2_LIBS],[[libSDL2-2.0*]])])])
fi
WINE_NOTICE_WITH(sdl,[test "x$ac_cv_lib_soname_SDL2" = "x"],

4
dlls/winebus.sys/bus_sdl.c
View File

@ -27,8 +27,8 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#ifdef HAVE_SDL2_SDL_H
# include <SDL2/SDL.h>
#ifdef HAVE_SDL_H
# include <SDL.h>
#endif
#define NONAMELESSUNION

4
include/config.h.in
View File

@ -738,8 +738,8 @@
/* Define to 1 if you have the <scsi/sg.h> header file. */
#undef HAVE_SCSI_SG_H
/* Define to 1 if you have the <SDL2/SDL.h> header file. */
#undef HAVE_SDL2_SDL_H
/* Define to 1 if you have the <SDL.h> header file. */
#undef HAVE_SDL_H
/* Define to 1 if you have the <Security/Security.h> header file. */
#undef HAVE_SECURITY_SECURITY_H