Browse Source

Add glfw and rtaudio git submodules

tags/v0.6.0
Andrew Belt 7 years ago
parent
commit
f7ea40f677
4 changed files with 8 additions and 2 deletions
  1. +6
    -0
      .gitmodules
  2. +0
    -2
      dep/Makefile
  3. +1
    -0
      dep/glfw
  4. +1
    -0
      dep/rtaudio

+ 6
- 0
.gitmodules View File

@@ -10,3 +10,9 @@
[submodule "ext/oui-blendish"] [submodule "ext/oui-blendish"]
path = ext/oui-blendish path = ext/oui-blendish
url = https://github.com/AndrewBelt/oui-blendish.git url = https://github.com/AndrewBelt/oui-blendish.git
[submodule "dep/glfw"]
path = dep/glfw
url = https://github.com/glfw/glfw.git
[submodule "dep/rtaudio"]
path = dep/rtaudio
url = https://github.com/thestk/rtaudio.git

+ 0
- 2
dep/Makefile View File

@@ -86,7 +86,6 @@ $(glew):
$(MAKE) -C glew-2.1.0 GLEW_DEST="$(LOCAL)" LIBDIR="$(LOCAL)/lib" install $(MAKE) -C glew-2.1.0 GLEW_DEST="$(LOCAL)" LIBDIR="$(LOCAL)/lib" install


$(glfw): $(glfw):
git clone https://github.com/glfw/glfw.git
cd glfw && $(CMAKE) . \ cd glfw && $(CMAKE) . \
-DCMAKE_INSTALL_PREFIX="$(LOCAL)" -DBUILD_SHARED_LIBS=ON \ -DCMAKE_INSTALL_PREFIX="$(LOCAL)" -DBUILD_SHARED_LIBS=ON \
-DGLFW_COCOA_CHDIR_RESOURCES=OFF -DGLFW_COCOA_MENUBAR=ON -DGLFW_COCOA_RETINA_FRAMEBUFFER=ON -DGLFW_COCOA_CHDIR_RESOURCES=OFF -DGLFW_COCOA_MENUBAR=ON -DGLFW_COCOA_RETINA_FRAMEBUFFER=ON
@@ -131,7 +130,6 @@ $(rtmidi):
$(MAKE) -C rtmidi-3.0.0 install $(MAKE) -C rtmidi-3.0.0 install


$(rtaudio): $(rtaudio):
git clone https://github.com/thestk/rtaudio.git
cd rtaudio && mkdir -p cmakebuild cd rtaudio && mkdir -p cmakebuild
cd rtaudio/cmakebuild && cmake -G 'Unix Makefiles' -DCMAKE_INSTALL_PREFIX="$(LOCAL)" $(RTAUDIO_FLAGS) .. cd rtaudio/cmakebuild && cmake -G 'Unix Makefiles' -DCMAKE_INSTALL_PREFIX="$(LOCAL)" $(RTAUDIO_FLAGS) ..
$(MAKE) -C rtaudio/cmakebuild $(MAKE) -C rtaudio/cmakebuild


+ 1
- 0
dep/glfw

@@ -0,0 +1 @@
Subproject commit 30489c5aa1392f698e904c6aced1d7a486634c40

+ 1
- 0
dep/rtaudio

@@ -0,0 +1 @@
Subproject commit ce13dfbf30fd1ab4e7f7eff8886a80f144c75e5d

Loading…
Cancel
Save