diff options
| author |   Andrew Opalach <andrew@akon.city>
| 2019-11-01 19:44:30 -0400 |
|---|---|---|
| committer | Andrew Opalach <andrew@akon.city>
| 2019-11-01 19:44:30 -0400 |
| commit | e7b0e9ae398f891abfdf44e43deffb1cdf12c50b (patch) | |
| tree | 9a5aa065f0dd912d537d5312f909b4daadd14a85 | |
| parent | 1b5a866510c4f74ad0a744306a2444ad2b226803 (diff) | |
| download | cetris-e7b0e9ae398f891abfdf44e43deffb1cdf12c50b.tar.gz cetris-e7b0e9ae398f891abfdf44e43deffb1cdf12c50b.tar.bz2 cetris-e7b0e9ae398f891abfdf44e43deffb1cdf12c50b.zip | |
fix linux build
| -rw-r--r-- | frontends/gl/audio.c | 6 | ||||
| -rw-r--r-- | frontends/gl/audio.h | 6 | ||||
| -rw-r--r-- | frontends/gl/meson.build | 3 | ||||
| m--------- | ini | 0 |
4 files changed, 8 insertions, 7 deletions
diff --git a/frontends/gl/audio.c b/frontends/gl/audio.c index 1321f2e..1e194a2 100644 --- a/frontends/gl/audio.c +++ b/frontends/gl/audio.c @@ -1,12 +1,12 @@ #ifdef _WIN32 -#include <SDL.h> -#include <SDL_mixer.h> #define format_str sprintf_s #else -#include <SDL2/SDL.h> #define format_str snprintf #endif +#include <SDL.h> +#include <SDL_mixer.h> + #include "audio.h" void load_multiple_audio(char* name, char* dir_name, int *count, Mix_Chunk** list) { diff --git a/frontends/gl/audio.h b/frontends/gl/audio.h index 61c1cd1..aef8f9d 100644 --- a/frontends/gl/audio.h +++ b/frontends/gl/audio.h @@ -1,12 +1,12 @@ #pragma once #ifdef _WIN32 -#include <SDL.h> -#include <SDL_mixer.h> #define format_str sprintf_s #else -#include <SDL2/SDL.h> #define format_str snprintf #endif +#include <SDL.h> +#include <SDL_mixer.h> + void load_multiple_audio(char* name, char* dir_name, int *count, Mix_Chunk** list); diff --git a/frontends/gl/meson.build b/frontends/gl/meson.build index cf2eeba..55517d1 100644 --- a/frontends/gl/meson.build +++ b/frontends/gl/meson.build @@ -11,7 +11,8 @@ if host_machine.system() == 'windows' else deps += compiler.find_library('m') deps += compiler.find_library('dl') - deps += dependency('SDl2') + deps += dependency('SDL2') + deps += dependency('SDL2_mixer') endif executable('cetris', src, diff --git a/ini b/ini -Subproject 3401f2ed3153c6093c2f434e205cf6e7775a02d +Subproject 9b15f721fd53b1beb8364f8763e2207963ac4fd |