Modified by: [EMAIL PROTECTED]
Reviewed by:
Date: 05/31/2005
Project:Helix Symbian Player
Synopsis: Fix link error for CW Emulator
Overview:
In aac/codec/fixpt/decoder/hxwrap/umake_dll_symbian.pcf the library
longlong.lib is added when __WINS__ is defined
if project.IsDefined("__WINS__"):
project.AddSystemLibraries('longlong.lib')
project.AddModuleLibraries("common/container[contlib]")
Since __WINS__ is also defined in .cf file for CW emulator because until
this moment there were not changes between emulator for CW or emulator for
VC. But in this case the longlong.lib is not needed and this produces a link
error. I think this should be changed to
-if project.IsDefined("__WINS__"):
+if project.IsDefined("__WINS__") and not project.IsDefined("__CW32__"):
However, I think the correct change would be replace the __WINS__ define by
__WINSCW__, in the .cf file for CW, but this change implies a lot changes
in defines, which are listed below.
Which do you think is the better change?
Modified files:
Branch: 150Cay and Head
Copyright assignment:
I agree to assign to RealNetworks full copyright ownership of the code
represented by the attached patch. I warrant that I am legally entitled to
grant the copyright assignment and that my contribution does not violate any
law or breach any contract. I understand that RealNetworks may license this
code under RPSL, RCSL, and/or any other license at RealNetworks' sole
discretion.
Index: umakecf/symbian-emulator-winscw.cf
===================================================================
RCS file: /cvsroot/ribosome/build/umakecf/symbian-emulator-winscw.cf,v
retrieving revision 1.7
diff -u -r1.7 symbian-emulator-winscw.cf
--- umakecf/symbian-emulator-winscw.cf 25 Apr 2005 23:32:29 -0000 1.7
+++ umakecf/symbian-emulator-winscw.cf 31 May 2005 23:08:52 -0000
@@ -50,7 +50,7 @@
## Turn these on for emulator builds.
project.AddDefines( '__CW32__',
- '__WINS__',
+ '__WINSCW__',
)
## Output directory setup
Index: fixptresampler/core.c
===================================================================
RCS file: /cvsroot/audio/fixptresampler/core.c,v
retrieving revision 1.3
diff -u -r1.3 core.c
--- fixptresampler/core.c 17 Sep 2003 22:55:31 -0000 1.3
+++ fixptresampler/core.c 31 May 2005 23:43:56 -0000
@@ -43,7 +43,7 @@
#include "core.h"
-#if defined (_M_IX86) || (defined (_SYMBIAN) && defined (__WINS__))
+#if defined (_M_IX86) || (defined (_SYMBIAN) && (defined (__WINS__) ||
defined (__WINSCW__)) )
__inline int MULHI(int a, int b) {
__asm mov eax, a
__asm imul b
Index: fixptutil/pub/math64.h
===================================================================
RCS file: /cvsroot/audio/fixptutil/pub/math64.h,v
retrieving revision 1.27
diff -u -r1.27 math64.h
--- fixptutil/pub/math64.h 2 May 2005 18:38:09 -0000 1.27
+++ fixptutil/pub/math64.h 31 May 2005 23:55:36 -0000
@@ -53,7 +53,7 @@
// MSVC / i386
////////////////////////////////////////////////////////////////////////////
///////////
-#if (defined(_M_IX86) && defined(_MSC_VER)) || (defined(__WINS__) &&
defined(_SYMBIAN)) || (defined(__WINS__) && defined(WINCE_EMULATOR)) ||
(defined(_OPENWAVE_SIMULATOR))
+#if (defined(_M_IX86) && defined(_MSC_VER)) || ((defined(__WINS__) ||
defined(__WINSCW__)) && defined(_SYMBIAN)) || (defined(__WINS__) &&
defined(WINCE_EMULATOR)) || (defined(_OPENWAVE_SIMULATOR))
#define HAVE_PLATFORM_MACROS
Index: codec/ra8lbr/fixpt/decoder/assembly.h
===================================================================
RCS file: /cvsroot/rarvcode-audio/codec/ra8lbr/fixpt/decoder/assembly.h,v
retrieving revision 1.13
diff -u -r1.13 assembly.h
--- codec/ra8lbr/fixpt/decoder/assembly.h 27 Apr 2005 19:20:50 -0000
1.13
+++ codec/ra8lbr/fixpt/decoder/assembly.h 1 Jun 2005 00:00:35 -0000
@@ -58,7 +58,7 @@
/* toolchain: MSFT Visual C++
* target architecture: x86
*/
-#if (defined _WIN32 && !defined _WIN32_WCE) || (defined __WINS__ && defined
_SYMBIAN) || (defined WINCE_EMULATOR) || (defined _OPENWAVE_SIMULATOR)
+#if (defined _WIN32 && !defined _WIN32_WCE) || ( (defined __WINS__ ||
defined __WINSCW__) && defined _SYMBIAN) || (defined WINCE_EMULATOR) ||
(defined _OPENWAVE_SIMULATOR)
#pragma warning( disable : 4035 ) /* complains about inline asm not
returning a value */
Index: codec/ra8lbr/fixpt/decoder/gecko2codec.h
===================================================================
RCS file: /cvsroot/rarvcode-audio/codec/ra8lbr/fixpt/decoder/gecko2codec.h,v
retrieving revision 1.10
diff -u -r1.10 gecko2codec.h
--- codec/ra8lbr/fixpt/decoder/gecko2codec.h 27 Apr 2005 19:20:50 -0000
1.10
+++ codec/ra8lbr/fixpt/decoder/gecko2codec.h 31 May 2005 23:58:50 -0000
@@ -54,7 +54,7 @@
#
#elif defined(ARM_ADS)
#
-#elif defined(_SYMBIAN) && defined(__WINS__)
+#elif defined(_SYMBIAN) && ( defined(__WINS__) || defined(__WINSCW__))
#
#elif defined(__GNUC__) && defined(ARM)
#
Index: aac/codec/fixpt/decoder/pub/aacdec.h
===================================================================
RCS file: /cvsroot/datatype/aac/codec/fixpt/decoder/pub/aacdec.h,v
retrieving revision 1.2
diff -u -r1.2 aacdec.h
--- aac/codec/fixpt/decoder/pub/aacdec.h 18 Mar 2005 23:52:22 -0000
1.2
+++ aac/codec/fixpt/decoder/pub/aacdec.h 1 Jun 2005 00:06:23 -0000
@@ -54,7 +54,7 @@
#
#elif defined (__arm) && defined (__ARMCC_VERSION)
#
-#elif defined(_SYMBIAN) && defined(__WINS__)
+#elif defined(_SYMBIAN) && ( defined(__WINS__) || defined(__WINSCW__) )
#
#elif defined(__GNUC__) && defined(__arm__)
#
Index: aac/codec/fixpt/decoder/real/assembly.h
===================================================================
RCS file: /cvsroot/datatype/aac/codec/fixpt/decoder/real/assembly.h,v
retrieving revision 1.2
diff -u -r1.2 assembly.h
--- aac/codec/fixpt/decoder/real/assembly.h 11 May 2005 16:00:58 -0000
1.2
+++ aac/codec/fixpt/decoder/real/assembly.h 1 Jun 2005 00:07:01 -0000
@@ -57,7 +57,7 @@
/* toolchain: MSFT Visual C++
* target architecture: x86
*/
-#if (defined (_WIN32) && !defined (_WIN32_WCE)) || (defined (__WINS__) &&
defined (_SYMBIAN)) || (defined (WINCE_EMULATOR)) || (defined
(_OPENWAVE_SIMULATOR))
+#if (defined (_WIN32) && !defined (_WIN32_WCE)) || ( (defined __WINS__ ||
defined __WINSCW__) && defined (_SYMBIAN)) || (defined (WINCE_EMULATOR)) ||
(defined (_OPENWAVE_SIMULATOR))
#pragma warning( disable : 4035 ) /* complains about inline asm not
returning a value */
Index: mp3/codec/fixpt/pub/mp3dec.h
===================================================================
RCS file: /cvsroot/datatype/mp3/codec/fixpt/pub/mp3dec.h,v
retrieving revision 1.6
diff -u -r1.6 mp3dec.h
--- mp3/codec/fixpt/pub/mp3dec.h 5 Jan 2005 21:14:21 -0000 1.6
+++ mp3/codec/fixpt/pub/mp3dec.h 1 Jun 2005 00:01:51 -0000
@@ -52,7 +52,7 @@
#
#elif defined(ARM_ADS)
#
-#elif defined(_SYMBIAN) && defined(__WINS__) /* Symbian emulator for Ix86
*/
+#elif defined(_SYMBIAN) && ( defined(__WINS__) || defined(__WINSCW__) )
/*
Symbian emulator for Ix86 */
#
#elif defined(__GNUC__) && defined(ARM)
#
Index: mp3/codec/fixpt/real/assembly.h
===================================================================
RCS file: /cvsroot/datatype/mp3/codec/fixpt/real/assembly.h,v
retrieving revision 1.7
diff -u -r1.7 assembly.h
--- mp3/codec/fixpt/real/assembly.h 11 May 2005 14:36:23 -0000 1.7
+++ mp3/codec/fixpt/real/assembly.h 1 Jun 2005 00:02:38 -0000
@@ -56,7 +56,7 @@
#ifndef _ASSEMBLY_H
#define _ASSEMBLY_H
-#if (defined _WIN32 && !defined _WIN32_WCE) || (defined __WINS__ && defined
_SYMBIAN) || defined(_OPENWAVE_SIMULATOR) || defined(WINCE_EMULATOR) /*
Symbian emulator for Ix86 */
+#if (defined _WIN32 && !defined _WIN32_WCE) || ( (defined __WINS__ ||
defined __WINSCW__) && defined _SYMBIAN) || defined(_OPENWAVE_SIMULATOR) ||
defined(WINCE_EMULATOR) /* Symbian emulator for Ix86 */
#pragma warning( disable : 4035 ) /* complains about inline asm not
returning a value */
Index: mp4/fileformat/pub/qtatoms.h
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/pub/qtatoms.h,v
retrieving revision 1.16
diff -u -r1.16 qtatoms.h
--- mp4/fileformat/pub/qtatoms.h 14 Mar 2005 19:17:44 -0000 1.16
+++ mp4/fileformat/pub/qtatoms.h 1 Jun 2005 00:04:31 -0000
@@ -58,7 +58,7 @@
#define TKHD_MATRIX_TX_LOCATION (sizeof(UINT32) * 6)
#define TKHD_MATRIX_TY_LOCATION (sizeof(UINT32) * 7)
-#if defined(_SYMBIAN) && !defined(__WINS__)
+#if defined(_SYMBIAN) && !defined(__WINS__) && !defined(__WINSCW__)
# define PACKING __attribute__ ((packed))
#else
# define PACKING
_______________________________________________
Audio-dev mailing list
[email protected]
http://lists.helixcommunity.org/mailman/listinfo/audio-dev
