Skip to content
Snippets Groups Projects
Commit dd98a6f4 authored by Florent Berthaut's avatar Florent Berthaut
Browse files

Change to 4.2 branch

parent 860e4c61
No related branches found
No related tags found
No related merge requests found
[submodule "src/libpd"] [submodule "src/libpd"]
path = src/libpd path = src/libpd
url = https://github.com/libpd/libpd.git url = https://github.com/libpd/libpd.git
branch = master
[submodule "src/godot-cpp"] [submodule "src/godot-cpp"]
path = src/godot-cpp path = src/godot-cpp
url = https://github.com/GodotNativeTools/godot-cpp url = https://github.com/GodotNativeTools/godot-cpp
......
...@@ -3,6 +3,8 @@ import os ...@@ -3,6 +3,8 @@ import os
import sys import sys
# Update submodules
#os.system("git submodule update --init --recursive --remote")
# First fix fsqrt in fiddle~.c # First fix fsqrt in fiddle~.c
fiddle_file = open("src/libpd/pure-data/extra/fiddle~/fiddle~.c","r") fiddle_file = open("src/libpd/pure-data/extra/fiddle~/fiddle~.c","r")
...@@ -95,7 +97,8 @@ if env["platform"] == "linux": ...@@ -95,7 +97,8 @@ if env["platform"] == "linux":
'-fomit-frame-pointer']) '-fomit-frame-pointer'])
env.Append(CXXFLAGS=['-std=c++17']) env.Append(CXXFLAGS=['-std=c++17'])
elif env["platform"] == "android": elif env["platform"] == "android":
env.Append(CPPDEFINES=['__UNSPECIFIED__', 'HAVE_LIBDL', 'ANDROID']) env.Append(CPPDEFINES=['__UNSPECIFIED__', 'HAVE_LIBDL', 'ANDROID',
'HAS_SOCKLEN_T'])
env.Append(CFLAGS=['-Wno-int-to-pointer-cast', '-Wno-pointer-to-int-cast', env.Append(CFLAGS=['-Wno-int-to-pointer-cast', '-Wno-pointer-to-int-cast',
'-Wno-discarded-qualifiers', '-Wno-discarded-qualifiers',
'-fPIC', '-O3', '-ffast-math', '-funroll-loops', '-fPIC', '-O3', '-ffast-math', '-funroll-loops',
......
...@@ -72,6 +72,11 @@ private: ...@@ -72,6 +72,11 @@ private:
bool m_init; bool m_init;
enum Mode {OSC, AUDIO, AUDIO_RT};
int m_mode;
private:
int start(); int start();
public: public:
...@@ -162,5 +167,4 @@ public: ...@@ -162,5 +167,4 @@ public:
}; };
#endif #endif
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment