Fixed compilation errors (Regression)

-> error: ‘O_BINARY’ undeclared
-> tabspaces in Makefile
pull/920/head
nightwalker-87 2020-04-08 15:34:10 +02:00
rodzic d4977e2ee5
commit 6f941b22eb
2 zmienionych plików z 22 dodań i 25 usunięć

Wyświetl plik

@ -1,6 +1,5 @@
##
# This Makefile is used to drive building of Debug and Release
# targets of CMake
# This Makefile is used to drive building of Debug and Release targets of CMake
##
MAKEFLAGS += -s
@ -8,42 +7,42 @@ all: release
ci: debug release test
help:
@echo " release: Run a release build"
@echo " debug: Run a debug build"
@echo " lint: Lint check all source-code"
@echo " test: Build and run tests"
@echo " clean: Clean all build output"
@echo "rebuild_cache: Rebuild all CMake caches"
@echo " release: Run a release build"
@echo " debug: Run a debug build"
@echo " lint: Lint check all source-code"
@echo " test: Build and run tests"
@echo " clean: Clean all build output"
@echo "rebuild_cache: Rebuild all CMake caches"
rebuild_cache: build/Debug build/Release
@$(MAKE) -C build/Debug rebuild_cache
@$(MAKE) -C build/Release rebuild_cache
@$(MAKE) -C build/Debug rebuild_cache
@$(MAKE) -C build/Release rebuild_cache
debug: build/Debug
@echo "[DEBUG]"
@$(MAKE) -C build/Debug
@echo "[DEBUG]"
@$(MAKE) -C build/Debug
release: build/Release
@echo "[RELEASE]"
@$(MAKE) -C build/Release
@echo "[RELEASE]"
@$(MAKE) -C build/Release
package: build/Release
@echo "[PACKAGE] Release"
@$(MAKE) -C build/Release package
@echo "[PACKAGE] Release"
@$(MAKE) -C build/Release package
test: debug
@$(MAKE) -C build/Debug test
@$(MAKE) -C build/Debug test
build/Debug:
@mkdir -p $@
@cd $@ && cmake -DCMAKE_BUILD_TYPE=Debug $(CMAKEFLAGS) ../../
@mkdir -p $@
@cd $@ && cmake -DCMAKE_BUILD_TYPE=Debug $(CMAKEFLAGS) ../../
build/Release:
@mkdir -p $@
@cd $@ && cmake -Wno-dev -DCMAKE_BUILD_TYPE=Release $(CMAKEFLAGS) ../../
@mkdir -p $@
@cd $@ && cmake -Wno-dev -DCMAKE_BUILD_TYPE=Release $(CMAKEFLAGS) ../../
clean:
@echo "[CLEAN]"
@rm -Rf build
@echo "[CLEAN]"
@rm -Rf build
.PHONY: clean

Wyświetl plik

@ -16,11 +16,9 @@
#include "stlink/mmap.h"
#include "stlink/logging.h"
#ifdef _WIN32
#ifndef O_BINARY
#define O_BINARY 0
#endif
#endif
#ifdef _MSC_VER
#define __attribute__(x)