diff -r 400056412520 build.xml
--- a/build.xml Tue Jan 31 13:41:19 2012 -0800
+++ b/build.xml Thu Feb 02 08:58:09 2012 -0800
@@ -209,7 +209,7 @@
-
+
diff -r 400056412520 jfxmedia-native/jfxmedia-jni/Projects/Jfxmedia_jni.xcodeproj/project.pbxproj
--- a/jfxmedia-native/jfxmedia-jni/Projects/Jfxmedia_jni.xcodeproj/project.pbxproj Tue Jan 31 13:41:19 2012 -0800
+++ b/jfxmedia-native/jfxmedia-jni/Projects/Jfxmedia_jni.xcodeproj/project.pbxproj Thu Feb 02 08:58:09 2012 -0800
@@ -50,7 +50,7 @@
E43F82E711235A5E00CB63F3 /* Singleton.h in Headers */ = {isa = PBXBuildFile; fileRef = E43F82E611235A5E00CB63F3 /* Singleton.h */; };
E466D4B21174E73F001918DF /* MediaWarningDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = E466D4B01174E73F001918DF /* MediaWarningDispatcher.h */; };
E466D4B31174E73F001918DF /* MediaWarningDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E466D4B11174E73F001918DF /* MediaWarningDispatcher.cpp */; };
- E4721321119E0868006CA4EE /* libjfxmedia.jnilib in Frameworks */ = {isa = PBXBuildFile; fileRef = 233A2D7B10B1D9F5004A0703 /* libjfxmedia.jnilib */; };
+ E4721321119E0868006CA4EE /* libjfxmedia.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 233A2D7B10B1D9F5004A0703 /* libjfxmedia.dylib */; };
E4AF7FD7112623E10058FE98 /* Track.h in Headers */ = {isa = PBXBuildFile; fileRef = E4AF7FD6112623E10058FE98 /* Track.h */; };
E4AF7FE51126269B0058FE98 /* Track.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4AF7FE41126269B0058FE98 /* Track.cpp */; };
E4AF805711262CF60058FE98 /* AudioTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = E4AF805511262CF60058FE98 /* AudioTrack.h */; };
@@ -118,7 +118,7 @@
112F6339116D3D9200688B62 /* Logger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Logger.cpp; path = ../jni/Logger.cpp; sourceTree = SOURCE_ROOT; };
112F633B116D3DA100688B62 /* Logger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Logger.h; path = ../jni/Logger.h; sourceTree = SOURCE_ROOT; };
2325AFEA115C0A3E00478032 /* PipelineOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PipelineOptions.h; path = ../PipelineManagement/PipelineOptions.h; sourceTree = SOURCE_ROOT; };
- 233A2D7B10B1D9F5004A0703 /* libjfxmedia.jnilib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libjfxmedia.jnilib; sourceTree = BUILT_PRODUCTS_DIR; };
+ 233A2D7B10B1D9F5004A0703 /* libjfxmedia.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libjfxmedia.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
235935E610D990C300CACBD5 /* ProductFlags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProductFlags.h; sourceTree = ""; };
238DC10E110FD6DB00E4CB14 /* AutoLock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AutoLock.h; path = ../Utils/AutoLock.h; sourceTree = SOURCE_ROOT; };
238DC10F110FD6DB00E4CB14 /* JfxCriticalSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JfxCriticalSection.h; path = ../Utils/JfxCriticalSection.h; sourceTree = SOURCE_ROOT; };
@@ -213,7 +213,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- E4721321119E0868006CA4EE /* libjfxmedia.jnilib in Frameworks */,
+ E4721321119E0868006CA4EE /* libjfxmedia.dylib in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -223,7 +223,7 @@
034768DDFF38A45A11DB9C8B /* Products */ = {
isa = PBXGroup;
children = (
- 233A2D7B10B1D9F5004A0703 /* libjfxmedia.jnilib */,
+ 233A2D7B10B1D9F5004A0703 /* libjfxmedia.dylib */,
E472119F119DFB29006CA4EE /* playback */,
);
name = Products;
@@ -505,7 +505,7 @@
);
name = Jfxmedia_jni;
productName = libJfxmedia_jni;
- productReference = 233A2D7B10B1D9F5004A0703 /* libjfxmedia.jnilib */;
+ productReference = 233A2D7B10B1D9F5004A0703 /* libjfxmedia.dylib */;
productType = "com.apple.product-type.library.dynamic";
};
E472119E119DFB29006CA4EE /* playback */ = {
@@ -615,7 +615,7 @@
1DEB916108733D950010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- EXECUTABLE_EXTENSION = jnilib;
+ EXECUTABLE_EXTENSION = dylib;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks\"",
@@ -660,7 +660,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- EXECUTABLE_EXTENSION = jnilib;
+ EXECUTABLE_EXTENSION = dylib;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks\"",
diff -r 400056412520 jfxmedia-native/jfxmedia-jni/build.xml
--- a/jfxmedia-native/jfxmedia-jni/build.xml Tue Jan 31 13:41:19 2012 -0800
+++ b/jfxmedia-native/jfxmedia-jni/build.xml Thu Feb 02 08:58:09 2012 -0800
@@ -4,7 +4,7 @@
-
+