From bcfd17f68e327d9219d67289728f6985a5aab3cd Mon Sep 17 00:00:00 2001 From: julien Date: Wed, 6 Apr 2011 23:00:44 +0000 Subject: [PATCH] - fixing scons build --- Build/Targets/mipsel-sigma-linux/Config.scons | 2 +- Build/Targets/sh4-st-linux/Config.scons | 2 +- Build/Targets/x86-unknown-cygwin/Config.scons | 2 +- Build/Targets/x86-unknown-linux/Config.scons | 2 +- Build/Targets/x86-unknown-mingw/Config.scons | 2 +- Build/Targets/x86_64-unknown-linux/Config.scons | 2 +- Source/C++/Core/Ap4Piff.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Build/Targets/mipsel-sigma-linux/Config.scons b/Build/Targets/mipsel-sigma-linux/Config.scons index 54a8e5c4..a7f844d6 100644 --- a/Build/Targets/mipsel-sigma-linux/Config.scons +++ b/Build/Targets/mipsel-sigma-linux/Config.scons @@ -1,2 +1,2 @@ LoadTool('gcc-generic', env, gcc_cross_prefix='mipsel-linux') -env.AppendUnique(CPPDEFINES = {'AP4_PLATFORM_BYTE_ORDER':'AP4_PLATFORM_BYTE_ORDER_LITTLE_ENDIAN'}) +env.AppendUnique(CPPDEFINES = [('AP4_PLATFORM_BYTE_ORDER', 'AP4_PLATFORM_BYTE_ORDER_LITTLE_ENDIAN')]) diff --git a/Build/Targets/sh4-st-linux/Config.scons b/Build/Targets/sh4-st-linux/Config.scons index 40bdc127..f92b7a00 100644 --- a/Build/Targets/sh4-st-linux/Config.scons +++ b/Build/Targets/sh4-st-linux/Config.scons @@ -1,2 +1,2 @@ LoadTool('gcc-generic', env, gcc_cross_prefix='sh4-linux') -env.AppendUnique(CPPDEFINES = {'AP4_PLATFORM_BYTE_ORDER':'AP4_PLATFORM_BYTE_ORDER_LITTLE_ENDIAN'}) +env.AppendUnique(CPPDEFINES = [('AP4_PLATFORM_BYTE_ORDER', 'AP4_PLATFORM_BYTE_ORDER_LITTLE_ENDIAN')]) diff --git a/Build/Targets/x86-unknown-cygwin/Config.scons b/Build/Targets/x86-unknown-cygwin/Config.scons index 25bf021a..446de5a5 100644 --- a/Build/Targets/x86-unknown-cygwin/Config.scons +++ b/Build/Targets/x86-unknown-cygwin/Config.scons @@ -1,3 +1,3 @@ LoadTool('gcc-generic', env) -env.AppendUnique(CPPDEFINES = {'AP4_PLATFORM_BYTE_ORDER':'AP4_PLATFORM_BYTE_ORDER_LITTLE_ENDIAN'}) +env.AppendUnique(CPPDEFINES = [('AP4_PLATFORM_BYTE_ORDER', 'AP4_PLATFORM_BYTE_ORDER_LITTLE_ENDIAN')]) diff --git a/Build/Targets/x86-unknown-linux/Config.scons b/Build/Targets/x86-unknown-linux/Config.scons index c852ee1c..38017eee 100644 --- a/Build/Targets/x86-unknown-linux/Config.scons +++ b/Build/Targets/x86-unknown-linux/Config.scons @@ -1,2 +1,2 @@ LoadTool('gcc-generic', env) -env.AppendUnique(CPPDEFINES = {'AP4_PLATFORM_BYTE_ORDER':'AP4_PLATFORM_BYTE_ORDER_LITTLE_ENDIAN'}) +env.AppendUnique(CPPDEFINES = [('AP4_PLATFORM_BYTE_ORDER', 'AP4_PLATFORM_BYTE_ORDER_LITTLE_ENDIAN')]) diff --git a/Build/Targets/x86-unknown-mingw/Config.scons b/Build/Targets/x86-unknown-mingw/Config.scons index 9d5fd81f..8f7fea93 100644 --- a/Build/Targets/x86-unknown-mingw/Config.scons +++ b/Build/Targets/x86-unknown-mingw/Config.scons @@ -1,4 +1,4 @@ Tool('mingw') LoadTool('gcc-generic', env) -env.AppendUnique(CPPDEFINES = {'AP4_PLATFORM_BYTE_ORDER':'AP4_PLATFORM_BYTE_ORDER_LITTLE_ENDIAN'}) +env.AppendUnique(CPPDEFINES = [('AP4_PLATFORM_BYTE_ORDER', 'AP4_PLATFORM_BYTE_ORDER_LITTLE_ENDIAN')]) diff --git a/Build/Targets/x86_64-unknown-linux/Config.scons b/Build/Targets/x86_64-unknown-linux/Config.scons index 3ad1485e..907f5972 100644 --- a/Build/Targets/x86_64-unknown-linux/Config.scons +++ b/Build/Targets/x86_64-unknown-linux/Config.scons @@ -11,5 +11,5 @@ env['BUILDERS']['Library'] = picLibBuilder ### Load common tool settings LoadTool('gcc-generic', env) -env.AppendUnique(CPPDEFINES = {'AP4_PLATFORM_BYTE_ORDER':'AP4_PLATFORM_BYTE_ORDER_LITTLE_ENDIAN'}) +env.AppendUnique(CPPDEFINES = [('AP4_PLATFORM_BYTE_ORDER', 'AP4_PLATFORM_BYTE_ORDER_LITTLE_ENDIAN')]) diff --git a/Source/C++/Core/Ap4Piff.cpp b/Source/C++/Core/Ap4Piff.cpp index 2caf9901..4f4225cd 100644 --- a/Source/C++/Core/Ap4Piff.cpp +++ b/Source/C++/Core/Ap4Piff.cpp @@ -1084,7 +1084,7 @@ AP4_DEFINE_DYNAMIC_CAST_ANCHOR(AP4_PiffTrackDecrypter) +---------------------------------------------------------------------*/ AP4_Result AP4_PiffTrackDecrypter::Create(const unsigned char* key, - AP4_Size key_size, + AP4_Size /* key_size */, AP4_ProtectedSampleDescription* sample_description, AP4_SampleEntry* sample_entry, AP4_PiffTrackDecrypter*& decrypter)