john/prosperon
1
0
Fork 0
Code Issues Pull requests Actions Releases Activity

fix neo sequencer missing ref

Browse source
This commit is contained in:
John Alanbrook 2024-09-14 22:24:25 -05:00
parent a3f68316ca
commit 52b72931fc
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -75,6 +75,8 @@ else
CPPFLAGS += -O2 CPPFLAGS += -O2
endif 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 += -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 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 CFLAGS += -isysroot $(SDK_PATH) -miphoneos-version-min=13.0
LDFLAGS += -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 LDFLAGS += -framework Foundation -framework UIKit -framework AudioToolbox -framework Metal -framework MetalKit -framework AVFoundation
CXXFLAGS += -std=c++11
CFLAGS += -x objective-c -DIOS CFLAGS += -x objective-c -DIOS
INFO :=$(INFO)_ios INFO :=$(INFO)_ios
else ifeq ($(OS), wasm) # Then WEB else ifeq ($(OS), wasm) # Then WEB
@ -125,7 +126,6 @@ else
PLATFORM := osx PLATFORM := osx
CPPFLAGS += -arch $(ARCH) CPPFLAGS += -arch $(ARCH)
CFLAGS += -x objective-c CFLAGS += -x objective-c
CXXFLAGS += -std=c++11
LDFLAGS += -framework Cocoa -framework QuartzCore -framework AudioToolbox -framework Metal -framework MetalKit LDFLAGS += -framework Cocoa -framework QuartzCore -framework AudioToolbox -framework Metal -framework MetalKit
INFO :=$(INFO)_macos INFO :=$(INFO)_macos
STEAMAPI := steam_api STEAMAPI := steam_api

1
source/engine/thirdparty/imgui/imgui_neo_sequencer.h vendored
View file

@ -7,6 +7,7 @@
#include "imgui.h" #include "imgui.h"
#include <vector> #include <vector>
#include <cstdint>
typedef int ImGuiNeoSequencerFlags; typedef int ImGuiNeoSequencerFlags;
typedef int ImGuiNeoSequencerCol; typedef int ImGuiNeoSequencerCol;