From 976b967732454b3171ac5b5d61b865f1cc3a5777 Mon Sep 17 00:00:00 2001 From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> Date: Thu, 26 Nov 2020 20:21:16 -0500 Subject: Add msys2 and Cygwin instructions, also add .exe extension to built tools. Todo: actually extensively test out msys2 and Cygwin, and double check the readme. --- tools/jsonproc/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'tools/jsonproc/Makefile') diff --git a/tools/jsonproc/Makefile b/tools/jsonproc/Makefile index 47198b171..eec73eb7b 100755 --- a/tools/jsonproc/Makefile +++ b/tools/jsonproc/Makefile @@ -8,12 +8,18 @@ SRCS := jsonproc.cpp HEADERS := jsonproc.h inja.hpp nlohmann/json.hpp +ifeq ($(OS),Windows_NT) +EXE := .exe +else +EXE := +endif + .PHONY: all clean -all: jsonproc +all: jsonproc$(EXE) @: -jsonproc: $(SRCS) $(HEADERS) +jsonproc$(EXE): $(SRCS) $(HEADERS) $(CXX) $(CXXFLAGS) $(INCLUDES) $(SRCS) -o $@ $(LDFLAGS) clean: -- cgit v1.2.3 From cc5db41f30708c1cc2d33a46879c96a9404764a3 Mon Sep 17 00:00:00 2001 From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> Date: Wed, 16 Dec 2020 13:29:02 -0500 Subject: Revert multiple source change commits for rebase. --- tools/jsonproc/Makefile | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'tools/jsonproc/Makefile') diff --git a/tools/jsonproc/Makefile b/tools/jsonproc/Makefile index eec73eb7b..47198b171 100755 --- a/tools/jsonproc/Makefile +++ b/tools/jsonproc/Makefile @@ -8,18 +8,12 @@ SRCS := jsonproc.cpp HEADERS := jsonproc.h inja.hpp nlohmann/json.hpp -ifeq ($(OS),Windows_NT) -EXE := .exe -else -EXE := -endif - .PHONY: all clean -all: jsonproc$(EXE) +all: jsonproc @: -jsonproc$(EXE): $(SRCS) $(HEADERS) +jsonproc: $(SRCS) $(HEADERS) $(CXX) $(CXXFLAGS) $(INCLUDES) $(SRCS) -o $@ $(LDFLAGS) clean: -- cgit v1.2.3 From 936ba7f1bf492a805596716660cd751e35fc74cd Mon Sep 17 00:00:00 2001 From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> Date: Wed, 16 Dec 2020 15:10:01 -0500 Subject: Apply all source related changes for the new INSTALL.md in one commit. For people who want to have dkPless builds in their repo. --- tools/jsonproc/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'tools/jsonproc/Makefile') diff --git a/tools/jsonproc/Makefile b/tools/jsonproc/Makefile index 47198b171..eec73eb7b 100755 --- a/tools/jsonproc/Makefile +++ b/tools/jsonproc/Makefile @@ -8,12 +8,18 @@ SRCS := jsonproc.cpp HEADERS := jsonproc.h inja.hpp nlohmann/json.hpp +ifeq ($(OS),Windows_NT) +EXE := .exe +else +EXE := +endif + .PHONY: all clean -all: jsonproc +all: jsonproc$(EXE) @: -jsonproc: $(SRCS) $(HEADERS) +jsonproc$(EXE): $(SRCS) $(HEADERS) $(CXX) $(CXXFLAGS) $(INCLUDES) $(SRCS) -o $@ $(LDFLAGS) clean: -- cgit v1.2.3 From 345aab63cf2550646a6a56c2c8fe8473d5bf996a Mon Sep 17 00:00:00 2001 From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> Date: Wed, 16 Dec 2020 20:31:10 -0500 Subject: [Round 2] Revert multiple source change commits for re-commit. --- tools/jsonproc/Makefile | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'tools/jsonproc/Makefile') diff --git a/tools/jsonproc/Makefile b/tools/jsonproc/Makefile index eec73eb7b..47198b171 100755 --- a/tools/jsonproc/Makefile +++ b/tools/jsonproc/Makefile @@ -8,18 +8,12 @@ SRCS := jsonproc.cpp HEADERS := jsonproc.h inja.hpp nlohmann/json.hpp -ifeq ($(OS),Windows_NT) -EXE := .exe -else -EXE := -endif - .PHONY: all clean -all: jsonproc$(EXE) +all: jsonproc @: -jsonproc$(EXE): $(SRCS) $(HEADERS) +jsonproc: $(SRCS) $(HEADERS) $(CXX) $(CXXFLAGS) $(INCLUDES) $(SRCS) -o $@ $(LDFLAGS) clean: -- cgit v1.2.3 From 166183d5ed73059922b9679b832b591dd6fa073b Mon Sep 17 00:00:00 2001 From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> Date: Wed, 16 Dec 2020 20:31:56 -0500 Subject: [Round 2] Apply all source related changes for the new INSTALL.md in one commit. --- tools/jsonproc/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'tools/jsonproc/Makefile') diff --git a/tools/jsonproc/Makefile b/tools/jsonproc/Makefile index 47198b171..eec73eb7b 100755 --- a/tools/jsonproc/Makefile +++ b/tools/jsonproc/Makefile @@ -8,12 +8,18 @@ SRCS := jsonproc.cpp HEADERS := jsonproc.h inja.hpp nlohmann/json.hpp +ifeq ($(OS),Windows_NT) +EXE := .exe +else +EXE := +endif + .PHONY: all clean -all: jsonproc +all: jsonproc$(EXE) @: -jsonproc: $(SRCS) $(HEADERS) +jsonproc$(EXE): $(SRCS) $(HEADERS) $(CXX) $(CXXFLAGS) $(INCLUDES) $(SRCS) -o $@ $(LDFLAGS) clean: -- cgit v1.2.3 From 5a5acfb0ada48c89d1e398dea3fd3ef701213b60 Mon Sep 17 00:00:00 2001 From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> Date: Wed, 16 Dec 2020 21:24:08 -0500 Subject: [Round 3] Revert multiple source change commits for re-commit. --- tools/jsonproc/Makefile | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'tools/jsonproc/Makefile') diff --git a/tools/jsonproc/Makefile b/tools/jsonproc/Makefile index eec73eb7b..47198b171 100755 --- a/tools/jsonproc/Makefile +++ b/tools/jsonproc/Makefile @@ -8,18 +8,12 @@ SRCS := jsonproc.cpp HEADERS := jsonproc.h inja.hpp nlohmann/json.hpp -ifeq ($(OS),Windows_NT) -EXE := .exe -else -EXE := -endif - .PHONY: all clean -all: jsonproc$(EXE) +all: jsonproc @: -jsonproc$(EXE): $(SRCS) $(HEADERS) +jsonproc: $(SRCS) $(HEADERS) $(CXX) $(CXXFLAGS) $(INCLUDES) $(SRCS) -o $@ $(LDFLAGS) clean: -- cgit v1.2.3 From 3d686116d8acb9f3daa1db9669de6eca11a861d5 Mon Sep 17 00:00:00 2001 From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> Date: Wed, 16 Dec 2020 21:24:44 -0500 Subject: [Round 3] Apply all source related changes for the new INSTALL.md in one commit. --- tools/jsonproc/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'tools/jsonproc/Makefile') diff --git a/tools/jsonproc/Makefile b/tools/jsonproc/Makefile index 47198b171..eec73eb7b 100755 --- a/tools/jsonproc/Makefile +++ b/tools/jsonproc/Makefile @@ -8,12 +8,18 @@ SRCS := jsonproc.cpp HEADERS := jsonproc.h inja.hpp nlohmann/json.hpp +ifeq ($(OS),Windows_NT) +EXE := .exe +else +EXE := +endif + .PHONY: all clean -all: jsonproc +all: jsonproc$(EXE) @: -jsonproc: $(SRCS) $(HEADERS) +jsonproc$(EXE): $(SRCS) $(HEADERS) $(CXX) $(CXXFLAGS) $(INCLUDES) $(SRCS) -o $@ $(LDFLAGS) clean: -- cgit v1.2.3