Skip to content

Commit

Permalink
Fix makefile, vs proj, configs, packaging
Browse files Browse the repository at this point in the history
  • Loading branch information
djdiskmachine committed Sep 12, 2024
1 parent 187702d commit 78c8914
Show file tree
Hide file tree
Showing 15 changed files with 24 additions and 84 deletions.
16 changes: 8 additions & 8 deletions projects/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ COMMONDIRS := \
../sources/Externals/Compression \
../sources/Externals/Soundfont \
../sources/Externals/TinyXML

#---------------------------------------------------------------------------------
# Linux
#---------------------------------------------------------------------------------
Expand Down Expand Up @@ -99,7 +99,7 @@ SDL2DIRS := \

SDLAUDIODIRS := \
../sources/Adapters/SDL/Audio

SDL2AUDIODIRS := \
../sources/Adapters/SDL2/Audio

Expand All @@ -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 := \
. \
Expand All @@ -144,7 +144,7 @@ DINGUXDIRS := \
DINGUXAUDIODIRS := \
../sources/Adapters/DINGOO/Midi \
../sources/Adapters/DINGOO/Audio

DUMMYMIDIDIRS := \
../sources/Adapters/Dummy/Midi

Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -287,7 +287,7 @@ LINUXFILES := \
Process.o \
UnixProcess.o \
SDLTimer.o

DBFILES := \
UnixFileSystem.o \
DEBmain.o \
Expand Down Expand Up @@ -321,7 +321,7 @@ JACKFILES := \
SDLAUDIOFILES := \
SDLAudioDriver.o \
SDLAudio.o

DEBFILES := $(DBFILES) $(RTAUDIOFILES) $(RTMIDIFILES) $(JACKFILES)
BEAGLEBOARDFILES := $(LINUXFILES) $(DUMMYMIDIFILES)
RASPIFILES := $(LINUXFILES) $(RTAUDIOFILES) $(RTMIDIFILES) $(JACKFILES)
Expand Down Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions projects/config.xml
View file

This file was deleted.

4 changes: 3 additions & 1 deletion projects/lgpt.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,7 @@
<ClCompile Include="..\sources\Application\Model\Project.cpp" />
<ClCompile Include="..\sources\Application\Model\Song.cpp" />
<ClCompile Include="..\sources\Application\Model\Table.cpp" />
<ClCompile Include="..\sources\Application\Model\FontConfig.cpp" />
<ClCompile Include="..\sources\Application\views\ChainView.cpp" />
<ClCompile Include="..\sources\Application\views\ConsoleView.cpp" />
<ClCompile Include="..\sources\Application\views\GrooveView.cpp" />
Expand Down Expand Up @@ -407,6 +408,7 @@
<ClInclude Include="..\sources\Application\Model\Project.h" />
<ClInclude Include="..\sources\Application\Model\Song.h" />
<ClInclude Include="..\sources\Application\Model\Table.h" />
<ClInclude Include="..\sources\Application\Model\FontConfig.h" />
<ClInclude Include="..\sources\Application\views\ChainView.h" />
<ClInclude Include="..\sources\Application\views\ConsoleView.h" />
<ClInclude Include="..\sources\Application\views\GrooveView.h" />
Expand Down Expand Up @@ -518,4 +520,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
1 change: 1 addition & 0 deletions projects/resources/CHIP/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@
<ROWCOLOR1 value = "BA28F9"/> <!--Row count color 1 -->
<ROWCOLOR2 value = "FF00FF"/> <!--Row count color 2-->
<ALTROWNUMBER value = "4"/> <!--How many rows before alternating-->
<FONTTYPE value = '0' /> <!-- '0':original '1':digital '2':monster 'CUSTOM': load custom_font.xml-->
</CONFIG>
1 change: 1 addition & 0 deletions projects/resources/DEB/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
<ROWCOLOR1 value = "BA28F9"/> <!--Row count color 1 -->
<ROWCOLOR2 value = "FF00FF"/> <!--Row count color 2-->
<ALTROWNUMBER value = "4"/> <!--How many rows before alternating-->
<FONTTYPE value = '0' /> <!-- '0':original '1':digital '2':monster 'CUSTOM': load custom_font.xml-->

