mirror of
https://github.com/FunKey-Project/Bibi.git
synced 2025-12-12 17:58:53 +01:00
sdl_mixer cross-compiling for FunKey (added libmikmod-config commands in Makefile)
This commit is contained in:
parent
9c6fec17a2
commit
00321a6899
7
Makefile
7
Makefile
@ -6,10 +6,15 @@ TARGET_FUNKEY ?= 1
|
|||||||
|
|
||||||
ifeq ($(TARGET_FUNKEY),1)
|
ifeq ($(TARGET_FUNKEY),1)
|
||||||
SDL_INCLUDES = $(shell /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/sdl-config --cflags)
|
SDL_INCLUDES = $(shell /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/sdl-config --cflags)
|
||||||
SDL_LIBS = $(shell /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/sdl-config --libs) -Wl,--as-needed -Wl,--gc-sections -Wl,-O1,--sort-common -flto -s
|
SDL_INCLUDES += $(shell /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/libmikmod-config --cflags)
|
||||||
|
SDL_LIBS = $(shell /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/sdl-config --libs)
|
||||||
|
SDL_LIBS += $(shell /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/libmikmod-config --libs)
|
||||||
|
SDL_LIBS += -Wl,--as-needed -Wl,--gc-sections -Wl,-O1,--sort-common -flto -s
|
||||||
else
|
else
|
||||||
SDL_INCLUDES = `sdl-config --cflags`
|
SDL_INCLUDES = `sdl-config --cflags`
|
||||||
|
SDL_INCLUDES += `libmikmod-config --cflags`
|
||||||
SDL_LIBS = `sdl-config --libs`
|
SDL_LIBS = `sdl-config --libs`
|
||||||
|
SDL_LIBS += `libmikmod-config --libs`
|
||||||
endif
|
endif
|
||||||
|
|
||||||
DEPFLAGS = $(SDL_INCLUDES)
|
DEPFLAGS = $(SDL_INCLUDES)
|
||||||
|
|||||||
@ -2,10 +2,9 @@
|
|||||||
#define CONSTANT_H_
|
#define CONSTANT_H_
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Use Sound ?
|
// Use Sound ?
|
||||||
//#define SOUND_FMOD_ACTIVATED
|
//#define SOUND_FMOD_ACTIVATED
|
||||||
//#define SOUND_SDL_ACTIVATED
|
#define SOUND_SDL_ACTIVATED
|
||||||
|
|
||||||
// Resize ?
|
// Resize ?
|
||||||
#define HW_SCREEN_RESIZE
|
#define HW_SCREEN_RESIZE
|
||||||
|
|||||||
@ -18,7 +18,7 @@
|
|||||||
#endif //SOUND_FMOD_ACTIVATED
|
#endif //SOUND_FMOD_ACTIVATED
|
||||||
|
|
||||||
#ifdef SOUND_SDL_ACTIVATED
|
#ifdef SOUND_SDL_ACTIVATED
|
||||||
#include "SDL_mixer.h"
|
#include <SDL/SDL_mixer.h>
|
||||||
#endif //SOUND_SDL_ACTIVATED
|
#endif //SOUND_SDL_ACTIVATED
|
||||||
bool audio_init_ok = false;
|
bool audio_init_ok = false;
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user