aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMTRNord <[email protected]>2018-04-12 10:51:16 +0100
committerRichard van der Hoff <[email protected]>2018-04-12 10:51:16 +0100
commit4065c8e11a33ba41133a086ed3de4da94dcb6bae (patch)
tree7892ff2a7c31ad814191f967798a3b0c6a5cc50b
parent3f5b9dd6d72540a66da90b382a2eda088af63da0 (diff)
downloadolm-4065c8e11a33ba41133a086ed3de4da94dcb6bae.tar.gz
olm-4065c8e11a33ba41133a086ed3de4da94dcb6bae.tar.bz2
olm-4065c8e11a33ba41133a086ed3de4da94dcb6bae.zip
Update Makefile to support building on Windows
The code for this change is taken from https://stackoverflow.com/a/30225575/4929236 This patch is Signed-Off-By: Marcel Radzio <[email protected]>
-rw-r--r--Makefile39
1 files changed, 26 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index ab727a7..5012118 100644
--- a/Makefile
+++ b/Makefile
@@ -100,6 +100,19 @@ $(JS_OBJECTS): CFLAGS += $(JS_OPTIMIZE_FLAGS)
$(JS_OBJECTS): CXXFLAGS += $(JS_OPTIMIZE_FLAGS)
$(JS_TARGET): LDFLAGS += $(JS_OPTIMIZE_FLAGS)
+### Fix to make mkdir work on windows and linux
+ifeq ($(shell echo "check_quotes"),"check_quotes")
+ WINDOWS := yes
+else
+ WINDOWS := no
+endif
+
+ifeq ($(WINDOWS),yes)
+ mkdir = mkdir $(subst /,\,$(1)) > nul 2>&1 || (exit 0)
+else
+ mkdir = mkdir -p $(1)
+endif
+
### top-level targets
lib: $(RELEASE_TARGET)
@@ -157,19 +170,19 @@ all: test js lib debug doc
.PHONY: all
install-headers: $(PUBLIC_HEADERS)
- test -d $(DESTDIR)$(PREFIX)/include/olm || mkdir -p $(DESTDIR)$(PREFIX)/include/olm
+ test -d $(DESTDIR)$(PREFIX)/include/olm || $(call mkdir,$(DESTDIR)$(PREFIX)/include/olm)
install -Dm644 $(PUBLIC_HEADERS) $(DESTDIR)$(PREFIX)/include/olm/
.PHONY: install-headers
install-debug: debug install-headers
- test -d $(DESTDIR)$(PREFIX)/lib || mkdir -p $(DESTDIR)$(PREFIX)/lib
+ test -d $(DESTDIR)$(PREFIX)/lib || $(call mkdir,$(DESTDIR)$(PREFIX)/lib)
install -Dm755 $(DEBUG_TARGET) $(DESTDIR)$(PREFIX)/lib/libolm_debug.so.$(VERSION)
ln -s libolm_debug.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libolm_debug.so.$(MAJOR)
ln -s libolm_debug.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libolm_debug.so
.PHONY: install-debug
install: lib install-headers
- test -d $(DESTDIR)$(PREFIX)/lib || mkdir -p $(DESTDIR)$(PREFIX)/lib
+ test -d $(DESTDIR)$(PREFIX)/lib || $(call mkdir,$(DESTDIR)$(PREFIX)/lib)
install -Dm755 $(RELEASE_TARGET) $(DESTDIR)$(PREFIX)/lib/libolm.so.$(VERSION)
ln -s libolm.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libolm.so.$(MAJOR)
ln -s libolm.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libolm.so
@@ -184,43 +197,43 @@ doc: $(DOCS)
### rules for building objects
$(BUILD_DIR)/release/%.o: %.c
- mkdir -p $(dir [email protected])
+ $(call mkdir,$(dir [email protected]))
$(COMPILE.c) $(OUTPUT_OPTION) $<
$(BUILD_DIR)/release/%.o: %.cpp
- mkdir -p $(dir [email protected])
+ $(call mkdir,$(dir [email protected]))
$(COMPILE.cc) $(OUTPUT_OPTION) $<
$(BUILD_DIR)/debug/%.o: %.c
- mkdir -p $(dir [email protected])
+ $(call mkdir,$(dir [email protected]))
$(COMPILE.c) $(OUTPUT_OPTION) $<
$(BUILD_DIR)/debug/%.o: %.cpp
- mkdir -p $(dir [email protected])
+ $(call mkdir,$(dir [email protected]))
$(COMPILE.cc) $(OUTPUT_OPTION) $<
$(BUILD_DIR)/javascript/%.o: %.c
- mkdir -p $(dir [email protected])
+ $(call mkdir,$(dir [email protected]))
$(EMCC.c) $(OUTPUT_OPTION) $<
$(BUILD_DIR)/javascript/%.o: %.cpp
- mkdir -p $(dir [email protected])
+ $(call mkdir,$(dir [email protected]))
$(EMCC.cc) $(OUTPUT_OPTION) $<
$(BUILD_DIR)/tests/%: tests/%.c $(DEBUG_OBJECTS)
- mkdir -p $(dir [email protected])
+ $(call mkdir,$(dir [email protected]))
$(LINK.c) $< $(DEBUG_OBJECTS) $(LOADLIBES) $(LDLIBS) -o [email protected]
$(BUILD_DIR)/tests/%: tests/%.cpp $(DEBUG_OBJECTS)
- mkdir -p $(dir [email protected])
+ $(call mkdir,$(dir [email protected]))
$(LINK.cc) $< $(DEBUG_OBJECTS) $(LOADLIBES) $(LDLIBS) -o [email protected]
$(BUILD_DIR)/fuzzers/objects/%.o: %.c
- mkdir -p $(dir [email protected])
+ $(call mkdir,$(dir [email protected]))
$(AFL.c) $(OUTPUT_OPTION) $<
$(BUILD_DIR)/fuzzers/objects/%.o: %.cpp
- mkdir -p $(dir [email protected])
+ $(call mkdir,$(dir [email protected]))
$(AFL.cc) $(OUTPUT_OPTION) $<
$(BUILD_DIR)/fuzzers/fuzz_%: fuzzers/fuzz_%.c $(FUZZER_OBJECTS)