From 52b72931fc5b56e4a51d8a14546a3460ae3dfe76 Mon Sep 17 00:00:00 2001 From: John Alanbrook Date: Sat, 14 Sep 2024 22:24:25 -0500 Subject: [PATCH] fix neo sequencer missing ref --- Makefile | 4 ++-- source/engine/thirdparty/imgui/imgui_neo_sequencer.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 58194e7..b396fb4 100755 --- a/Makefile +++ b/Makefile @@ -75,6 +75,8 @@ else CPPFLAGS += -O2 endif +CXXFLAGS += -std=c++14 + CPPFLAGS += -DHAVE_CEIL -DCP_USE_CGTYPES=0 -DCP_USE_DOUBLES=0 -DHAVE_FLOOR -DHAVE_FMOD -DHAVE_LRINT -DHAVE_LRINTF $(includeflag) $(WARNING_FLAGS) -I. -DVER=\"$(SEM)\" -DCOM=\"$(COM)\" -DDATE=\"$(DATE)\" -DINFO=\"$(INFO)\" -Wno-narrowing #-DENABLE_SINC_MEDIUM_CONVERTER -DENABLE_SINC_FAST_CONVERTER -DCP_COLLISION_TYPE_TYPE=uintptr_t -DCP_BITMASK_TYPE=uintptr_t CPPFLAGS += -DCONFIG_VERSION=\"2024-02-14\" -DCONFIG_BIGNUM #for quickjs @@ -99,7 +101,6 @@ else ifeq ($(OS), IOS) CFLAGS += -isysroot $(SDK_PATH) -miphoneos-version-min=13.0 LDFLAGS += -isysroot $(SDK_PATH) -miphoneos-version-min=13.0 LDFLAGS += -framework Foundation -framework UIKit -framework AudioToolbox -framework Metal -framework MetalKit -framework AVFoundation - CXXFLAGS += -std=c++11 CFLAGS += -x objective-c -DIOS INFO :=$(INFO)_ios else ifeq ($(OS), wasm) # Then WEB @@ -125,7 +126,6 @@ else PLATFORM := osx CPPFLAGS += -arch $(ARCH) CFLAGS += -x objective-c - CXXFLAGS += -std=c++11 LDFLAGS += -framework Cocoa -framework QuartzCore -framework AudioToolbox -framework Metal -framework MetalKit INFO :=$(INFO)_macos STEAMAPI := steam_api diff --git a/source/engine/thirdparty/imgui/imgui_neo_sequencer.h b/source/engine/thirdparty/imgui/imgui_neo_sequencer.h index bc512ce..009a23a 100644 --- a/source/engine/thirdparty/imgui/imgui_neo_sequencer.h +++ b/source/engine/thirdparty/imgui/imgui_neo_sequencer.h @@ -7,6 +7,7 @@ #include "imgui.h" #include +#include typedef int ImGuiNeoSequencerFlags; typedef int ImGuiNeoSequencerCol;