diff options
| author | kdx <kikoodx@paranoici.org> | 2023-05-11 00:58:42 +0200 |
|---|---|---|
| committer | kdx <kikoodx@paranoici.org> | 2023-05-11 01:07:06 +0200 |
| commit | 378f0a3965c917b0491e2b30938684584bb754f5 (patch) | |
| tree | 06ce44e334998d6df5841dfebe5675e025896da4 | |
| parent | 96b15868d306c8b3ded01fad8c37dc964baa767d (diff) | |
| download | tzr-378f0a3965c917b0491e2b30938684584bb754f5.tar.gz | |
drop sdl image dependency
| -rw-r--r-- | README.md | 2 | ||||
| -rwxr-xr-x | emscripten/emcc.sh | 2 | ||||
| -rw-r--r-- | main.c | 4 | ||||
| -rw-r--r-- | sources/TZR_DirectResourceLoad.c | 9 | ||||
| -rw-r--r-- | sources/TZR_Init.c | 3 | ||||
| -rw-r--r-- | sources/TZR_Quit.c | 2 |
6 files changed, 4 insertions, 18 deletions
@@ -38,7 +38,7 @@ Ce `if` englobant `TZR_Init` est nécessaire pour gérer toute erreur éventuell Nous pouvons maintenant compiler et lancer ce projet. ```sh -$ gcc -o game main.c TZR.c -lSDL2 -lSDL2_image -lSDL2_mixer +$ gcc -o game main.c TZR.c -lSDL2 -lSDL2_mixer ``` L'exécutable `game` devrait apparaitre. diff --git a/emscripten/emcc.sh b/emscripten/emcc.sh index e9378aa..91fffbd 100755 --- a/emscripten/emcc.sh +++ b/emscripten/emcc.sh @@ -1,7 +1,7 @@ #!/bin/sh cd .. make -emcc -sUSE_SDL=2 -sUSE_SDL_IMAGE=2 -sUSE_SDL_MIXER=2 -sALLOW_MEMORY_GROWTH \ +emcc -sUSE_SDL=2 -sUSE_SDL_MIXER=2 -sALLOW_MEMORY_GROWTH \ -Wno-initializer-overrides -std=c99 -O3 \ main.c TZR.c -o "$OLDPWD"/index.js --embed-file res cd "$OLDPWD" @@ -1,6 +1,4 @@ -/* gcc -std=c99 TZR.c main.c -lSDL2 -lSDL2_image -lSDL2_mixer */ -/* emcc -sUSE_SDL=2 -sUSE_SDL_IMAGE=2 -sUSE_SDL_MIXER=2 --preload-file res \ - * -Wno-initializer-overrides -std=c99 -o index.html TZR.c main.c */ +/* gcc -std=c99 TZR.c main.c -lSDL2 -lSDL2_mixer */ #include "TZR.h" diff --git a/sources/TZR_DirectResourceLoad.c b/sources/TZR_DirectResourceLoad.c index d2ee637..9c7153d 100644 --- a/sources/TZR_DirectResourceLoad.c +++ b/sources/TZR_DirectResourceLoad.c @@ -3,7 +3,6 @@ #include "sdl_error.h" #include <SDL2/SDL_mixer.h> #include <SDL2/SDL_render.h> -#include <SDL2/SDL_image.h> #include <SDL2/SDL_rwops.h> #include <string.h> @@ -24,13 +23,7 @@ TZR_DirectResourceLoad(TZR_Resource *res, const void *data, int size) SDL_RWops *const rw = SDL_RWFromConstMem(data, size); if (rw == NULL) return sdl_error(-1); - SDL_Surface *surf = IMG_Load_RW(rw, 1); - if (surf == NULL) { - SDL_RWops *const rw = SDL_RWFromConstMem(data, size); - if (rw == NULL) - return sdl_error(-1); - surf = SDL_LoadBMP_RW(rw, 1); - } + SDL_Surface *const surf = SDL_LoadBMP_RW(rw, 1); if (surf == NULL) return sdl_error(-1); SDL_Texture *const tex = diff --git a/sources/TZR_Init.c b/sources/TZR_Init.c index a10c2fb..316c8b8 100644 --- a/sources/TZR_Init.c +++ b/sources/TZR_Init.c @@ -2,7 +2,6 @@ #include "TZR_globals.h" #include "sdl_error.h" #include <SDL2/SDL.h> -#include <SDL2/SDL_image.h> #include <SDL2/SDL_mixer.h> #include <SDL2/SDL_mouse.h> #include <unistd.h> @@ -22,8 +21,6 @@ _TZR_Init(const TZR_Config *config) if (SDL_Init(SDL_INIT_VIDEO) < 0) return _sdl_error(); - if (IMG_Init(IMG_INIT_PNG * ___tzr_config.png_loading) < 0) - return _sdl_error(); if (___tzr_config.mixer == TZR_MIXER_FLAC && Mix_Init(MIX_INIT_FLAC) != MIX_INIT_FLAC) { diff --git a/sources/TZR_Quit.c b/sources/TZR_Quit.c index e11979e..13b29db 100644 --- a/sources/TZR_Quit.c +++ b/sources/TZR_Quit.c @@ -1,7 +1,6 @@ #include "TZR.h" #include "TZR_globals.h" #include <SDL2/SDL.h> -#include <SDL2/SDL_image.h> #include <SDL2/SDL_mixer.h> void @@ -30,6 +29,5 @@ TZR_Quit(void) Mix_CloseAudio(); Mix_Quit(); } - IMG_Quit(); SDL_Quit(); } |