Skip to content

Crude fixes to build and run on xubuntu 20.04. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
fidergo-stephane-gourichon wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Crude fixes to build and run on xubuntu 20.04. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f569c83
Remove some mingw-specific hacks, add quick-n-dirty elements to compi…
fidergo-stephane-gourichon Dec 1, 2020
16c332a
Crude workaround for Pa_GetStreamTime(stream) returning zero always.
fidergo-stephane-gourichon Dec 1, 2020
6fffe60
Crude build/run instructions.
fidergo-stephane-gourichon Dec 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions README.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

9 changes: 5 additions & 4 deletions visualizer/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 $@
Expand Down
10 changes: 6 additions & 4 deletions visualizer/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down