Skip to content
Browse files

completed Mac build

  • Loading branch information...
1 parent 5ef4a98 commit 22e975e72d7ccbe504a5455b78a7eb558b73b0ee @andyli committed Mar 2, 2011
Showing with 22 additions and 19 deletions.
  1. +1 −0 .gitignore
  2. +1 −6 Main.hx
  3. +1 −1 README.textile
  4. +7 −0 compile-mac.hxml
  5. +1 −1 compile.hxml
  6. BIN ndll/Mac/hxOpenFrameworks.ndll
  7. +11 −11 project/build.xml
View
1 .gitignore
@@ -1,4 +1,5 @@
bin
+bin64
project/obj
project/all_objs
project/vc100.pdb
View
7 Main.hx
@@ -14,13 +14,8 @@ class Main {
//of.examples.MovieGrabberExample.main();
//of.examples.MoviePlayerExample.main(); //you need to copy files from OF\apps\examples\moviePlayerExample\bin\data to bin\data
//of.examples.SoundPlayerExample.main(); //you need to copy files from OF\apps\examples\soundPlayerExample\bin\data to bin\data
- //of.examples.AudioOutputExample.main();
+ of.examples.AudioOutputExample.main();
//of.examples.SoundPlayerFFTExample.main(); //you need to copy files from OF\apps\examples\soundPlayerFFTExample\bin\data to bin\data
//of.examples.AdvancedEventsExample.main();
-
- trace("ok");
}
-
- static var _ofNextPow2 = cpp.Lib.load("hxOpenFrameworks", "_ofNextPow2", 1);
- //static var _RtAudio_new = cpp.Lib.load("hxRtAudio", "_RtAudio_new", 1);
}
View
2 README.textile
@@ -20,7 +20,7 @@ I have replaced the event system with "HSL":http://code.google.com/p/hxhsl/. Now
@SoundStream@ requires "hxRtAudio":http://github.com/andyli/hxRtAudio and compiling with *-DHXCPP_MULTI_THREADED*.
-Currently it supports C++ target on Windows only. Mac and Linux support will be added later.
+Currently it supports C++ target on Windows and Mac. Linux support will be added later.
h2. Known issues
View
7 compile-mac.hxml
@@ -1,7 +1,14 @@
+#-cmd cd project
+#-cmd rm -r obj
+#-cmd haxelib run hxcpp build.xml
+#-cmd cd ..
+
-cpp bin
-main Main
-lib hxcpp
-lib hsl-1
+-cp ../hxRtAudio
+-D HXCPP_MULTI_THREADED
-cmd cp ndll/Mac/*.* bin
View
2 compile.hxml
@@ -1 +1 @@
-compile-linux.hxml
+compile-mac.hxml
View
BIN ndll/Mac/hxOpenFrameworks.ndll
Binary file not shown.
View
22 project/build.xml
@@ -1,9 +1,9 @@
<xml>
<include name="${HXCPP}/build-tool/BuildCommon.xml"/>
- <!--<set name="OF_DIR" value="openFrameworks" />-->
- <set name="OF_DIR" value="../../of_preRelease_v0062_linux_FAT" unless="HXCPP_M64" />
- <set name="OF_DIR" value="../../of_preRelease_v0062_linux64_FAT" if="HXCPP_M64" />
+ <set name="OF_DIR" value="openFrameworks" />
+ <!--<set name="OF_DIR" value="../../of_preRelease_v0062_linux_FAT" unless="HXCPP_M64" />
+ <set name="OF_DIR" value="../../of_preRelease_v0062_linux64_FAT" if="HXCPP_M64" />-->
<set name="OF_PLATFORM" value="vs2010" if="windows" />
<set name="OF_PLATFORM" value="osx" if="macos" />
@@ -13,12 +13,11 @@
<set name="TARGET_MODE" value="Release" unless="debug" />
<files id="oF_Files">
- <!--
<file name="api.cpp"/>
<file name="api_ofxShader.cpp"/>
- -->
- <file name="api-debug.cpp"/>
- <!--
+
+ <!--<file name="api-debug.cpp"/>-->
+
<file name="${OF_DIR}/libs/openFrameworks/app/ofAppGlutWindow.cpp" />
<file name="${OF_DIR}/libs/openFrameworks/app/ofAppRunner.cpp" />
<file name="${OF_DIR}/libs/openFrameworks/graphics/ofBitmapFont.cpp" />
@@ -36,7 +35,6 @@
<file name="${OF_DIR}/libs/openFrameworks/communication/ofSerial.cpp" />
<file name="${OF_DIR}/libs/openFrameworks/events/ofEvents.cpp" />
<file name="${OF_DIR}/addons/ofxShader/src/ofxShader.cpp" />
- <file name="${OF_DIR}/libs/openFrameworks/graphics/ofGraphics.cpp" />-->
<compilerflag value = "-I${OF_DIR}/libs/openFrameworks"/>
@@ -48,7 +46,7 @@
<compilerflag value = "-I${OF_DIR}/libs/openFrameworks/video"/>
<compilerflag value = "-I${OF_DIR}/libs/openFrameworks/events"/>
<compilerflag value = "-I${OF_DIR}/libs/glut/include"/>
- <compilerflag value = "-I${OF_DIR}/libs/quicktime/include" unless="mac" />
+ <compilerflag value = "-I${OF_DIR}/libs/quicktime/include" unless="macos" />
<compilerflag value = "-I${OF_DIR}/libs/freetype/include"/>
<compilerflag value = "-I${OF_DIR}/libs/freetype/include/freetype2"/>
<compilerflag value = "-I${OF_DIR}/libs/FreeImage/include"/>
@@ -72,13 +70,13 @@
<compilerflag value = "-D_CONSOLE" if="windows"/>
<compilerflag value = "-DPOCO_STATIC" if="windows"/>
-
+
<compilerflag value = "-D__MACOSX_CORE__" if="macos"/>
<compilerflag value = "-w" if="macos"/>
<compilerflag value = "-Wfatal-errors" if="macos"/>
<compilerflag value = "-W" if="macos"/>
<compilerflag value = "-fexceptions" if="macos"/>
- <compilerflag value = "-lpthread" if="macos"/>
+
<compilerflag value = "-march=native" if="linux"/>
<compilerflag value = "-mtune=native" if="linux"/>
@@ -158,6 +156,8 @@
<lib name = '${OF_DIR}/libs/fmodex/lib/${OF_PLATFORM}/libfmodex.dylib' if="macos" />
<lib name = '${OF_DIR}/libs/FreeImage/lib/${OF_PLATFORM}/freeimage.a' if="macos" />
+
+ <lib name="-pthread" if="macos"/>
<vflag name="-framework" value="AGL" if="macos"/>
<vflag name="-framework" value="ApplicationServices" if="macos"/>
<vflag name="-framework" value="AudioToolbox" if="macos"/>

0 comments on commit 22e975e

Please sign in to comment.
Something went wrong with that request. Please try again.