Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions projects/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ DUMMYMIDIDIRS := \
BITTBOYDIRS := $(DINGUXDIRS) $(DINGUXAUDIODIRS)
DINGOODIRS := $(DINGUXDIRS) $(DINGUXAUDIODIRS) $(DUMMYMIDIDIRS)
MIYOODIRS := $(DINGUXDIRS) $(DUMMYMIDIDIRS)
GARLICDIRS := $(MIYOODIRS)
GARLICPLUSDIRS := $(GARLICDIRS)
GARLICDIRS := $(DINGUXDIRS) $(RTMIDIDIRS)
GARLICPLUSDIRS := $(MIYOODIRS)
RS97DIRS := $(DINGUXDIRS) $(DINGUXAUDIODIRS)

GP2XDIRS := \
Expand Down Expand Up @@ -413,8 +413,8 @@ MIYOOFILES := \
MIYOOSystem.o \
SDLAudio.o

GARLICFILES = $(MIYOOFILES)
GARLICPLUSFILES = $(GARLICFILES)
GARLICFILES = $(DINGUXFILES) $(RTMIDIFILES) MIYOOSystem.o SDLAudio.o
GARLICPLUSFILES = $(MIYOOFILES)

NDSFILES := \
NDSmain.o \
Expand Down
7 changes: 5 additions & 2 deletions projects/Makefile.GARLIC
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ DEFINES := \
-DCPP_MEMORY \
-D_NDEBUG \
-DHAVE_STDINT_H \
-D_NO_JACK_
-DRTMIDI \
-D_NO_JACK_ \
-D__LINUX_ALSA__ \
-D__LINUX_ALSASEQ__

DEVKIT = /opt/miyoo/
CROSS_COMPILE=$(DEVKIT)bin/arm-miyoo-linux-uclibcgnueabi-
Expand All @@ -25,7 +28,7 @@ PREFIX := arm-linux-gnueabihf-
INCLUDES:= -Iinclude $(SDL_CFLAGS) -I$(PWD)/../sources
CFLAGS := $(DEFINES) $(INCLUDES) $(OPT_FLAGS) -Wall
CXXFLAGS:= $(CFLAGS) -std=gnu++03
LIBS := $(SDL_LIBS) -lpthread
LIBS := $(SDL_LIBS) -lpthread -lasound
LIBDIRS := $(DEKVIT)/usr/lib
LIBDIRS += $(DEKVIT)/usr/include
OUTPUT := ../lgpt-garlic
Expand Down
15 changes: 12 additions & 3 deletions sources/Adapters/DINGOO/System/MIYOOSystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@
#include "Adapters/SDL/GUI/SDLEventManager.h"
#include "Adapters/SDL/Process/SDLProcess.h"
#include "Adapters/SDL/Audio/SDLAudio.h"
#ifdef _NO_MIDI_
#include "Adapters/Dummy/Midi/DummyMidi.h"
#elif RTMIDI
#include "Adapters/RTMidi/RTMidiService.h"
#endif
#include "Externals/TinyXML/tinyxml.h"
#include "Application/Model/Config.h"
#include "Application/Controllers/ControlRoom.h"
Expand Down Expand Up @@ -72,9 +76,14 @@ void GPSDLSystem::Boot(int argc,char **argv) {
Audio::Install(new SDLAudio(hint));

// Install Midi
MidiService::Install(new DummyMidi());

// Install Threads
#ifdef _NO_MIDI_
Trace::Log("System","Installing DUMMY MIDI") ;
MidiService::Install(new DummyMidi());
#elif RTMIDI
Trace::Log("System","Installing RT MIDI") ;
MidiService::Install(new RTMidiService()) ;
#endif
// Install Threads
SysProcessFactory::Install(new SDLProcessFactory());
if (SDL_Init(SDL_INIT_EVENTTHREAD | SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_TIMER) < 0) {
return;
Expand Down
2 changes: 1 addition & 1 deletion sources/Application/Model/Project.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#define PROJECT_NUMBER "1"
#define PROJECT_RELEASE "6"
#define BUILD_COUNT "0-bacon1"
#define BUILD_COUNT "0-garlicmidi"

#define MAX_TAP 3

Expand Down