</CONFIG>
3 changes: 2 additions & 1 deletion projects/resources/GARLIC/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@
<KEY_START value="key:0:m" />
<KEYDELAY value="200"/>
<KEYREPEAT value="100" />
</CONFIG>
<FONTTYPE value = '0' /> <!-- '0':original '1':digital '2':monster 'CUSTOM': load custom_font.xml-->
</CONFIG>
1 change: 1 addition & 0 deletions projects/resources/GARLICPLUS/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@
<KEYDELAY value="200"/>
<KEYREPEAT value="100" />
<DUMPEVENT value="NO" />
<FONTTYPE value = '0' /> <!-- '0':original '1':digital '2':monster 'CUSTOM': load custom_font.xml-->
</CONFIG>
3 changes: 2 additions & 1 deletion projects/resources/MACOS/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<ROWCOLOR1 value = "BA28F9"/> <!--Row count color 1 -->
<ROWCOLOR2 value = "FF00FF"/> <!--Row count color 2-->
<ALTROWNUMBER value = "4"/> <!--How many rows before alternating-->
<MAJORBEAT value = "BA28F9"/> <!--major beat color -->
<MAJORBEAT value = "BA28F9"/> <!--major beat color -->
<FONTTYPE value = '0' /> <!-- '0':original '1':digital '2':monster 'CUSTOM': load custom_font.xml-->

</CONFIG>
1 change: 1 addition & 0 deletions projects/resources/MIYOO/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@ root of your sd card.
<ROWCOLOR1 value = "BA28F9"/> <!--Row count color 1 -->
<ROWCOLOR2 value = "FF00FF"/> <!--Row count color 2-->
<ALTROWNUMBER value = "4"/> <!--How many rows before alternating-->
<FONTTYPE value = '0' /> <!-- '0':original '1':digital '2':monster 'CUSTOM': load custom_font.xml-->

</CONFIG>
1 change: 1 addition & 0 deletions projects/resources/PSP/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@
<ROWCOLOR1 value = "BA28F9"/> <!--Row count color 1 -->
<ROWCOLOR2 value = "FF00FF"/> <!--Row count color 2-->
<ALTROWNUMBER value = "4"/> <!--How many rows before alternating-->
<FONTTYPE value = '0' /> <!-- '0':original '1':digital '2':monster 'CUSTOM': load custom_font.xml-->

</CONFIG>
3 changes: 2 additions & 1 deletion projects/resources/RG35XXPLUS/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@
<KEY_START value="but:0:7" />
<KEYDELAY value="200"/>
<KEYREPEAT value="100" />
</CONFIG>
<FONTTYPE value = '0' /> <!-- '0':original '1':digital '2':monster 'CUSTOM': load custom_font.xml-->
</CONFIG>
1 change: 1 addition & 0 deletions projects/resources/X64/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
<ROWCOLOR1 value = "BA28F9"/> <!--Row count color 1 -->
<ROWCOLOR2 value = "FF00FF"/> <!--Row count color 2-->
<ALTROWNUMBER value = "4"/> <!--How many rows before alternating-->
<FONTTYPE value = '0' /> <!-- '0':original '1':digital '2':monster 'CUSTOM': load custom_font.xml-->

</CONFIG>
37 changes: 0 additions & 37 deletions projects/resources/config.xml
View file

This file was deleted.

30 changes: 0 additions & 30 deletions projects/resources/packaging/config.xml
View file

This file was deleted.

1 change: 1 addition & 0 deletions projects/resources/packaging/lgpt_package.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" ] ||
Expand Down

0 comments on commit 78c8914

Please sign in to comment.