Changeset ea878ba in buchla-emu

Timestamp:

08/01/2017 05:46:02 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

bdd5a63

Parents:

74c44d9

Message:

Added SDL_net for networking.

Files:

• Makefile (modified) (3 diffs)
• emu/all.h (modified) (1 diff)
• emu/sdl.c (modified) (2 diffs)
• readme.txt (modified) (3 diffs)

Makefile

@@ -32 +32 @@
 FLAGS_LNK :=    $(FLAGS) -pthread -Wall -Wextra
 LIBS :=                 $(SDL2_LIB)/libSDL2.a \
+                                $(SDL2_LIB)/libSDL2_net.a \
                                 $(SDL2_LIB)/libSDL2_ttf.a \
                                 $(SDL2_LIB)/libfreetype.a \
@@ -41 +42 @@
 FLAGS_LNK :=    $(FLAGS) -Wall -Wextra
 LIBS :=                 $(SDL2_LIB)/libSDL2.a \
+                                $(SDL2_LIB)/libSDL2_net.a \
                                 $(SDL2_LIB)/libSDL2_ttf.a \
                                 $(SDL2_LIB)/libfreetype.a \
@@ -60 +62 @@
                                 $(SDL2_LIB)/libSDL2.a \
                                 $(SDL2_LIB)/libSDL2main.a \
+                                $(SDL2_LIB)/libSDL2_net.a \
                                 $(SDL2_LIB)/libSDL2_ttf.a \
                                 $(SDL2_LIB)/libfreetype.a \
                                 -l gdi32 \
                                 -l imm32 \
+                                -l iphlpapi \
                                 -l ole32 \
                                 -l oleaut32 \
                                 -l version \
-                                -l winmm
+                                -l winmm \
+                                -l ws2_32
 endif
 

emu/all.h

@@ -28 +28 @@
 
 #include <SDL2/SDL.h>
+#include <SDL2/SDL_net.h>
 #include <SDL2/SDL_ttf.h>
 

emu/sdl.c

@@ -33 +33 @@
         SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_VERBOSE);
 
+        if (SDLNet_Init() < 0) {
+                fail("SDLNet_Init() failed: %s", SDLNet_GetError());
+        }
+
         if (TTF_Init() < 0) {
                 fail("TTF_Init() failed: %s", TTF_GetError());
@@ -44 +48 @@
 {
         TTF_Quit();
+        SDLNet_Quit();
         SDL_Quit();
 }

readme.txt

@@ -26 +26 @@
   https://libsdl.org/
 
-The SDL2 website also hosts the SDL2_ttf project, which adds support
-for TrueType fonts to SDL2. SDL2_ttf, in turn, requires the FreeType
-library, which is available from the FreeType website:
+The SDL2 website also hosts the SDL2_net and SDL2_ttf projects, which
+add support for networking and TrueType fonts to SDL2
+
+SDL2_ttf, in turn, requires the FreeType library, which is available
+from the FreeType website:
 
   https://www.freetype.org/
@@ -67 +69 @@
   make install
 
-  # Build and install SDL2_ttf last
+  # Build and install SDL2_ttf, now that we have FreeType and SDL2
 
   tar zxvf SDL2_ttf-2.0.14.tar.gz
@@ -76 +78 @@
   ../configure --prefix=/opt/sdl2 \
     --with-sdl-prefix=/opt/sdl2 --with-freetype-prefix=/opt/sdl2
+
+  make
+  make install
+
+  # Build and install SDL2_net last
+
+  tar zxvf SDL2_net-2.0.1.tar.gz
+  cd SDL2_net-2.0.1
+  mkdir build
+  cd build
+
+  ../configure --prefix=/opt/sdl2 --with-sdl-prefix=/opt/sdl2
 
   make