This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#include <stdlib.h> | |
#include <math.h> | |
#include <SDL2/SDL.h> | |
#define DEFAULT_AUDIO_PATH "audiofile.wav" | |
struct AudioSpecUserdata_t { | |
char* issued; | |
char* file; | |
Uint32 event_count; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/imgui.cpp b/imgui.cpp | |
index b72cc38..85fc037 100644 | |
--- a/imgui.cpp | |
+++ b/imgui.cpp | |
@@ -4890,7 +4892,12 @@ void ImGui::ClosePopup(ImGuiID id) | |
if (!IsPopupOpen(id)) | |
return; | |
ImGuiContext& g = *GImGui; | |
- ClosePopupToLevel(g.OpenPopupStack.Size - 1); | |
+ unsigned int aSize = 0; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
index 03da20b..21cfd72 100644 | |
--- a/Makefile | |
+++ b/Makefile | |
@@ -16,7 +16,7 @@ INCLUDES += -I./inc | |
LIBS = -L/usr/lib/x86_64-linux-gnu | |
LIBS += -lboost_regex | |
LIBS += -lboost_system -lboost_thread | |
-LIBS += -lopencv_core -lopencv_highgui -lopencv_imgproc -lopencv_video -lopencv_videostab | |
+LIBS += $(shell pkg-config --cflags --libs opencv) | |
LIBS += -lavcodec \ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Makefile b/Makefile | |
index 233952d..00c3949 100644 | |
--- a/Makefile | |
+++ b/Makefile | |
@@ -22,6 +22,7 @@ ifeq ($(findstring darwin, $(TARGET)), darwin) | |
else | |
ifeq ($(findstring linux, $(TARGET)), linux) | |
OS=linux | |
+ OS_CXXFLAGS = -DLinux | |
CFLAGS += -fPIC -fno-strict-aliasing -Wno-multichar |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/ThirdParty/glew/glew.pc b/ThirdParty/glew/glew.pc | |
index 5ac9b26..5f500fe 100644 | |
--- a/ThirdParty/glew/glew.pc | |
+++ b/ThirdParty/glew/glew.pc | |
@@ -1,11 +1,11 @@ | |
-prefix=C:/Program Files/FishGUI | |
+prefix=/usr/local | |
exec_prefix=${prefix} | |
-libdir=C:/Program Files/FishGUI/lib | |
+libdir=/usr/local/lib |