diff --git a/projects/Makefile b/projects/Makefile index 9c1ad0af..2de9394b 100644 --- a/projects/Makefile +++ b/projects/Makefile @@ -54,7 +54,7 @@ COMMONDIRS := \ ../sources/Externals/Compression \ ../sources/Externals/Soundfont \ ../sources/Externals/TinyXML - + #--------------------------------------------------------------------------------- # Linux #--------------------------------------------------------------------------------- @@ -99,7 +99,7 @@ SDL2DIRS := \ SDLAUDIODIRS := \ ../sources/Adapters/SDL/Audio - + SDL2AUDIODIRS := \ ../sources/Adapters/SDL2/Audio @@ -125,7 +125,7 @@ CAANOODIRS := \ ../sources/Adapters/CAANOO/Midi \ ../sources/Adapters/CAANOO/Audio \ ../sources/Adapters/SDL/GUI\ - ../sources/Adapters/SDL/Timer + ../sources/Adapters/SDL/Timer DINGUXDIRS := \ . \ @@ -144,7 +144,7 @@ DINGUXDIRS := \ DINGUXAUDIODIRS := \ ../sources/Adapters/DINGOO/Midi \ ../sources/Adapters/DINGOO/Audio - + DUMMYMIDIDIRS := \ ../sources/Adapters/Dummy/Midi @@ -223,7 +223,7 @@ W32DIRS := .\ COMMONFILES := \ Logger.o Trace.o Result.o Status.o Config.o \ - Timer.o FileSystem.o \ + Timer.o FileSystem.o FontConfig.o \ SysMutex.o TimeService.o \ MidiOutDevice.o MidiInDevice.o MidiService.o Groove.o \ MidiChannel.o MidiInMerger.o \ @@ -287,7 +287,7 @@ LINUXFILES := \ Process.o \ UnixProcess.o \ SDLTimer.o - + DBFILES := \ UnixFileSystem.o \ DEBmain.o \ @@ -321,7 +321,7 @@ JACKFILES := \ SDLAUDIOFILES := \ SDLAudioDriver.o \ SDLAudio.o - + DEBFILES := $(DBFILES) $(RTAUDIOFILES) $(RTMIDIFILES) $(JACKFILES) BEAGLEBOARDFILES := $(LINUXFILES) $(DUMMYMIDIFILES) RASPIFILES := $(LINUXFILES) $(RTAUDIOFILES) $(RTMIDIFILES) $(JACKFILES) @@ -540,7 +540,7 @@ all: $(OUTPUT).$(EXTENSION) $(OUTPUT).exe : $(OFILES) @echo "linking result.." @$(LD) $(LDFLAGS) -o $@ $(OFILES) $(LIBS) - + $(OUTPUT).fxe : $(OUTPUT).gxb $(OUTPUT).gxb : $(OUTPUT).elf diff --git a/projects/config.xml b/projects/config.xml deleted file mode 100644 index 245de33c..00000000 --- a/projects/config.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/projects/lgpt.vcxproj b/projects/lgpt.vcxproj index ffa57d6d..a73aa4e1 100644 --- a/projects/lgpt.vcxproj +++ b/projects/lgpt.vcxproj @@ -266,6 +266,7 @@ + @@ -407,6 +408,7 @@ + @@ -518,4 +520,4 @@ - \ No newline at end of file + diff --git a/projects/resources/CHIP/config.xml b/projects/resources/CHIP/config.xml index 9265752c..f28cd50f 100644 --- a/projects/resources/CHIP/config.xml +++ b/projects/resources/CHIP/config.xml @@ -32,4 +32,5 @@ + diff --git a/projects/resources/DEB/config.xml b/projects/resources/DEB/config.xml index f47f24e5..69226ded 100644 --- a/projects/resources/DEB/config.xml +++ b/projects/resources/DEB/config.xml @@ -25,5 +25,6 @@ + diff --git a/projects/resources/GARLIC/config.xml b/projects/resources/GARLIC/config.xml index 2ecb1fe1..6ecee55a 100644 --- a/projects/resources/GARLIC/config.xml +++ b/projects/resources/GARLIC/config.xml @@ -12,4 +12,5 @@ - \ No newline at end of file + + diff --git a/projects/resources/GARLICPLUS/config.xml b/projects/resources/GARLICPLUS/config.xml index 21d43983..dd9e3aef 100644 --- a/projects/resources/GARLICPLUS/config.xml +++ b/projects/resources/GARLICPLUS/config.xml @@ -14,4 +14,5 @@ + diff --git a/projects/resources/MACOS/config.xml b/projects/resources/MACOS/config.xml index 6ff577ef..184bdbab 100644 --- a/projects/resources/MACOS/config.xml +++ b/projects/resources/MACOS/config.xml @@ -25,6 +25,7 @@ - + + diff --git a/projects/resources/MIYOO/config.xml b/projects/resources/MIYOO/config.xml index e3905c70..439dd925 100644 --- a/projects/resources/MIYOO/config.xml +++ b/projects/resources/MIYOO/config.xml @@ -25,5 +25,6 @@ root of your sd card. + diff --git a/projects/resources/PSP/config.xml b/projects/resources/PSP/config.xml index daf7f2e0..67cd759d 100644 --- a/projects/resources/PSP/config.xml +++ b/projects/resources/PSP/config.xml @@ -13,5 +13,6 @@ + diff --git a/projects/resources/RG35XXPLUS/config.xml b/projects/resources/RG35XXPLUS/config.xml index cea9fe0a..09f4a9b9 100644 --- a/projects/resources/RG35XXPLUS/config.xml +++ b/projects/resources/RG35XXPLUS/config.xml @@ -12,4 +12,5 @@ - \ No newline at end of file + + diff --git a/projects/resources/X64/config.xml b/projects/resources/X64/config.xml index f47f24e5..69226ded 100644 --- a/projects/resources/X64/config.xml +++ b/projects/resources/X64/config.xml @@ -25,5 +25,6 @@ + diff --git a/projects/resources/config.xml b/projects/resources/config.xml deleted file mode 100644 index 0340f09e..00000000 --- a/projects/resources/config.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/projects/resources/packaging/config.xml b/projects/resources/packaging/config.xml deleted file mode 100644 index a8acafe2..00000000 --- a/projects/resources/packaging/config.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/projects/resources/packaging/lgpt_package.sh b/projects/resources/packaging/lgpt_package.sh index 8185fc49..e3dbb730 100755 --- a/projects/resources/packaging/lgpt_package.sh +++ b/projects/resources/packaging/lgpt_package.sh @@ -21,6 +21,7 @@ collect_resources() { #1PLATFORM #2lgpt.*-exe PACKAGE=LGPT-$1-$VERSION.zip echo "-=-=Packaging $PACKAGE=-=-" CONTENTS="./resources/$1/*" + CONTENTS+="./custom_font.xml" CONTENTS+=" $(find . -iname $2)" if [ "$1" == "PSP" ] || [ "$1" == "GARLIC" ] ||