[tuhopuu-devel] State of the merge

[Matt Ebb]

--Apple-Mail-3-808792275
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=US-ASCII;
	delsp=yes;
	format=flowed


On 6 Jun 2004, at 8:33 AM, Chris Want wrote:
> This merge went relatively smoothly (the -kk option really helps).
> Each developer should make sure that their work has successfully
> survived this merge ... I apologize if anybody's work got clobbered!
>
> Here are the main issues that might cause problems:
>
> scons users: test!

I've had a few wacky game engine problems using scons on OS X. First  
one was easy to solve, in gameengine/Rasterizer/RAS_IPolygonmaterial.h

These lines (at line 65) were duplicated:
	
	unsigned int			m_polymatid;
	
	static unsigned int		m_newpolymatid;

Deleting these helped it compile.

Now, I'm getting a weird one:

In file included from  
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ 
RAS_GLExtensionManager.h:41,
                  from  
source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp:57:
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ATI_pn_triangles.h: 
17: error: parse
    error before `*' token
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ATI_pn_triangles.h: 
18: error: parse
    error before `*' token
In file included from  
source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp:57:
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ 
RAS_GLExtensionManager.h:461: error: syntax
    error before `;' token
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ 
RAS_GLExtensionManager.h:462: error: syntax
    error before `;' token
scons: ***  
[/Developer/tuhopuu/build/darwin/source/gameengine/BlenderRoutines/ 
BL_KetsjiEmbedStart.o] Error 1

I had a peek in those files, and nothing seems particularly weird  
there, and looking back in the CVS history, nothing seemed to have  
changed must during the merge, before which, tuhopuu2 was compiling  
fine. So is this perhaps a problem on my end?

Cheers

Matt
--Apple-Mail-3-808792275
Content-Transfer-Encoding: base64
Content-Type: application/pkcs7-signature;
	name=smime.p7s
Content-Disposition: attachment;
	filename=smime.p7s

MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIGDjCCAscw
ggIwoAMCAQICAwxG8zANBgkqhkiG9w0BAQQFADBiMQswCQYDVQQGEwJaQTElMCMGA1UEChMcVGhh
d3RlIENvbnN1bHRpbmcgKFB0eSkgTHRkLjEsMCoGA1UEAxMjVGhhd3RlIFBlcnNvbmFsIEZyZWVt
YWlsIElzc3VpbmcgQ0EwHhcNMDQwNTA5MTQ1NzQyWhcNMDUwNTA5MTQ1NzQyWjA/MR8wHQYDVQQD
ExZUaGF3dGUgRnJlZW1haWwgTWVtYmVyMRwwGgYJKoZIhvcNAQkBFg1tYXR0QG1rZTMubmV0MIIB
IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqrMXJq+m7wZA9sqdK/9puxi3rdgyb6+pvVOT
+WoJ8AA5dEGJPRS67OA0Kp2P7O75FJuQljY3zTquUg3pgHQId+8SyaCYjERsrkj0jTrWN9IwiDHm
xrgqiXWa1kuHOKPAER+uorJmGwHIhlV9gvJMNXf8wOmARTfKAO4kYQ4ZjHG9LYXIomDni3EmF6ZR
cqoh4RqQ9l/CnP9REcxfSNSUYw1QgOjJpU27T5QAVxY4Rq1zrHXWCNHGjWt5Hx8AGuCnr8J7n2OD
0m6bdEIp611qWaxJcHpU8za8huQeae5BSgSnu7jc0S004LFlTqM+0SpyHYqWLZxQC1p8hIcJZEe6
iQIDAQABoyowKDAYBgNVHREEETAPgQ1tYXR0QG1rZTMubmV0MAwGA1UdEwEB/wQCMAAwDQYJKoZI
hvcNAQEEBQADgYEAsqN85XImlc6lXdYOT68vBOCseU6Su+W3NuTb7E3wdBq2RTjSIHo8jZRi3nY9
OjLHCNFqCdJ3sWMqSi6G1b77YHkfUlEXB4fTl5nasfbtzhMUVdDtIlwP8z/rgqzIhj9WaT6oE0oZ
Fmen9qA+zC1yoqymsW0gD5pNBliMgmou6HYwggM/MIICqKADAgECAgENMA0GCSqGSIb3DQEBBQUA
MIHRMQswCQYDVQQGEwJaQTEVMBMGA1UECBMMV2VzdGVybiBDYXBlMRIwEAYDVQQHEwlDYXBlIFRv
d24xGjAYBgNVBAoTEVRoYXd0ZSBDb25zdWx0aW5nMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNl
cnZpY2VzIERpdmlzaW9uMSQwIgYDVQQDExtUaGF3dGUgUGVyc29uYWwgRnJlZW1haWwgQ0ExKzAp
BgkqhkiG9w0BCQEWHHBlcnNvbmFsLWZyZWVtYWlsQHRoYXd0ZS5jb20wHhcNMDMwNzE3MDAwMDAw
WhcNMTMwNzE2MjM1OTU5WjBiMQswCQYDVQQGEwJaQTElMCMGA1UEChMcVGhhd3RlIENvbnN1bHRp
bmcgKFB0eSkgTHRkLjEsMCoGA1UEAxMjVGhhd3RlIFBlcnNvbmFsIEZyZWVtYWlsIElzc3Vpbmcg
Q0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMSmPFVzVftOucqZWh5owHUEcJ3f6f+jHuy9
zfVb8hp2vX8MOmHyv1HOAdTlUAow1wJjWiyJFXCO3cnwK4Vaqj9xVsuvPAsH5/EfkTYkKhPPK9Xz
gnc9A74r/rsYPge/QIACZNenprufZdHFKlSFD0gEf6e20TxhBEAeZBlyYLf7AgMBAAGjgZQwgZEw
EgYDVR0TAQH/BAgwBgEB/wIBADBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8vY3JsLnRoYXd0ZS5j
b20vVGhhd3RlUGVyc29uYWxGcmVlbWFpbENBLmNybDALBgNVHQ8EBAMCAQYwKQYDVR0RBCIwIKQe
MBwxGjAYBgNVBAMTEVByaXZhdGVMYWJlbDItMTM4MA0GCSqGSIb3DQEBBQUAA4GBAEiM0VCD6gsu
zA2jZqxnD3+vrL7CF6FDlpSdf0whuPg2H6otnzYvwPQcUCCTcDz9reFhYsPZOhl+hLGZGwDFGguC
dJ4lUJRix9sncVcljd2pnDmOjCBPZV+V2vf3h9bGCE6u9uo05RAaWzVNd+NWIXiC3CEZNd4ksdMd
Rv9dX2VPMYIC5zCCAuMCAQEwaTBiMQswCQYDVQQGEwJaQTElMCMGA1UEChMcVGhhd3RlIENvbnN1
bHRpbmcgKFB0eSkgTHRkLjEsMCoGA1UEAxMjVGhhd3RlIFBlcnNvbmFsIEZyZWVtYWlsIElzc3Vp
bmcgQ0ECAwxG8zAJBgUrDgMCGgUAoIIBUzAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqG
SIb3DQEJBTEPFw0wNDA2MDYwMjQ5MzNaMCMGCSqGSIb3DQEJBDEWBBSHFlvB6WYuX4UB7E+rPtX+
EmhwSzB4BgkrBgEEAYI3EAQxazBpMGIxCzAJBgNVBAYTAlpBMSUwIwYDVQQKExxUaGF3dGUgQ29u
c3VsdGluZyAoUHR5KSBMdGQuMSwwKgYDVQQDEyNUaGF3dGUgUGVyc29uYWwgRnJlZW1haWwgSXNz
dWluZyBDQQIDDEbzMHoGCyqGSIb3DQEJEAILMWugaTBiMQswCQYDVQQGEwJaQTElMCMGA1UEChMc
VGhhd3RlIENvbnN1bHRpbmcgKFB0eSkgTHRkLjEsMCoGA1UEAxMjVGhhd3RlIFBlcnNvbmFsIEZy
ZWVtYWlsIElzc3VpbmcgQ0ECAwxG8zANBgkqhkiG9w0BAQEFAASCAQCfL+O4X/iy8+vP7k5q1AT/
Xf1Z/Z8K5b4cG9Dt4TQj73Gr76ECYeMWdsewUp0m84Eo50W06S00aHel6A89maJ/S3PZ+LJk6Yu7
QqxPbDyPJWU77IF0CTw6XZ1Hzv8W+hg5hqyBVK5eijQUOSMlVerJa39sZ9DlPjuylFr8ak5Ylvm2
1wj+4R6shJEagbiXVCYgcmL4j/B36OZxsUB7R7Zoy7JUzGus10Ky3bmOb21T9K1fziAlcA/vtWb7
NAGDJrWDRS6DcqDs46tcRiNHCyMiXWkWz1yCqRKCTAmN/PLyhJPaOGJ/VYJzrR+J2xZFfe2bBDOk
kHuVjyKuDJsnWugrAAAAAAAA

--Apple-Mail-3-808792275--