From 278e664498ae0fdb9ef4b3e3462318a69636b033 Mon Sep 17 00:00:00 2001 From: Samantha Luber Date: Sat, 9 Jun 2018 03:51:40 +0200 Subject: [PATCH 1/2] #Issues-1 #Features Update project Makefile to support msys64 --- .gitignore | 4 ++++ README.md | 12 +++++++++++- platform/prologue/delfx/Makefile | 2 ++ platform/prologue/demos/waves/Makefile | 5 ++++- platform/prologue/demos/waves/project.mk | 2 +- platform/prologue/modfx/Makefile | 2 ++ platform/prologue/osc/Makefile | 3 +++ platform/prologue/revfx/Makefile | 2 ++ 8 files changed, 29 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b75e87df..ebbad23b 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,10 @@ **/.dep/** **/build/** +# Tool install files +tools/**/EULA.md +tools/**/** + # Precompiled Headers *.gch *.pch diff --git a/README.md b/README.md index daf67cbd..ea1ca568 100644 --- a/README.md +++ b/README.md @@ -8,16 +8,26 @@ This repository contains all the files and tools needed to build custom oscillat * [tools/](tools/) : Installation location and documentation for tools required to build projects and manipulate built products. * [devboards/](devboards/) : Information and files related to limited edition development boards. -## Quick Start +## Quick Start + +### Install and Env Setup +$ git clone https://github.com/korginc/logue-sdk.git +$ cd logue-sdk ### Building Projects **Note: Make sure git submodules are initialized and updated.** +$ git submodule update --init --recursive **Note: Make sure the necessary toolchain is properly installed. Refer to [tools/](tools/) for installation instructions.** +$ cd tools +$ # cd && cat README.md 1. move into a project directory. +$ cd [platform/prologue/demos/waves/](platform/prologue/demos/waves/) + 2. type `make` to build the project. +$ make ``` $ make diff --git a/platform/prologue/delfx/Makefile b/platform/prologue/delfx/Makefile index 7d501d83..b702106c 100644 --- a/platform/prologue/delfx/Makefile +++ b/platform/prologue/delfx/Makefile @@ -28,9 +28,11 @@ ZIP_ARGS = -r -m -q ifeq ($(OS),Windows_NT) ifneq ($(MSYSTEM), MSYS) +ifneq ($(MSYSTEM), MINGW64) ZIP = $(TOOLSDIR)/zip/bin/zip endif endif +endif # ############################################################################# # Include project specific definition diff --git a/platform/prologue/demos/waves/Makefile b/platform/prologue/demos/waves/Makefile index 1c8a2bb2..48a16f01 100644 --- a/platform/prologue/demos/waves/Makefile +++ b/platform/prologue/demos/waves/Makefile @@ -28,7 +28,9 @@ ZIP_ARGS = -r -m -q ifeq ($(OS),Windows_NT) ifneq ($(MSYSTEM), MSYS) - ZIP = $(TOOLSDIR)/zip/bin/zip + ifneq ($(MSYSTEM), MINGW64) + ZIP = $(TOOLSDIR)/zip/bin/zip + endif endif endif @@ -48,6 +50,7 @@ GCC_TARGET = arm-none-eabi- GCC_BIN_PATH = $(TOOLSDIR)/gcc/gcc-arm-none-eabi-5_4-2016q3/bin CC = $(GCC_BIN_PATH)/$(GCC_TARGET)gcc +CXX = $(GCC_BIN_PATH)/$(GCC_TARGET)g++ CXXC = $(GCC_BIN_PATH)/$(GCC_TARGET)g++ LD = $(GCC_BIN_PATH)/$(GCC_TARGET)gcc #LD = $(GCC_BIN_PATH)/$(GCC_TARGET)g++ diff --git a/platform/prologue/demos/waves/project.mk b/platform/prologue/demos/waves/project.mk index c5fb04ff..109c6d78 100644 --- a/platform/prologue/demos/waves/project.mk +++ b/platform/prologue/demos/waves/project.mk @@ -10,7 +10,7 @@ UCXXSRC = waves.cpp UINCDIR = -UDEFS = +UDEFS = -o0 ULIB = diff --git a/platform/prologue/modfx/Makefile b/platform/prologue/modfx/Makefile index b7dedd53..46755b60 100644 --- a/platform/prologue/modfx/Makefile +++ b/platform/prologue/modfx/Makefile @@ -28,9 +28,11 @@ ZIP_ARGS = -r -m -q ifeq ($(OS),Windows_NT) ifneq ($(MSYSTEM), MSYS) +ifneq ($(MSYSTEM), MINGW64) ZIP = $(TOOLSDIR)/zip/bin/zip endif endif +endif # ############################################################################# # Include project specific definition diff --git a/platform/prologue/osc/Makefile b/platform/prologue/osc/Makefile index 619249e5..35b37424 100644 --- a/platform/prologue/osc/Makefile +++ b/platform/prologue/osc/Makefile @@ -28,9 +28,11 @@ ZIP_ARGS = -r -m -q ifeq ($(OS),Windows_NT) ifneq ($(MSYSTEM), MSYS) +ifneq ($(MSYSTEM), MINGW64) ZIP = $(TOOLSDIR)/zip/bin/zip endif endif +endif # ############################################################################# # Include project specific definition @@ -230,3 +232,4 @@ package: @mv $(PROJECT).zip $(PKGARCH) @echo @echo Done + diff --git a/platform/prologue/revfx/Makefile b/platform/prologue/revfx/Makefile index e0ddaa0b..20f8b829 100644 --- a/platform/prologue/revfx/Makefile +++ b/platform/prologue/revfx/Makefile @@ -28,9 +28,11 @@ ZIP_ARGS = -r -m -q ifeq ($(OS),Windows_NT) ifneq ($(MSYSTEM), MSYS) +ifneq ($(MSYSTEM), MINGW64) ZIP = $(TOOLSDIR)/zip/bin/zip endif endif +endif # ############################################################################# # Include project specific definition From 31ee16817f79b0a0e21fc87a2f3c7705f48eb904 Mon Sep 17 00:00:00 2001 From: Samantha Luber <1478547+saluber@users.noreply.github.com> Date: Sun, 10 Jun 2018 17:03:29 +0200 Subject: [PATCH 2/2] Extend README.md install and setup instructions --- README.md | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index ea1ca568..fba5443a 100644 --- a/README.md +++ b/README.md @@ -11,23 +11,20 @@ This repository contains all the files and tools needed to build custom oscillat ## Quick Start ### Install and Env Setup -$ git clone https://github.com/korginc/logue-sdk.git -$ cd logue-sdk + +`$ git clone https://github.com/korginc/logue-sdk.git && cd logue-sdk` ### Building Projects **Note: Make sure git submodules are initialized and updated.** -$ git submodule update --init --recursive + +`$ git submodule update --init --recursive` **Note: Make sure the necessary toolchain is properly installed. Refer to [tools/](tools/) for installation instructions.** -$ cd tools -$ # cd && cat README.md - 1. move into a project directory. -$ cd [platform/prologue/demos/waves/](platform/prologue/demos/waves/) + 1. move into a project directory. (e.g., [platform/prologue/demos/waves/](platform/prologue/demos/waves/)) 2. type `make` to build the project. -$ make ``` $ make