- fixing scons build

This commit is contained in:
julien
2011-04-06 23:00:44 +00:00
parent f1b8ec2851
commit bcfd17f68e
7 changed files with 7 additions and 7 deletions

View File

@@ -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')])

View File

@@ -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')])

View File

@@ -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')])

View File

@@ -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')])

View File

@@ -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')])

View File

@@ -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')])

View File

@@ -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)