fix pkg-config file 'requires' field, a few build clean-ups.

Author: sezero

Android.mk

@@ -9,7 +9,7 @@ LOCAL_CFLAGS :=
 
 LOCAL_SRC_FILES := src/SDLnet.c src/SDLnetTCP.c src/SDLnetUDP.c src/SDLnetselect.c
 
-LOCAL_SHARED_LIBRARIES := SDL2
+LOCAL_SHARED_LIBRARIES := SDL3
 
 LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/include
 

Makefile.am

@@ -20,7 +20,6 @@ EXTRA_DIST = \
 	CHANGES.txt 		\
 	CMakeLists.txt		\
 	LICENSE.txt 		\
-	Makefile.os2		\
 	Makefile.psp		\
 	README.txt 		\
 	SDL2_net.spec		\

Makefile.in

@@ -428,7 +428,6 @@ EXTRA_DIST = \
 	CHANGES.txt 		\
 	CMakeLists.txt		\
 	LICENSE.txt 		\
-	Makefile.os2		\
 	Makefile.psp		\
 	README.txt 		\
 	SDL2_net.spec		\

Makefile.os2

@@ -5,7 +5,7 @@ OBJS= src/SDLnet.o \
       src/SDLnetUDP.o \
 
 INCDIR = include src
-CFLAGS = -g -O2 -G0 -Wall -D__PSP__ -I$(shell psp-config --psp-prefix)/include/SDL2
+CFLAGS = -g -O2 -G0 -Wall -D__PSP__ -I$(shell psp-config --psp-prefix)/include
 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti
 ASFLAGS = $(CFLAGS)
 

Makefile.psp

@@ -6,7 +6,7 @@ includedir=@includedir@
 Name: SDL2_net
 Description: net library for Simple DirectMedia Layer
 Version: @VERSION@
-Requires: sdl2 >= @SDL_VERSION@
+Requires: sdl3 >= @SDL_VERSION@
 @ENABLE_SHARED_TRUE@Libs: -L${libdir} -lSDL2_net
 @ENABLE_SHARED_TRUE@@ENABLE_STATIC_TRUE@Libs.private: @INETLIB@
 @ENABLE_SHARED_FALSE@Libs: -L${libdir} -lSDL2_net @INETLIB@

SDL2_net.pc.in

@@ -70,17 +70,6 @@ else
     not_ok "CMakeLists.txt SDL_REQUIRED_VERSION=$sdl_req disagrees with configure.ac SDL_VERSION=$ref_sdl_req"
 fi
 
-major=$(sed -ne 's/^MAJOR_VERSION *= *//p' Makefile.os2)
-minor=$(sed -ne 's/^MINOR_VERSION *= *//p' Makefile.os2)
-micro=$(sed -ne 's/^MICRO_VERSION *= *//p' Makefile.os2)
-version="${major}.${minor}.${micro}"
-
-if [ "$ref_version" = "$version" ]; then
-    ok "Makefile.os2 $version"
-else
-    not_ok "Makefile.os2 $version disagrees with $header $ref_version"
-fi
-
 for rcfile in src/version.rc VisualC/Version.rc; do
     tuple=$(sed -ne 's/^ *FILEVERSION *//p' "$rcfile" | tr -d '\r')
     ref_tuple="${ref_major},${ref_minor},${ref_micro},0"

acinclude/sdl2.m4

@@ -12606,14 +12606,6 @@ case "$host" in
         use_version_rc=true
         LT_EXTRA="-Wl,src/version.o"
         ;;
-    *-*-os2*)
-        # disable static builds on os/2
-        enable_static=no
-        # -DBUILD_SDL is needed for DECLSPEC
-        CFLAGS="$CFLAGS -DBUILD_SDL"
-        # OS/2 does not support a DLL name longer than 8 characters.
-        LT_EXTRA="-os2dllname SDL2net"
-        ;;
 esac
  if test x$use_version_rc = xtrue; then
   USE_VERSION_RC_TRUE=
@@ -12699,7 +12691,7 @@ CheckVisibilityHidden()
 printf %s "checking for GCC -fvisibility=hidden option... " >&6; }
     have_gcc_fvisibility=no
     case "$host" in
-    *-*-cygwin* | *-*-mingw* | *-*-os2*)
+    *-*-cygwin* | *-*-mingw*)
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ignored for $host_os" >&5
 printf "%s\n" "ignored for $host_os" >&6; }
         return

build-scripts/test-versioning.sh

@@ -92,14 +92,6 @@ case "$host" in
         use_version_rc=true
         LT_EXTRA="-Wl,src/version.o"
         ;;
-    *-*-os2*)
-        # disable static builds on os/2
-        enable_static=no
-        # -DBUILD_SDL is needed for DECLSPEC
-        CFLAGS="$CFLAGS -DBUILD_SDL"
-        # OS/2 does not support a DLL name longer than 8 characters.
-        LT_EXTRA="-os2dllname SDL2net"
-        ;;
 esac
 AM_CONDITIONAL(USE_VERSION_RC, test x$use_version_rc = xtrue)
 
@@ -162,7 +154,7 @@ CheckVisibilityHidden()
     AC_MSG_CHECKING(for GCC -fvisibility=hidden option)
     have_gcc_fvisibility=no
     case "$host" in
-    *-*-cygwin* | *-*-mingw* | *-*-os2*)
+    *-*-cygwin* | *-*-mingw*)
         AC_MSG_RESULT([ignored for $host_os])
         return
         ;;