mirror of
https://github.com/davidgiven/fluxengine.git
synced 2025-10-31 11:17:01 -07:00
Looks like we need special options for OSX.
This commit is contained in:
16
Makefile
16
Makefile
@@ -1,4 +1,11 @@
|
||||
BUILDTYPE ?= host
|
||||
ifeq ($(BUILDTYPE),)
|
||||
buildtype_Darwin = osx
|
||||
buildtype_Haiku = haiku
|
||||
BUILDTYPE := $(buildtype_$(shell uname -s ))
|
||||
ifeq ($(BUILDTYPE),)
|
||||
BUILDTYPE := unix
|
||||
endif
|
||||
endif
|
||||
export BUILDTYPE
|
||||
|
||||
ifeq ($(BUILDTYPE),windows)
|
||||
@@ -20,9 +27,14 @@ else
|
||||
CC = gcc
|
||||
CXX = g++ -std=c++17
|
||||
CFLAGS = -g -O3
|
||||
LDFLAGS = -pthread -Wl,--no-as-needed
|
||||
LDFLAGS =
|
||||
AR = ar
|
||||
PKG_CONFIG = pkg-config
|
||||
ifeq ($(BUILDTYPE),osx)
|
||||
else
|
||||
LDFLAGS += -pthread -Wl,--no-as-needed
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
HOSTCC = gcc
|
||||
|
||||
@@ -95,8 +95,7 @@ struct fmt::formatter<Sector::Status> : formatter<string_view>
|
||||
{
|
||||
auto format(Sector::Status status, format_context& ctx) const
|
||||
{
|
||||
return format_to(ctx.out(), "{}",
|
||||
Sector::statusToString(status));
|
||||
return format_to(ctx.out(), "{}", Sector::statusToString(status));
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user