Permalink
Browse files

Changleog - further updates

  • Loading branch information...
1 parent 50f19e0 commit 8cbc2612579e685e4a279461ea90cd0d3386c0f6 @samaaron committed Oct 10, 2016
@@ -10,15 +10,27 @@ First grab the dependencies, compile the server extensions, then the GUI then st
The dependencies for building and running this are:
-* `supercollider`
-* `ruby1.9.3`
+Building:
+
+* qtbase5-dev-tools
+* qttools5-dev-tools
+* qt5-default
+* libqt5svg5
+
+
+Running:
+
+* `supercollider-server`
+* `ruby2.1`
* `libqscintilla2-8`
* `libqscintilla2-dev`
* `qt4-dev-tools`
* `cmake`
* `ruby-dev`
* `libffi-dev`
+*
+
Use `sudo apt-get install` to ensure each of these are on your system.
### Server extensions
@@ -20,12 +20,27 @@
TARGET = 'sonic-pi'
CONFIG += qscintilla2 qwt c++11
+include ( /usr/local/qwt-6.1.2/features/qwt.prf )
+LIBS += -L/Users/sam/Development/Supercollider/git-src/external_libraries/boost/libs
+INCLUDEPATH += /Users/sam/Development/Supercollider/git-src/external_libraries/boost/
+DEPENDPATH += /Users/sam/Development/Supercollider/git-src/external_libraries/boost/
+
+LIBS += -L/Users/sam/Downloads/tmp/QScintilla_gpl-2.9.3.dev1606101834/Qt4Qt5
+
+
+# LIBS += -L/Users/sam/Downloads/tmp/QScintilla_gpl-2.9.4.dev1609091105/Qt4Qt5
+# INCLUDEPATH += /Users/sam/Downloads/tmp/QScintilla_gpl-2.9.4.dev1609091105/Qt4Qt5
+# DEPENDPATH += /Users/sam/Downloads/tmp/QScintilla_gpl-2.9.4.dev1609091105/Qt4Qt5
+
+INCLUDEPATH += /Users/sam/Downloads/tmp/QScintilla_gpl-2.9.3.dev1606101834/Qt4Qt5
+DEPENDPATH += /Users/sam/Downloads/tmp/QScintilla_gpl-2.9.3.dev1606101834/Qt4Qt5
+QMAKE_MAC_SDK = macosx10.11
+
QT += core gui concurrent network
greaterThan(QT_MAJOR_VERSION, 4) {
QT += widgets opengl
}
-
# Linux only
unix:!macx {
LIBS += -lrt
@@ -47,6 +62,7 @@ macx {
QMAKE_CXXFLAGS += -Wall -Werror -Wextra -Wno-unused-variable -Wno-unused-parameter
CONFIG += warn_off
TARGET = 'Sonic Pi'
+ LIBS += -lqscintilla2
}
# Windows only
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -14,8 +14,14 @@
#++
## ---- Modify these to point to your system
-QSCINTILLA="native/qscintilla"
-QTBIN="native/qt5.5/bin"
+QSCINTILLA=/Users/sam/Downloads/tmp/QScintilla_gpl-2.9.3.dev1606101834/Qt4Qt5
+QWT=/usr/local/qwt-6.1.2/
+QTBIN=/Users/sam/Development/Qt5.6.1/5.6/clang_64/bin
+#QTBIN=/Users/sam/Development/Qt5.7/5.7/clang_64/bin
+LIBQS=libqscintilla2.12.0.2.dylib
+LIBQS_LINK=libqscintilla2.12.dylib
+# QSCINTILLA="native/qscintilla"
+# QTBIN="native/qt5.5/bin"
#LIBQS=libqscintilla2.12.0.0.dylib
#LIBQS_LINK=libqscintilla2.12.dylib
## ----
@@ -59,9 +65,12 @@ cp $LIBQS_PATH "$SP/Contents/MacOS/"
$MACDEPLOYQT "$SP"
# Put qscintilla dylib in Frameworks dir and symlink
-cd "$SP/Contents/Frameworks"
-mv ../MacOS/$LIBQS .
+cd "$SP/Contents/MacOS"
+# mv ../MacOS/$LIBQS .
+cp -R ~/Desktop/qwt.framework .
+
+echo `pwd`
if [ ! -f $LIBQS_LINK ]; then
ln -s $LIBQS $LIBQS_LINK
fi
@@ -987,6 +987,26 @@ def ring(*args)
+ def map(*args)
+ SonicPi::Core::SPMap.new(*args)
+ end
+ doc name: :map,
+ introduced: Version.new(2,11,0),
+ summary: "Create an immutable map",
+ args: [[:list, :array]],
+ returns: :map,
+ opts: nil,
+ accepts_block: false,
+ doc: "Create a new immutable key/value map from args. ",
+ examples: [
+ "(map foo: 1, bar: 2)[:foo] #=> 1",
+ "(map foo: 1, bar: 2)[:bar] #=> 2",
+ "(map foo: 1, bar: 2)[:quux] #=> nil",
+ ]
+
+
+
+
def ramp(*args)
SonicPi::Core::RampVector.new(args)
@@ -326,6 +326,10 @@ def __current_local_run_time
__system_thread_locals.get(:sonic_pi_spider_time) - __system_thread_locals.get(:sonic_pi_spider_start_time)
end
+ def __current_sched_at_time
+ __system_thread_locals.get(:sonic_pi_spider_time) + @mod_sound_studio.sched_ahead_time
+ end
+
def __current_thread_name
__system_thread_locals.get(:sonic_pi_local_spider_users_thread_name) || ""
end
@@ -341,7 +341,7 @@ def boot_server_osx
raise "Unable to boot sound synthesis engine: the input and output rates of your audio card are not the same. Got in: #{audio_in_rate}, out: #{audio_out_rate}."
end
end
- boot_and_wait(scsynth_path, "-u", @port.to_s, "-a", num_audio_busses_for_current_os.to_s, "-m", "131072", "-D", "0", "-R", "0", "-l", "1", "-i", "16", "-o", "16", "-b", num_buffers_for_current_os.to_s, "-B", "127.0.0.1")
+ boot_and_wait(scsynth_path, "-u", @port.to_s, "-a", num_audio_busses_for_current_os.to_s, "-m", "131072", "-D", "0", "-R", "0", "-l", "1", "-i", "16", "-o", "16", "-b", num_buffers_for_current_os.to_s)
end
@@ -341,6 +341,7 @@ def log(message)
end
def log_process_info(s)
+ puts s
if @@process_log_file
@@process_log_file.puts s
@@process_log_file.flush

1 comment on commit 8cbc261

@rbnpi
Contributor
rbnpi commented on 8cbc261 Oct 11, 2016

Is it worth bumping to qwt-6.1.3 instead of 6.1.2? This is tthe latest release version, and it builds fine on MacOSX and RP (tried with latest version ab42b. Just needs change in SonicPi.pro to reflect this.

Please sign in to comment.