From e7b0e9ae398f891abfdf44e43deffb1cdf12c50b Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Fri, 1 Nov 2019 19:44:30 -0400 Subject: fix linux build --- frontends/gl/audio.c | 6 +++--- frontends/gl/audio.h | 6 +++--- frontends/gl/meson.build | 3 ++- ini | 2 +- 4 files changed, 9 insertions(+), 8 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 -#include #define format_str sprintf_s #else -#include #define format_str snprintf #endif +#include +#include + #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 -#include #define format_str sprintf_s #else -#include #define format_str snprintf #endif +#include +#include + 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 index 3401f2e..9b15f72 160000 --- a/ini +++ b/ini @@ -1 +1 @@ -Subproject commit 3401f2ed3153c6093c2f434e205cf6e7775a02d5 +Subproject commit 9b15f721fd53b1beb8364f8763e2207963ac4fd6 -- cgit v1.2.3-101-g0448