From f569c839a18998489d29a9c24ea98175f24033cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Gourichon?= Date: Tue, 1 Dec 2020 22:41:49 +0100 Subject: [PATCH 1/3] Remove some mingw-specific hacks, add quick-n-dirty elements to compile on Xubuntu 20.04. --- visualizer/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/visualizer/Makefile b/visualizer/Makefile index e892f14..05e0d9b 100644 --- a/visualizer/Makefile +++ b/visualizer/Makefile @@ -3,9 +3,10 @@ EXTERNAL := ../../Andres BUILD = build DIST_DIR = ../dist/Rose -CC := i686-w64-mingw32-g++ -CFLAGS := -Iparser/rose -I$(EXTERNAL)/glfw-3.0.4.bin.WIN32/include -I$(EXTERNAL)/glew-1.10.0/include -I$(EXTERNAL)/portaudio/include -Wno-write-strings -std=c++11 -LFLAGS := $(EXTERNAL)/glew-1.10.0/lib/Release/Win32/glew32s.lib -L$(EXTERNAL)/glfw-3.0.4.bin.WIN32/lib-mingw $(EXTERNAL)/portaudio/mingw32/usr/local/lib/libportaudio-2.dll -lglfw3 -lopengl32 -luser32 -lgdi32 -static-libgcc -static-libstdc++ +CC := g++ +CFLAGS := $(shell pkg-config --libs portaudiocpp) -Iparser/rose -I$(EXTERNAL)/glfw-3.0.4.bin.WIN32/include -I$(EXTERNAL)/glew-1.10.0/include -I$(EXTERNAL)/portaudio/include -Wno-write-strings -std=c++11 +#LFLAGS := $(EXTERNAL)/glew-1.10.0/lib/Release/Win32/glew32s.lib -L$(EXTERNAL)/glfw-3.0.4.bin.WIN32/lib-mingw $(EXTERNAL)/portaudio/mingw32/usr/local/lib/libportaudio-2.dll -lglfw3 -lopengl32 -luser32 -lgdi32 -static-libgcc -static-libstdc++ +LFLAGS := -static-libgcc -static-libstdc++ $(shell pkg-config --libs glfw3) $(shell pkg-config --libs glew) $(shell pkg-config --libs portaudiocpp) #CC := x86_64-w64-mingw32-g++ #CFLAGS := -O3 -Iparser/rose -I$(EXTERNAL)/glfw-3.0.4.bin.WIN64/include -I$(EXTERNAL)/glew-1.10.0/include -I$(EXTERNAL)/portaudio/include -Wno-write-strings -std=c++11 #LFLAGS := $(EXTERNAL)/glew-1.10.0/lib/Release/x64/glew32s.lib -L$(EXTERNAL)/glfw-3.0.4.bin.WIN64/lib-mingw -lglfw3 -luser32 -lopengl32 -lgdi32 -static-libgcc -static-libstdc++ -s @@ -19,7 +20,7 @@ endif $(BUILD)/rose: $(patsubst %,$(BUILD)/%.o,main translate renderer music) $(patsubst parser/%.cpp,$(BUILD)/%.o,$(wildcard parser/*.cpp)) $(CC) $^ $(LFLAGS) -o $(BUILD)/rose - cp lib/* $(BUILD)/ +# cp lib/* $(BUILD)/ $(BUILD)/%.o: %.cpp Makefile $(CC) $(CFLAGS) $< -c -o $@ From 16c332a4c7da80ad637e35852111275aa2e1a652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Gourichon?= Date: Tue, 1 Dec 2020 22:42:27 +0100 Subject: [PATCH 2/3] Crude workaround for Pa_GetStreamTime(stream) returning zero always. --- visualizer/main.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/visualizer/main.cpp b/visualizer/main.cpp index 3832554..e1108d1 100644 --- a/visualizer/main.cpp +++ b/visualizer/main.cpp @@ -235,10 +235,12 @@ int main(int argc, char *argv[]) { if (playing && project) { int prev_frame = frame; - do { - usleep(1000); - frame = (int)(player.get_time() * framerate); - } while (frame == prev_frame); + //do { + // usleep(1000); + // frame = (int)(player.get_time() * framerate); + //} while (frame == prev_frame); + frame++; + usleep(20); } else { usleep(100000); } From 6fffe609a6a3d9ff595c812fc9355dac3ab82495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Gourichon?= Date: Tue, 1 Dec 2020 22:42:54 +0100 Subject: [PATCH 3/3] Crude build/run instructions. --- README.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.txt b/README.txt index 0995813..9ffc8bb 100644 --- a/README.txt +++ b/README.txt @@ -200,3 +200,15 @@ Keyboard shortcuts: Clicking or holding the left mouse button sets the time proportionally to the mouse X position within the window, up to the total number of frames. + + + +COMPILING + + +Example: on Ubuntu 20.04 + + apt install libglfw3-dev portaudio19-dev + + make -j -k && for a in ../examples/*rose ; do echo $a ; ./build/rose $a ; done +