[xiph-commits] r10748 - in trunk/xiph-qt: CASpeex/CASpeex.xcodeproj
CASpeex/src CAVorbis/CAVorbis.xcodeproj CAVorbis/src
OggImport/OggImport.xcodeproj OggImport/src build-win32 resources
arek at svn.xiph.org
arek at svn.xiph.org
Mon Jan 23 10:01:12 PST 2006
Author: arek
Date: 2006-01-23 10:00:56 -0800 (Mon, 23 Jan 2006)
New Revision: 10748
Modified:
trunk/xiph-qt/CASpeex/CASpeex.xcodeproj/project.pbxproj
trunk/xiph-qt/CASpeex/src/CASpeexDecoder.h
trunk/xiph-qt/CAVorbis/CAVorbis.xcodeproj/project.pbxproj
trunk/xiph-qt/CAVorbis/src/CAVorbisDecoder.h
trunk/xiph-qt/OggImport/OggImport.xcodeproj/project.pbxproj
trunk/xiph-qt/OggImport/src/OggImport.r
trunk/xiph-qt/build-win32/XiphQT.dsp
trunk/xiph-qt/resources/XCAResources.r
Log:
Universal Binary support: small build config and code changes.
Modified: trunk/xiph-qt/CASpeex/CASpeex.xcodeproj/project.pbxproj
===================================================================
--- trunk/xiph-qt/CASpeex/CASpeex.xcodeproj/project.pbxproj 2006-01-23 11:41:36 UTC (rev 10747)
+++ trunk/xiph-qt/CASpeex/CASpeex.xcodeproj/project.pbxproj 2006-01-23 18:00:56 UTC (rev 10748)
@@ -435,7 +435,7 @@
buildSettings = {
COPY_PHASE_STRIP = NO;
EXPORTED_SYMBOLS_FILE = src/CASpeexCodec.exp;
- FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/../../../../../Library/Frameworks\"";
+ FRAMEWORK_SEARCH_PATHS = "\"$(LOCAL_LIBRARY_DIR)/Frameworks\"";
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -457,7 +457,7 @@
buildSettings = {
COPY_PHASE_STRIP = YES;
EXPORTED_SYMBOLS_FILE = src/CASpeexCodec.exp;
- FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/../../../../../Library/Frameworks\"";
+ FRAMEWORK_SEARCH_PATHS = "\"$(LOCAL_LIBRARY_DIR)/Frameworks\"";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -478,7 +478,7 @@
isa = XCBuildConfiguration;
buildSettings = {
EXPORTED_SYMBOLS_FILE = src/CASpeexCodec.exp;
- FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/../../../../../Library/Frameworks\"";
+ FRAMEWORK_SEARCH_PATHS = "\"$(LOCAL_LIBRARY_DIR)/Frameworks\"";
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = CASpeex_Prefix.pch;
@@ -493,21 +493,48 @@
73814AA50907F9EC00C478FC /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
- OTHER_REZFLAGS = "-D TARGET_REZ_MAC_PPC=1";
+ ARCHS = (
+ ppc,
+ i386,
+ );
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "$(GCC_PREPROCESSOR_DEFINITIONS)",
+ QT_IA32__VBR_BROKEN,
+ );
+ OTHER_REZFLAGS = "$(OTHER_REZFLAGS) -D TARGET_REZ_MAC_PPC=1 -D BUILD_UNIVERSAL";
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Development;
};
73814AA60907F9EC00C478FC /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
- OTHER_REZFLAGS = "-D TARGET_REZ_MAC_PPC=1";
+ ARCHS = (
+ ppc,
+ i386,
+ );
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "$(GCC_PREPROCESSOR_DEFINITIONS)",
+ QT_IA32__VBR_BROKEN,
+ );
+ OTHER_REZFLAGS = "$(OTHER_REZFLAGS) -D TARGET_REZ_MAC_PPC=1 -D BUILD_UNIVERSAL";
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Deployment;
};
73814AA70907F9EC00C478FC /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
- OTHER_REZFLAGS = "-D TARGET_REZ_MAC_PPC=1";
+ ARCHS = (
+ ppc,
+ i386,
+ );
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "$(GCC_PREPROCESSOR_DEFINITIONS)",
+ QT_IA32__VBR_BROKEN,
+ );
+ OTHER_REZFLAGS = "$(OTHER_REZFLAGS) -D TARGET_REZ_MAC_PPC=1 -D BUILD_UNIVERSAL";
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Default;
};
Modified: trunk/xiph-qt/CASpeex/src/CASpeexDecoder.h
===================================================================
--- trunk/xiph-qt/CASpeex/src/CASpeexDecoder.h 2006-01-23 11:41:36 UTC (rev 10747)
+++ trunk/xiph-qt/CASpeex/src/CASpeexDecoder.h 2006-01-23 18:00:56 UTC (rev 10748)
@@ -4,7 +4,7 @@
* CASpeexDecoder class definition.
*
*
- * Copyright (c) 2005 Arek Korbik
+ * Copyright (c) 2005-2006 Arek Korbik
*
* This file is part of XiphQT, the Xiph QuickTime Components.
*
@@ -42,7 +42,7 @@
#define _SHOULD_BE_ZERO_HERE 0
-#if defined(TARGET_OS_WIN32) && defined(QT_WIN32__VBR_BROKEN)
+#if defined(TARGET_CPU_X86) && defined(QT_IA32__VBR_BROKEN)
#undef _SHOULD_BE_ZERO_HERE
#define _SHOULD_BE_ZERO_HERE 1
#endif
Modified: trunk/xiph-qt/CAVorbis/CAVorbis.xcodeproj/project.pbxproj
===================================================================
--- trunk/xiph-qt/CAVorbis/CAVorbis.xcodeproj/project.pbxproj 2006-01-23 11:41:36 UTC (rev 10747)
+++ trunk/xiph-qt/CAVorbis/CAVorbis.xcodeproj/project.pbxproj 2006-01-23 18:00:56 UTC (rev 10748)
@@ -433,9 +433,13 @@
737810D108FCC24B00686713 /* Deployment (optimized+) */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ ppc,
+ i386,
+ );
COPY_PHASE_STRIP = YES;
EXPORTED_SYMBOLS_FILE = src/CAVorbisCodec.exp;
- FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/../../../../../Library/Frameworks\"";
+ FRAMEWORK_SEARCH_PATHS = "\"$(LOCAL_LIBRARY_DIR)/Frameworks\"";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -455,22 +459,34 @@
737810D208FCC24B00686713 /* Deployment (optimized+) */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ ppc,
+ i386,
+ );
FRAMEWORK_SEARCH_PATHS = "$(HOME)/Library/Frameworks";
GCC_ALTIVEC_EXTENSIONS = YES;
GCC_AUTO_VECTORIZATION = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_OPTIMIZATION_LEVEL = 3;
- GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
- OTHER_REZFLAGS = "-D TARGET_REZ_MAC_PPC=1";
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ __MACOSX__,
+ QT_IA32__VBR_BROKEN,
+ );
+ OTHER_REZFLAGS = "$(OTHER_REZFLAGS) -D TARGET_REZ_MAC_PPC=1 -D BUILD_UNIVERSAL";
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = "Deployment (optimized+)";
};
737C9E9908F7FE4D00DAC36C /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ ppc,
+ i386,
+ );
COPY_PHASE_STRIP = NO;
EXPORTED_SYMBOLS_FILE = src/CAVorbisCodec.exp;
- FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/../../../../../Library/Frameworks\"";
+ FRAMEWORK_SEARCH_PATHS = "\"$(LOCAL_LIBRARY_DIR)/Frameworks\"";
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -489,9 +505,13 @@
737C9E9A08F7FE4D00DAC36C /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ ppc,
+ i386,
+ );
COPY_PHASE_STRIP = YES;
EXPORTED_SYMBOLS_FILE = src/CAVorbisCodec.exp;
- FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/../../../../../Library/Frameworks\"";
+ FRAMEWORK_SEARCH_PATHS = "\"$(LOCAL_LIBRARY_DIR)/Frameworks\"";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -511,8 +531,12 @@
737C9E9B08F7FE4D00DAC36C /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ ppc,
+ i386,
+ );
EXPORTED_SYMBOLS_FILE = src/CAVorbisCodec.exp;
- FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/../../../../../Library/Frameworks\"";
+ FRAMEWORK_SEARCH_PATHS = "\"$(LOCAL_LIBRARY_DIR)/Frameworks\"";
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = CAVorbis_Prefix.pch;
@@ -526,28 +550,53 @@
737C9E9D08F7FE4D00DAC36C /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ ppc,
+ i386,
+ );
FRAMEWORK_SEARCH_PATHS = "$(HOME)/Library/Frameworks";
GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
- OTHER_REZFLAGS = "-D TARGET_REZ_MAC_PPC=1";
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ __MACOSX__,
+ QT_IA32__VBR_BROKEN,
+ );
+ OTHER_REZFLAGS = "$(OTHER_REZFLAGS) -D TARGET_REZ_MAC_PPC=1 -D BUILD_UNIVERSAL";
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Development;
};
737C9E9E08F7FE4D00DAC36C /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ ppc,
+ i386,
+ );
FRAMEWORK_SEARCH_PATHS = "$(HOME)/Library/Frameworks";
- GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
- OTHER_REZFLAGS = "-D TARGET_REZ_MAC_PPC=1";
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ __MACOSX__,
+ QT_IA32__VBR_BROKEN,
+ NDEBUG,
+ );
+ OTHER_REZFLAGS = "$(OTHER_REZFLAGS) -D TARGET_REZ_MAC_PPC=1 -D BUILD_UNIVERSAL";
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Deployment;
};
737C9E9F08F7FE4D00DAC36C /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ ppc,
+ i386,
+ );
FRAMEWORK_SEARCH_PATHS = "$(HOME)/Library/Frameworks";
- GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__;
- OTHER_REZFLAGS = "-D TARGET_REZ_MAC_PPC=1";
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ __MACOSX__,
+ QT_IA32__VBR_BROKEN,
+ );
+ OTHER_REZFLAGS = "$(OTHER_REZFLAGS) -D TARGET_REZ_MAC_PPC=1 -D BUILD_UNIVERSAL";
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Default;
};
Modified: trunk/xiph-qt/CAVorbis/src/CAVorbisDecoder.h
===================================================================
--- trunk/xiph-qt/CAVorbis/src/CAVorbisDecoder.h 2006-01-23 11:41:36 UTC (rev 10747)
+++ trunk/xiph-qt/CAVorbis/src/CAVorbisDecoder.h 2006-01-23 18:00:56 UTC (rev 10748)
@@ -4,7 +4,7 @@
* CAVorbisDecoder class definition.
*
*
- * Copyright (c) 2005 Arek Korbik
+ * Copyright (c) 2005-2006 Arek Korbik
*
* This file is part of XiphQT, the Xiph QuickTime Components.
*
@@ -41,7 +41,7 @@
#define _SHOULD_BE_ZERO_HERE 0
-#if defined(TARGET_OS_WIN32) && defined(QT_WIN32__VBR_BROKEN)
+#if defined(TARGET_CPU_X86) && defined(QT_IA32__VBR_BROKEN)
#undef _SHOULD_BE_ZERO_HERE
#define _SHOULD_BE_ZERO_HERE 1
#endif
Modified: trunk/xiph-qt/OggImport/OggImport.xcodeproj/project.pbxproj
===================================================================
--- trunk/xiph-qt/OggImport/OggImport.xcodeproj/project.pbxproj 2006-01-23 11:41:36 UTC (rev 10747)
+++ trunk/xiph-qt/OggImport/OggImport.xcodeproj/project.pbxproj 2006-01-23 18:00:56 UTC (rev 10748)
@@ -329,9 +329,13 @@
73182D57090AAD7600C25A13 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ ppc,
+ i386,
+ );
COPY_PHASE_STRIP = NO;
EXPORTED_SYMBOLS_FILE = src/OggImport.exp;
- FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/../../../../../Library/Frameworks\"";
+ FRAMEWORK_SEARCH_PATHS = "\"$(LOCAL_LIBRARY_DIR)/Frameworks\"";
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -355,9 +359,13 @@
73182D58090AAD7600C25A13 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ ppc,
+ i386,
+ );
COPY_PHASE_STRIP = YES;
EXPORTED_SYMBOLS_FILE = src/OggImport.exp;
- FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/../../../../../Library/Frameworks\"";
+ FRAMEWORK_SEARCH_PATHS = "\"$(LOCAL_LIBRARY_DIR)/Frameworks\"";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -380,8 +388,12 @@
73182D59090AAD7600C25A13 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ ppc,
+ i386,
+ );
EXPORTED_SYMBOLS_FILE = src/OggImport.exp;
- FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/../../../../../Library/Frameworks\"";
+ FRAMEWORK_SEARCH_PATHS = "\"$(LOCAL_LIBRARY_DIR)/Frameworks\"";
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = OggImport_Prefix.pch;
@@ -401,21 +413,27 @@
73182D5B090AAD7600C25A13 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
- OTHER_REZFLAGS = "-D TARGET_REZ_MAC_PPC=1";
+ MACOSX_DEPLOYMENT_TARGET = 10.4;
+ OTHER_REZFLAGS = "$(OTHER_REZFLAGS) -D TARGET_REZ_MAC_PPC=1 -D BUILD_UNIVERSAL";
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Development;
};
73182D5C090AAD7600C25A13 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
- OTHER_REZFLAGS = "-D TARGET_REZ_MAC_PPC=1";
+ MACOSX_DEPLOYMENT_TARGET = 10.4;
+ OTHER_REZFLAGS = "$(OTHER_REZFLAGS) -D TARGET_REZ_MAC_PPC=1 -D BUILD_UNIVERSAL";
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Deployment;
};
73182D5D090AAD7600C25A13 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
- OTHER_REZFLAGS = "-D TARGET_REZ_MAC_PPC=1";
+ MACOSX_DEPLOYMENT_TARGET = 10.4;
+ OTHER_REZFLAGS = "$(OTHER_REZFLAGS) -D TARGET_REZ_MAC_PPC=1 -D BUILD_UNIVERSAL";
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Default;
};
Modified: trunk/xiph-qt/OggImport/src/OggImport.r
===================================================================
--- trunk/xiph-qt/OggImport/src/OggImport.r 2006-01-23 11:41:36 UTC (rev 10747)
+++ trunk/xiph-qt/OggImport/src/OggImport.r 2006-01-23 18:00:56 UTC (rev 10748)
@@ -5,7 +5,7 @@
* resources.
*
*
- * Copyright (c) 2005 Arek Korbik
+ * Copyright (c) 2005-2006 Arek Korbik
*
* This file is part of XiphQT, the Xiph QuickTime Components.
*
@@ -34,7 +34,6 @@
#define cfrg_RezTemplateVersion 1
#ifdef TARGET_REZ_MAC_PPC
-#define TARGET_REZ_CARBON_MACHO 1
#include <CoreServices/CoreServices.r>
#include <QuickTime/QuickTime.r>
#include <QuickTime/QuickTimeComponents.r>
@@ -42,16 +41,44 @@
#include "ConditionalMacros.r"
#include "CoreServices.r"
#include "QuickTimeComponents.r"
-#endif
+#endif /* TARGET_REZ_MAC_PPC */
#include "OggImport.h"
#define kImporterComponentType 'eat '
+
+/* How do I do this properly... anybody? */
+#if defined(BUILD_UNIVERSAL)
+ #define TARGET_CPU_PPC 1
+ #define TARGET_CPU_X86 1
+#endif
+
+
#ifndef cmpThreadSafe
#define cmpThreadSafe 0x10000000
#endif
+#if TARGET_OS_MAC
+ #if TARGET_CPU_PPC && TARGET_CPU_X86
+ #define TARGET_REZ_FAT_COMPONENTS 1
+ #define Target_PlatformType platformPowerPCNativeEntryPoint
+ #define Target_SecondPlatformType platformIA32NativeEntryPoint
+ #elif TARGET_CPU_X86
+ #define Target_PlatformType platformIA32NativeEntryPoint
+ #else
+ #define Target_PlatformType platformPowerPCNativeEntryPoint
+ #endif
+#elif TARGET_OS_WIN32
+ #define Target_PlatformType platformWin32
+#else
+ #error get a real platform type
+#endif /* TARGET_OS_MAC */
+
+#if !defined(TARGET_REZ_FAT_COMPONENTS)
+ #define TARGET_REZ_FAT_COMPONENTS 0
+#endif
+
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Ogg Importer
@@ -71,18 +98,17 @@
kOgg_eat__Version,
componentDoAutoVersion|componentHasMultiplePlatforms, 0,
{
-#if TARGET_OS_MAC // COMPONENT PLATFORM INFORMATION ----------------------
+ // COMPONENT PLATFORM INFORMATION ----------------------
kImporterFlags,
'dlle', // Code Resource type - Entry point found by symbol name 'dlle' resource
kImporterResID, // ID of 'dlle' resource
- platformPowerPCNativeEntryPoint,
+ Target_PlatformType,
+#if TARGET_REZ_FAT_COMPONENTS
+ kImporterFlags,
+ 'dlle',
+ kImporterResID,
+ Target_SecondPlatformType,
#endif
-#if TARGET_OS_WIN32
- kImporterFlags,
- 'dlle',
- kImporterResID,
- platformWin32,
-#endif
},
'thnr', kImporterResID
};
@@ -90,7 +116,8 @@
// Component Alias
resource 'thga' (kImporterResID, OggImporterName, purgeable) {
kImporterComponentType, // Type
- 'OGG ', // Subtype - this must be in uppercase. It will match an ".ogg" suffix case-insensitively.
+ 'OGG ', // Subtype - this must be in uppercase.
+ // It will match an ".ogg" suffix case-insensitively.
'soun', // Manufacturer
kImporterFlags | movieImportSubTypeIsFileExtension, // The subtype is a file name suffix
0, // Component Flags Mask
@@ -114,7 +141,8 @@
// Component Alias
resource 'thga' (kImporterResID + 1, OggImporterName, purgeable) {
kImporterComponentType, // Type
- 'OGM ', // Subtype - this must be in uppercase. It will match an ".ogm" suffix case-insensitively.
+ 'OGM ', // Subtype - this must be in uppercase.
+ // It will match an ".ogm" suffix case-insensitively.
'soun', // Manufacturer
kImporterFlags | movieImportSubTypeIsFileExtension, // The subtype is a file name suffix
0, // Component Flags Mask
@@ -138,9 +166,9 @@
// Component Alias
resource 'thga' (kImporterResID + 2, OggImporterName, purgeable) {
kImporterComponentType, // Type
- 'SPX ', // Subtype - this must be in uppercase. It will match an ".ogm" suffix case-insensitively.
+ 'SPX ', // Subtype - this must be in uppercase.
+ // It will match an ".ogm" suffix case-insensitively.
'soun', // Manufacturer
-// kImporterFlags /*| movieImportSubTypeIsFileExtension */, // The .spx extension is used by System Profiler
kImporterFlags | movieImportSubTypeIsFileExtension, // The subtype is a file name suffix
0, // Component Flags Mask
0, // Code Type
@@ -168,11 +196,9 @@
};
-//#if defined(TARGET_REZ_CARBON_MACHO) || defined(TARGET_REZ_WIN32)
resource 'dlle' (kImporterResID, OggImporterName) {
"OggImportComponentDispatch"
};
-//#endif
// name and info string are shared by the compressor and decompressor
resource 'STR ' (kImporterNameStringResID, OggImporterName, purgeable) {
Modified: trunk/xiph-qt/build-win32/XiphQT.dsp
===================================================================
--- trunk/xiph-qt/build-win32/XiphQT.dsp 2006-01-23 11:41:36 UTC (rev 10747)
+++ trunk/xiph-qt/build-win32/XiphQT.dsp 2006-01-23 18:00:56 UTC (rev 10748)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XIPHQT_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "C:\Program Files\QuickTime SDK\CIncludes" /I "..\AppleSDK\CoreAudio\PublicUtility" /I "..\AppleSDK\CoreAudio\AudioCodecs\ACPublic" /I "..\..\ogg\include" /I "..\..\ogg\include\ogg" /I "..\..\vorbis\include" /I "..\..\speex\include" /I "..\common" /I "..\utils" /I "." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XIPHQT_EXPORTS" /D inline=__inline /D "QT_WIN32__VBR_BROKEN" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "C:\Program Files\QuickTime SDK\CIncludes" /I "..\AppleSDK\CoreAudio\PublicUtility" /I "..\AppleSDK\CoreAudio\AudioCodecs\ACPublic" /I "..\..\ogg\include" /I "..\..\ogg\include\ogg" /I "..\..\vorbis\include" /I "..\..\speex\include" /I "..\common" /I "..\utils" /I "." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XIPHQT_EXPORTS" /D inline=__inline /D "QT_IA32__VBR_BROKEN" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -77,7 +77,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XIPHQT_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "C:\Program Files\QuickTime SDK\CIncludes" /I "..\AppleSDK\CoreAudio\PublicUtility" /I "..\AppleSDK\CoreAudio\AudioCodecs\ACPublic" /I "..\..\ogg\include" /I "..\..\ogg\include\ogg" /I "..\..\vorbis\include" /I "..\..\speex\include" /I "..\common" /I "..\utils" /I "." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XIPHQT_EXPORTS" /D inline=__inline /D "QT_WIN32__VBR_BROKEN" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "C:\Program Files\QuickTime SDK\CIncludes" /I "..\AppleSDK\CoreAudio\PublicUtility" /I "..\AppleSDK\CoreAudio\AudioCodecs\ACPublic" /I "..\..\ogg\include" /I "..\..\ogg\include\ogg" /I "..\..\vorbis\include" /I "..\..\speex\include" /I "..\common" /I "..\utils" /I "." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XIPHQT_EXPORTS" /D inline=__inline /D "QT_IA32__VBR_BROKEN" /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
Modified: trunk/xiph-qt/resources/XCAResources.r
===================================================================
--- trunk/xiph-qt/resources/XCAResources.r 2006-01-23 11:41:36 UTC (rev 10747)
+++ trunk/xiph-qt/resources/XCAResources.r 2006-01-23 18:00:56 UTC (rev 10748)
@@ -4,7 +4,7 @@
* 'thng' (and other) resource template for XiphQT CoreAudio components.
*
*
- * Copyright (c) 2005 Arek Korbik
+ * Copyright (c) 2005-2006 Arek Korbik
*
* This file is part of XiphQT, the Xiph QuickTime Components.
*
@@ -53,6 +53,13 @@
#endif /* __HAVE_INCLUDES_ALREADY__ */
+/* How do I do this properly... anybody? */
+#if defined(BUILD_UNIVERSAL)
+ #define TARGET_CPU_PPC 1
+ #define TARGET_CPU_X86 1
+#endif
+
+
#ifndef GEN_MISSING
#define GEN_MISSING 0
#endif
@@ -130,7 +137,7 @@
'dlle', kPrimaryResourceID,
Target_PlatformType,
#if TARGET_REZ_FAT_COMPONENTS
- COMPONENT_FLAGS
+ COMPONENT_FLAGS,
'dlle', kPrimaryResourceID,
Target_SecondPlatformType,
#endif
More information about the commits
mailing list