Menu
▾
▴
iaeditor-commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
(16) |
Sep
(13) |
Oct
(4) |
Nov
(19) |
Dec
(19) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(5) |
Feb
(1) |
Mar
(67) |
Apr
(119) |
May
(25) |
Jun
(6) |
Jul
|
Aug
(15) |
Sep
(2) |
Oct
(23) |
Nov
(2) |
Dec
(1) |
| 2008 |
Jan
|
Feb
|
Mar
(2) |
Apr
(1) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ob...@us...> - 2008-05-03 07:07:56
|
Revision: 355
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=355&view=rev
Author: obi666
Date: 2008-05-03 00:08:01 -0700 (Sat, 03 May 2008)
Log Message:
-----------
Added initial implementation of objects manager.
Modified Paths:
--------------
trunk/data/projects/simple/objects.iaobj
trunk/msvc/7/wksiaeditor.sln
trunk/msvc/71/wksiaeditor.sln
trunk/msvc/8/wksiaeditor.sln
trunk/msvc/9/wksiaeditor.sln
trunk/msvc/plgpfbulletdynamics.rc
trunk/src/apps/editor/iaCSApplication.cpp
trunk/src/include/iasdk/dynamics/iDynamicsSystem.h
trunk/src/libs/Jamfile
trunk/src/libs/dynamics/bullet/dynbullet.cpp
trunk/src/libs/dynamics/bullet/dynbullet.h
trunk/src/plugins/dynamics/bullet_dynamics/body.cpp
trunk/src/plugins/dynamics/bullet_dynamics/body.h
trunk/src/plugins/dynamics/bullet_dynamics/collider.cpp
trunk/src/plugins/dynamics/bullet_dynamics/collider.h
trunk/src/plugins/dynamics/bullet_dynamics/pfbulletdynamics.csplugin
trunk/src/plugins/dynamics/bullet_dynamics/system.cpp
trunk/src/plugins/dynamics/bullet_dynamics/system.h
Added Paths:
-----------
trunk/msvc/7/libObjManager.vcproj
trunk/msvc/71/libObjManager.vcproj
trunk/msvc/8/libObjManager.vcproj
trunk/msvc/9/libObjManager.vcproj
trunk/src/include/iasdk/manager/
trunk/src/include/iasdk/manager/iaObjectsManager.h
trunk/src/libs/manager/
trunk/src/libs/manager/Jamfile
trunk/src/libs/manager/iaObjectsManager.cpp
Modified: trunk/data/projects/simple/objects.iaobj
===================================================================
--- trunk/data/projects/simple/objects.iaobj 2008-04-01 12:47:03 UTC (rev 354)
+++ trunk/data/projects/simple/objects.iaobj 2008-05-03 07:08:01 UTC (rev 355)
@@ -21,81 +21,42 @@
<entity />
<entity />
<entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
- <entity />
</firstpass>
<secondpass>
<entity name="dynamics">
- <pc name="pcodedynamicsystem" serial="616">
- <string v="dynamics system" />
- <pc locref="0" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES6dynamics system" />
+ <pc name="pcbulletdynamicsystem" serial="616">
+ <string v="Dynamics System" />
+ <pc locref="0" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES6Dynamics System" />
<ulong v="4" />
<pc locref="1" name="pcmesh_object" />
<pc locref="2" name="pcia-character" />
- <pc locref="52" name="pcmesh_object" />
- <pc locref="53" name="pcmesh_object" />
+ <pc locref="19" name="pcmesh_object" />
+ <pc locref="20" name="pcmesh_object" />
</pc>
- <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES6dynamics system" serial="1">
- <ulong v="5" />
- <ubyte v="10" />
- <string v="gravity" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="gravity.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="gravity.y" />
- <float v="-9.8" />
- <ubyte v="1" />
- <string v="gravity.z" />
- <float v="0" />
- <ubyte v="1" />
- <string v="cfm" />
- <float v="0.01" />
- <ubyte v="1" />
- <string v="erp" />
- <float v="0.9" />
- <ubyte v="1" />
- <string v="step size" />
- <float v="0.01" />
- <ubyte v="5" />
- <string v="groups cnt" />
- <long v="1" />
+ <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES6Dynamics System" serial="1">
+ <ulong v="0" />
</pc>
<behaviour layer="blia" name="room" />
</entity>
<entity name="sky">
+ <pc name="pcmesh" serial="2">
+ <ubyte v="2" />
+ <string v="sky" />
+ <bool v="1" />
+ <string />
+ <uword v="1" />
+ <string v="room" />
+ <vector3 x="7.62939e-006" y="301.2" z="-7.62939e-006" />
+ <float v="1" />
+ <float v="0" />
+ <float v="0" />
+ <float v="0" />
+ <float v="1" />
+ <float v="0" />
+ <float v="0" />
+ <float v="0" />
+ <float v="1" />
+ </pc>
<pc name="pcmesh_object" serial="616">
<string v="sky" />
<pc locref="1" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES7mesh" />
@@ -137,34 +98,34 @@
<string v="transform.position.z" />
<float v="-7.62939e-006" />
</pc>
+ <behaviour layer="blia" name="room" />
+ </entity>
+ <entity name="defaultModel">
<pc name="pcmesh" serial="2">
<ubyte v="2" />
- <string v="sky" />
+ <string v="defaultModel" />
<bool v="1" />
<string />
<uword v="1" />
<string v="room" />
- <vector3 x="1.65845" y="0.431168" z="-0.629869" />
- <float v="1" />
+ <vector3 x="0" y="0" z="0" />
+ <float v="-0.999999" />
<float v="0" />
+ <float v="0.00159255" />
<float v="0" />
- <float v="0" />
<float v="1" />
<float v="0" />
+ <float v="-0.00159255" />
<float v="0" />
- <float v="0" />
- <float v="1" />
+ <float v="-0.999999" />
</pc>
- <behaviour layer="blia" name="room" />
- </entity>
- <entity name="defaultModel">
<pc name="pcia-character" serial="616">
<string v="defaultModel" />
<pc locref="2" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES3character" />
<ulong v="3" />
<pc locref="3" name="pcbone" />
- <pc locref="50" name="pcanimation" />
- <pc locref="51" name="pcanimation" />
+ <pc locref="17" name="pcanimation" />
+ <pc locref="18" name="pcanimation" />
</pc>
<pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES3character" serial="1">
<ulong v="1" />
@@ -202,35 +163,16 @@
<string v="transform.position.z" />
<float v="0" />
</pc>
- <pc name="pcmesh" serial="2">
- <ubyte v="2" />
- <string v="defaultModel" />
- <bool v="1" />
- <string />
- <uword v="1" />
- <string v="room" />
- <vector3 x="0" y="0" z="0" />
- <float v="-0.999999" />
- <float v="0" />
- <float v="0.00159255" />
- <float v="0" />
- <float v="1" />
- <float v="0" />
- <float v="-0.00159255" />
- <float v="0" />
- <float v="-0.999999" />
- </pc>
<behaviour layer="blia" name="room" />
</entity>
<entity name="defaultModel: pelvis">
<pc name="pcbone" serial="1">
<string v="pelvis" />
<pc locref="3" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5pelvis" />
- <ulong v="4" />
+ <ulong v="3" />
<pc locref="4" name="pcbone" />
- <pc locref="24" name="pcbone" />
- <pc locref="36" name="pcbone" />
- <pc locref="48" name="pcrigidbody" />
+ <pc locref="11" name="pcbone" />
+ <pc locref="14" name="pcbone" />
</pc>
<pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5pelvis" serial="1">
<ulong v="1" />
@@ -274,9 +216,8 @@
<pc name="pcbone" serial="1">
<string v="spine1" />
<pc locref="4" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5spine1" />
- <ulong v="2" />
+ <ulong v="1" />
<pc locref="5" name="pcbone" />
- <pc locref="23" name="pcrigidbody" />
</pc>
<pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5spine1" serial="1">
<ulong v="1" />
@@ -320,12 +261,10 @@
<pc name="pcbone" serial="1">
<string v="spine2" />
<pc locref="5" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5spine2" />
- <ulong v="5" />
+ <ulong v="3" />
<pc locref="6" name="pcbone" />
- <pc locref="12" name="pcbone" />
- <pc locref="18" name="pcbone" />
- <pc locref="21" name="pcrigidbody" />
- <pc locref="22" name="pcodejoint" />
+ <pc locref="8" name="pcbone" />
+ <pc locref="10" name="pcbone" />
</pc>
<pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5spine2" serial="1">
<ulong v="1" />
@@ -369,10 +308,8 @@
<pc name="pcbone" serial="1">
<string v="RArm" />
<pc locref="6" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5RArm" />
- <ulong v="3" />
+ <ulong v="1" />
<pc locref="7" name="pcbone" />
- <pc locref="10" name="pcrigidbody" />
- <pc locref="11" name="pcodejoint" />
</pc>
<pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5RArm" serial="1">
<ulong v="1" />
@@ -416,9 +353,7 @@
<pc name="pcbone" serial="1">
<string v="RForearm" />
<pc locref="7" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5RForearm" />
- <ulong v="2" />
- <pc locref="8" name="pcrigidbody" />
- <pc locref="9" name="pcodejoint" />
+ <ulong v="0" />
</pc>
<pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5RForearm" serial="1">
<ulong v="1" />
@@ -458,568 +393,12 @@
</pc>
<behaviour layer="blia" name="room" />
</entity>
- <entity name="body 25">
- <pc name="pcrigidbody" serial="1">
- <string v="RForearm body" />
- <pc locref="8" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES2rigid body" />
- <ulong v="0" />
- </pc>
- <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES2rigid body" serial="1">
- <ulong v="4" />
- <ubyte v="1" />
- <string v="mass" />
- <float v="1" />
- <ubyte v="7" />
- <string v="transform" />
- <ulong v="2" />
- <ubyte v="8" />
- <string v="transform.rotation" />
- <ulong v="2" />
- <ubyte v="10" />
- <string v="transform.rotation.axis" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.y" />
- <float v="1" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.z" />
- <float v="0" />
- <ubyte v="1" />
- <string v="transform.rotation.angle" />
- <float v="3.14" />
- <ubyte v="10" />
- <string v="transform.position" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="transform.position.x" />
- <float v="0.499999" />
- <ubyte v="1" />
- <string v="transform.position.y" />
- <float v="1.4" />
- <ubyte v="1" />
- <string v="transform.position.z" />
- <float v="-0.000796274" />
- <ubyte v="2" />
- <string v="static" />
- <bool v="1" />
- <ubyte v="5" />
- <string v="body group" />
- <long v="0" />
- </pc>
- <behaviour layer="blia" name="room" />
- </entity>
- <entity name="joint 49">
- <pc name="pcodejoint" serial="1">
- <string v="ode joint" />
- <pc locref="9" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES1ode joint" />
- <ulong v="0" />
- </pc>
- <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES1ode joint" serial="1">
- <ulong v="16" />
- <ubyte v="11" />
- <string v="rot_const" />
- <ulong v="3" />
- <ubyte v="2" />
- <string v="rot_const.x" />
- <bool v="0" />
- <ubyte v="2" />
- <string v="rot_const.y" />
- <bool v="0" />
- <ubyte v="2" />
- <string v="rot_const.z" />
- <bool v="0" />
- <ubyte v="11" />
- <string v="trans_const" />
- <ulong v="3" />
- <ubyte v="2" />
- <string v="trans_const.x" />
- <bool v="1" />
- <ubyte v="2" />
- <string v="trans_const.y" />
- <bool v="1" />
- <ubyte v="2" />
- <string v="trans_const.z" />
- <bool v="1" />
- <ubyte v="10" />
- <string v="bounce" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="bounce.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="bounce.y" />
- <float v="0" />
- <ubyte v="1" />
- <string v="bounce.z" />
- <float v="0" />
- <ubyte v="10" />
- <string v="desired_velocity" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="desired_velocity.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="desired_velocity.y" />
- <float v="0" />
- <ubyte v="1" />
- <string v="desired_velocity.z" />
- <float v="0" />
- <ubyte v="10" />
- <string v="max_force" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="max_force.x" />
- <float v="1000" />
- <ubyte v="1" />
- <string v="max_force.y" />
- <float v="1000" />
- <ubyte v="1" />
- <string v="max_force.z" />
- <float v="1000" />
- <ubyte v="10" />
- <string v="min_angle" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="min_angle.x" />
- <float v="-3.14" />
- <ubyte v="1" />
- <string v="min_angle.y" />
- <float v="-3.14" />
- <ubyte v="1" />
- <string v="min_angle.z" />
- <float v="-3.14" />
- <ubyte v="10" />
- <string v="max_angle" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="max_angle.x" />
- <float v="3.14" />
- <ubyte v="1" />
- <string v="max_angle.y" />
- <float v="3.14" />
- <ubyte v="1" />
- <string v="max_angle.z" />
- <float v="3.14" />
- <ubyte v="10" />
- <string v="min_distance" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="min_distance.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="min_distance.y" />
- <float v="0" />
- <ubyte v="1" />
- <string v="min_distance.z" />
- <float v="0" />
- <ubyte v="10" />
- <string v="max_distance" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="max_distance.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="max_distance.y" />
- <float v="0" />
- <ubyte v="1" />
- <string v="max_distance.z" />
- <float v="0" />
- <ubyte v="7" />
- <string v="transform" />
- <ulong v="2" />
- <ubyte v="8" />
- <string v="transform.rotation" />
- <ulong v="2" />
- <ubyte v="10" />
- <string v="transform.rotation.axis" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.y" />
- <float v="1" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.z" />
- <float v="0" />
- <ubyte v="1" />
- <string v="transform.rotation.angle" />
- <float v="3.14" />
- <ubyte v="10" />
- <string v="transform.position" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="transform.position.x" />
- <float v="0.499999" />
- <ubyte v="1" />
- <string v="transform.position.y" />
- <float v="1.4" />
- <ubyte v="1" />
- <string v="transform.position.z" />
- <float v="-0.000796274" />
- <ubyte v="10" />
- <string v="cfm" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="cfm.x" />
- <float v="0.01" />
- <ubyte v="1" />
- <string v="cfm.y" />
- <float v="0.01" />
- <ubyte v="1" />
- <string v="cfm.z" />
- <float v="0.01" />
- <ubyte v="10" />
- <string v="fudge factor" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="fudge factor.x" />
- <float v="1" />
- <ubyte v="1" />
- <string v="fudge factor.y" />
- <float v="1" />
- <ubyte v="1" />
- <string v="fudge factor.z" />
- <float v="1" />
- <ubyte v="10" />
- <string v="stop cfm" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="stop cfm.x" />
- <float v="0.01" />
- <ubyte v="1" />
- <string v="stop cfm.y" />
- <float v="0.01" />
- <ubyte v="1" />
- <string v="stop cfm.z" />
- <float v="0.01" />
- <ubyte v="10" />
- <string v="stop erp" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="stop erp.x" />
- <float v="0.9" />
- <ubyte v="1" />
- <string v="stop erp.y" />
- <float v="0.9" />
- <ubyte v="1" />
- <string v="stop erp.z" />
- <float v="0.9" />
- <ubyte v="10" />
- <string v="suspension cfm" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="suspension cfm.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="suspension cfm.y" />
- <float v="0" />
- <ubyte v="1" />
- <string v="suspension cfm.z" />
- <float v="0" />
- <ubyte v="10" />
- <string v="suspension erp" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="suspension erp.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="suspension erp.y" />
- <float v="0" />
- <ubyte v="1" />
- <string v="suspension erp.z" />
- <float v="0" />
- </pc>
- <behaviour layer="blia" name="room" />
- </entity>
- <entity name="body 24">
- <pc name="pcrigidbody" serial="1">
- <string v="RArm body" />
- <pc locref="10" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES2rigid body" />
- <ulong v="0" />
- </pc>
- <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES2rigid body" serial="1">
- <ulong v="4" />
- <ubyte v="1" />
- <string v="mass" />
- <float v="1" />
- <ubyte v="7" />
- <string v="transform" />
- <ulong v="2" />
- <ubyte v="8" />
- <string v="transform.rotation" />
- <ulong v="2" />
- <ubyte v="10" />
- <string v="transform.rotation.axis" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.y" />
- <float v="1" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.z" />
- <float v="0" />
- <ubyte v="1" />
- <string v="transform.rotation.angle" />
- <float v="3.14" />
- <ubyte v="10" />
- <string v="transform.position" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="transform.position.x" />
- <float v="0.3" />
- <ubyte v="1" />
- <string v="transform.position.y" />
- <float v="1.4" />
- <ubyte v="1" />
- <string v="transform.position.z" />
- <float v="-0.000477764" />
- <ubyte v="2" />
- <string v="static" />
- <bool v="1" />
- <ubyte v="5" />
- <string v="body group" />
- <long v="0" />
- </pc>
- <behaviour layer="blia" name="room" />
- </entity>
- <entity name="joint 48">
- <pc name="pcodejoint" serial="1">
- <string v="ode joint" />
- <pc locref="11" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES1ode joint" />
- <ulong v="0" />
- </pc>
- <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES1ode joint" serial="1">
- <ulong v="16" />
- <ubyte v="11" />
- <string v="rot_const" />
- <ulong v="3" />
- <ubyte v="2" />
- <string v="rot_const.x" />
- <bool v="0" />
- <ubyte v="2" />
- <string v="rot_const.y" />
- <bool v="0" />
- <ubyte v="2" />
- <string v="rot_const.z" />
- <bool v="0" />
- <ubyte v="11" />
- <string v="trans_const" />
- <ulong v="3" />
- <ubyte v="2" />
- <string v="trans_const.x" />
- <bool v="1" />
- <ubyte v="2" />
- <string v="trans_const.y" />
- <bool v="1" />
- <ubyte v="2" />
- <string v="trans_const.z" />
- <bool v="1" />
- <ubyte v="10" />
- <string v="bounce" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="bounce.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="bounce.y" />
- <float v="0" />
- <ubyte v="1" />
- <string v="bounce.z" />
- <float v="0" />
- <ubyte v="10" />
- <string v="desired_velocity" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="desired_velocity.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="desired_velocity.y" />
- <float v="0" />
- <ubyte v="1" />
- <string v="desired_velocity.z" />
- <float v="0" />
- <ubyte v="10" />
- <string v="max_force" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="max_force.x" />
- <float v="1000" />
- <ubyte v="1" />
- <string v="max_force.y" />
- <float v="1000" />
- <ubyte v="1" />
- <string v="max_force.z" />
- <float v="1000" />
- <ubyte v="10" />
- <string v="min_angle" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="min_angle.x" />
- <float v="-3.14" />
- <ubyte v="1" />
- <string v="min_angle.y" />
- <float v="-3.14" />
- <ubyte v="1" />
- <string v="min_angle.z" />
- <float v="-3.14" />
- <ubyte v="10" />
- <string v="max_angle" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="max_angle.x" />
- <float v="3.14" />
- <ubyte v="1" />
- <string v="max_angle.y" />
- <float v="3.14" />
- <ubyte v="1" />
- <string v="max_angle.z" />
- <float v="3.14" />
- <ubyte v="10" />
- <string v="min_distance" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="min_distance.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="min_distance.y" />
- <float v="0" />
- <ubyte v="1" />
- <string v="min_distance.z" />
- <float v="0" />
- <ubyte v="10" />
- <string v="max_distance" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="max_distance.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="max_distance.y" />
- <float v="0" />
- <ubyte v="1" />
- <string v="max_distance.z" />
- <float v="0" />
- <ubyte v="7" />
- <string v="transform" />
- <ulong v="2" />
- <ubyte v="8" />
- <string v="transform.rotation" />
- <ulong v="2" />
- <ubyte v="10" />
- <string v="transform.rotation.axis" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.y" />
- <float v="1" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.z" />
- <float v="0" />
- <ubyte v="1" />
- <string v="transform.rotation.angle" />
- <float v="3.14" />
- <ubyte v="10" />
- <string v="transform.position" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="transform.position.x" />
- <float v="0.3" />
- <ubyte v="1" />
- <string v="transform.position.y" />
- <float v="1.4" />
- <ubyte v="1" />
- <string v="transform.position.z" />
- <float v="-0.000477764" />
- <ubyte v="10" />
- <string v="cfm" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="cfm.x" />
- <float v="0.01" />
- <ubyte v="1" />
- <string v="cfm.y" />
- <float v="0.01" />
- <ubyte v="1" />
- <string v="cfm.z" />
- <float v="0.01" />
- <ubyte v="10" />
- <string v="fudge factor" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="fudge factor.x" />
- <float v="1" />
- <ubyte v="1" />
- <string v="fudge factor.y" />
- <float v="1" />
- <ubyte v="1" />
- <string v="fudge factor.z" />
- <float v="1" />
- <ubyte v="10" />
- <string v="stop cfm" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="stop cfm.x" />
- <float v="0.01" />
- <ubyte v="1" />
- <string v="stop cfm.y" />
- <float v="0.01" />
- <ubyte v="1" />
- <string v="stop cfm.z" />
- <float v="0.01" />
- <ubyte v="10" />
- <string v="stop erp" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="stop erp.x" />
- <float v="0.9" />
- <ubyte v="1" />
- <string v="stop erp.y" />
- <float v="0.9" />
- <ubyte v="1" />
- <string v="stop erp.z" />
- <float v="0.9" />
- <ubyte v="10" />
- <string v="suspension cfm" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="suspension cfm.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="suspension cfm.y" />
- <float v="0" />
- <ubyte v="1" />
- <string v="suspension cfm.z" />
- <float v="0" />
- <ubyte v="10" />
- <string v="suspension erp" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="suspension erp.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="suspension erp.y" />
- <float v="0" />
- <ubyte v="1" />
- <string v="suspension erp.z" />
- <float v="0" />
- </pc>
- <behaviour layer="blia" name="room" />
- </entity>
<entity name="defaultModel: LArm">
<pc name="pcbone" serial="1">
<string v="LArm" />
- <pc locref="12" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5LArm" />
- <ulong v="3" />
- <pc locref="13" name="pcbone" />
- <pc locref="16" name="pcrigidbody" />
- <pc locref="17" name="pcodejoint" />
+ <pc locref="8" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5LArm" />
+ <ulong v="1" />
+ <pc locref="9" name="pcbone" />
</pc>
<pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5LArm" serial="1">
<ulong v="1" />
@@ -1062,10 +441,8 @@
<entity name="defaultModel: LForearm">
<pc name="pcbone" serial="1">
<string v="LForearm" />
- <pc locref="13" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5LForearm" />
- <ulong v="2" />
- <pc locref="14" name="pcrigidbody" />
- <pc locref="15" name="pcodejoint" />
+ <pc locref="9" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5LForearm" />
+ <ulong v="0" />
</pc>
<pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5LForearm" serial="1">
<ulong v="1" />
@@ -1105,567 +482,11 @@
</pc>
<behaviour layer="blia" name="room" />
</entity>
- <entity name="body 27">
- <pc name="pcrigidbody" serial="1">
- <string v="LForearm body" />
- <pc locref="14" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES2rigid body" />
- <ulong v="0" />
- </pc>
- <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES2rigid body" serial="1">
- <ulong v="4" />
- <ubyte v="1" />
- <string v="mass" />
- <float v="1" />
- <ubyte v="7" />
- <string v="transform" />
- <ulong v="2" />
- <ubyte v="8" />
- <string v="transform.rotation" />
- <ulong v="2" />
- <ubyte v="10" />
- <string v="transform.rotation.axis" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.y" />
- <float v="1" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.z" />
- <float v="0" />
- <ubyte v="1" />
- <string v="transform.rotation.angle" />
- <float v="3.14" />
- <ubyte v="10" />
- <string v="transform.position" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="transform.position.x" />
- <float v="-0.499999" />
- <ubyte v="1" />
- <string v="transform.position.y" />
- <float v="1.4" />
- <ubyte v="1" />
- <string v="transform.position.z" />
- <float v="0.000796274" />
- <ubyte v="2" />
- <string v="static" />
- <bool v="1" />
- <ubyte v="5" />
- <string v="body group" />
- <long v="0" />
- </pc>
- <behaviour layer="blia" name="room" />
- </entity>
- <entity name="joint 51">
- <pc name="pcodejoint" serial="1">
- <string v="ode joint" />
- <pc locref="15" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES1ode joint" />
- <ulong v="0" />
- </pc>
- <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES1ode joint" serial="1">
- <ulong v="16" />
- <ubyte v="11" />
- <string v="rot_const" />
- <ulong v="3" />
- <ubyte v="2" />
- <string v="rot_const.x" />
- <bool v="0" />
- <ubyte v="2" />
- <string v="rot_const.y" />
- <bool v="0" />
- <ubyte v="2" />
- <string v="rot_const.z" />
- <bool v="0" />
- <ubyte v="11" />
- <string v="trans_const" />
- <ulong v="3" />
- <ubyte v="2" />
- <string v="trans_const.x" />
- <bool v="1" />
- <ubyte v="2" />
- <string v="trans_const.y" />
- <bool v="1" />
- <ubyte v="2" />
- <string v="trans_const.z" />
- <bool v="1" />
- <ubyte v="10" />
- <string v="bounce" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="bounce.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="bounce.y" />
- <float v="0" />
- <ubyte v="1" />
- <string v="bounce.z" />
- <float v="0" />
- <ubyte v="10" />
- <string v="desired_velocity" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="desired_velocity.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="desired_velocity.y" />
- <float v="0" />
- <ubyte v="1" />
- <string v="desired_velocity.z" />
- <float v="0" />
- <ubyte v="10" />
- <string v="max_force" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="max_force.x" />
- <float v="1000" />
- <ubyte v="1" />
- <string v="max_force.y" />
- <float v="1000" />
- <ubyte v="1" />
- <string v="max_force.z" />
- <float v="1000" />
- <ubyte v="10" />
- <string v="min_angle" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="min_angle.x" />
- <float v="-3.14" />
- <ubyte v="1" />
- <string v="min_angle.y" />
- <float v="-3.14" />
- <ubyte v="1" />
- <string v="min_angle.z" />
- <float v="-3.14" />
- <ubyte v="10" />
- <string v="max_angle" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="max_angle.x" />
- <float v="3.14" />
- <ubyte v="1" />
- <string v="max_angle.y" />
- <float v="3.14" />
- <ubyte v="1" />
- <string v="max_angle.z" />
- <float v="3.14" />
- <ubyte v="10" />
- <string v="min_distance" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="min_distance.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="min_distance.y" />
- <float v="0" />
- <ubyte v="1" />
- <string v="min_distance.z" />
- <float v="0" />
- <ubyte v="10" />
- <string v="max_distance" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="max_distance.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="max_distance.y" />
- <float v="0" />
- <ubyte v="1" />
- <string v="max_distance.z" />
- <float v="0" />
- <ubyte v="7" />
- <string v="transform" />
- <ulong v="2" />
- <ubyte v="8" />
- <string v="transform.rotation" />
- <ulong v="2" />
- <ubyte v="10" />
- <string v="transform.rotation.axis" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.y" />
- <float v="1" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.z" />
- <float v="0" />
- <ubyte v="1" />
- <string v="transform.rotation.angle" />
- <float v="3.14" />
- <ubyte v="10" />
- <string v="transform.position" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="transform.position.x" />
- <float v="-0.499999" />
- <ubyte v="1" />
- <string v="transform.position.y" />
- <float v="1.4" />
- <ubyte v="1" />
- <string v="transform.position.z" />
- <float v="0.000796274" />
- <ubyte v="10" />
- <string v="cfm" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="cfm.x" />
- <float v="0.01" />
- <ubyte v="1" />
- <string v="cfm.y" />
- <float v="0.01" />
- <ubyte v="1" />
- <string v="cfm.z" />
- <float v="0.01" />
- <ubyte v="10" />
- <string v="fudge factor" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="fudge factor.x" />
- <float v="1" />
- <ubyte v="1" />
- <string v="fudge factor.y" />
- <float v="1" />
- <ubyte v="1" />
- <string v="fudge factor.z" />
- <float v="1" />
- <ubyte v="10" />
- <string v="stop cfm" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="stop cfm.x" />
- <float v="0.01" />
- <ubyte v="1" />
- <string v="stop cfm.y" />
- <float v="0.01" />
- <ubyte v="1" />
- <string v="stop cfm.z" />
- <float v="0.01" />
- <ubyte v="10" />
- <string v="stop erp" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="stop erp.x" />
- <float v="0.9" />
- <ubyte v="1" />
- <string v="stop erp.y" />
- <float v="0.9" />
- <ubyte v="1" />
- <string v="stop erp.z" />
- <float v="0.9" />
- <ubyte v="10" />
- <string v="suspension cfm" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="suspension cfm.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="suspension cfm.y" />
- <float v="0" />
- <ubyte v="1" />
- <string v="suspension cfm.z" />
- <float v="0" />
- <ubyte v="10" />
- <string v="suspension erp" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="suspension erp.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="suspension erp.y" />
- <float v="0" />
- <ubyte v="1" />
- <string v="suspension erp.z" />
- <float v="0" />
- </pc>
- <behaviour layer="blia" name="room" />
- </entity>
- <entity name="body 26">
- <pc name="pcrigidbody" serial="1">
- <string v="LArm body" />
- <pc locref="16" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES2rigid body" />
- <ulong v="0" />
- </pc>
- <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES2rigid body" serial="1">
- <ulong v="4" />
- <ubyte v="1" />
- <string v="mass" />
- <float v="1" />
- <ubyte v="7" />
- <string v="transform" />
- <ulong v="2" />
- <ubyte v="8" />
- <string v="transform.rotation" />
- <ulong v="2" />
- <ubyte v="10" />
- <string v="transform.rotation.axis" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.y" />
- <float v="1" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.z" />
- <float v="0" />
- <ubyte v="1" />
- <string v="transform.rotation.angle" />
- <float v="3.14" />
- <ubyte v="10" />
- <string v="transform.position" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="transform.position.x" />
- <float v="-0.3" />
- <ubyte v="1" />
- <string v="transform.position.y" />
- <float v="1.4" />
- <ubyte v="1" />
- <string v="transform.position.z" />
- <float v="0.000477764" />
- <ubyte v="2" />
- <string v="static" />
- <bool v="1" />
- <ubyte v="5" />
- <string v="body group" />
- <long v="0" />
- </pc>
- <behaviour layer="blia" name="room" />
- </entity>
- <entity name="joint 50">
- <pc name="pcodejoint" serial="1">
- <string v="ode joint" />
- <pc locref="17" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES1ode joint" />
- <ulong v="0" />
- </pc>
- <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES1ode joint" serial="1">
- <ulong v="16" />
- <ubyte v="11" />
- <string v="rot_const" />
- <ulong v="3" />
- <ubyte v="2" />
- <string v="rot_const.x" />
- <bool v="0" />
- <ubyte v="2" />
- <string v="rot_const.y" />
- <bool v="0" />
- <ubyte v="2" />
- <string v="rot_const.z" />
- <bool v="0" />
- <ubyte v="11" />
- <string v="trans_const" />
- <ulong v="3" />
- <ubyte v="2" />
- <string v="trans_const.x" />
- <bool v="1" />
- <ubyte v="2" />
- <string v="trans_const.y" />
- <bool v="1" />
- <ubyte v="2" />
- <string v="trans_const.z" />
- <bool v="1" />
- <ubyte v="10" />
- <string v="bounce" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="bounce.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="bounce.y" />
- <float v="0" />
- <ubyte v="1" />
- <string v="bounce.z" />
- <float v="0" />
- <ubyte v="10" />
- <string v="desired_velocity" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="desired_velocity.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="desired_velocity.y" />
- <float v="0" />
- <ubyte v="1" />
- <string v="desired_velocity.z" />
- <float v="0" />
- <ubyte v="10" />
- <string v="max_force" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="max_force.x" />
- <float v="1000" />
- <ubyte v="1" />
- <string v="max_force.y" />
- <float v="1000" />
- <ubyte v="1" />
- <string v="max_force.z" />
- <float v="1000" />
- <ubyte v="10" />
- <string v="min_angle" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="min_angle.x" />
- <float v="-3.14" />
- <ubyte v="1" />
- <string v="min_angle.y" />
- <float v="-3.14" />
- <ubyte v="1" />
- <string v="min_angle.z" />
- <float v="-3.14" />
- <ubyte v="10" />
- <string v="max_angle" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="max_angle.x" />
- <float v="3.14" />
- <ubyte v="1" />
- <string v="max_angle.y" />
- <float v="3.14" />
- <ubyte v="1" />
- <string v="max_angle.z" />
- <float v="3.14" />
- <ubyte v="10" />
- <string v="min_distance" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="min_distance.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="min_distance.y" />
- <float v="0" />
- <ubyte v="1" />
- <string v="min_distance.z" />
- <float v="0" />
- <ubyte v="10" />
- <string v="max_distance" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="max_distance.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="max_distance.y" />
- <float v="0" />
- <ubyte v="1" />
- <string v="max_distance.z" />
- <float v="0" />
- <ubyte v="7" />
- <string v="transform" />
- <ulong v="2" />
- <ubyte v="8" />
- <string v="transform.rotation" />
- <ulong v="2" />
- <ubyte v="10" />
- <string v="transform.rotation.axis" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.y" />
- <float v="1" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.z" />
- <float v="0" />
- <ubyte v="1" />
- <string v="transform.rotation.angle" />
- <float v="3.14" />
- <ubyte v="10" />
- <string v="transform.position" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="transform.position.x" />
- <float v="-0.3" />
- <ubyte v="1" />
- <string v="transform.position.y" />
- <float v="1.4" />
- <ubyte v="1" />
- <string v="transform.position.z" />
- <float v="0.000477764" />
- <ubyte v="10" />
- <string v="cfm" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="cfm.x" />
- <float v="0.01" />
- <ubyte v="1" />
- <string v="cfm.y" />
- <float v="0.01" />
- <ubyte v="1" />
- <string v="cfm.z" />
- <float v="0.01" />
- <ubyte v="10" />
- <string v="fudge factor" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="fudge factor.x" />
- <float v="1" />
- <ubyte v="1" />
- <string v="fudge factor.y" />
- <float v="1" />
- <ubyte v="1" />
- <string v="fudge factor.z" />
- <float v="1" />
- <ubyte v="10" />
- <string v="stop cfm" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="stop cfm.x" />
- <float v="0.01" />
- <ubyte v="1" />
- <string v="stop cfm.y" />
- <float v="0.01" />
- <ubyte v="1" />
- <string v="stop cfm.z" />
- <float v="0.01" />
- <ubyte v="10" />
- <string v="stop erp" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="stop erp.x" />
- <float v="0.9" />
- <ubyte v="1" />
- <string v="stop erp.y" />
- <float v="0.9" />
- <ubyte v="1" />
- <string v="stop erp.z" />
- <float v="0.9" />
- <ubyte v="10" />
- <string v="suspension cfm" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="suspension cfm.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="suspension cfm.y" />
- <float v="0" />
- <ubyte v="1" />
- <string v="suspension cfm.z" />
- <float v="0" />
- <ubyte v="10" />
- <string v="suspension erp" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="suspension erp.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="suspension erp.y" />
- <float v="0" />
- <ubyte v="1" />
- <string v="suspension erp.z" />
- <float v="0" />
- </pc>
- <behaviour layer="blia" name="room" />
- </entity>
<entity name="defaultModel: neck">
<pc name="pcbone" serial="1">
<string v="neck" />
- <pc locref="18" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5neck" />
- <ulong v="2" />
- <pc locref="19" name="pcrigidbody" />
- <pc locref="20" name="pcodejoint" />
+ <pc locref="10" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5neck" />
+ <ulong v="0" />
</pc>
<pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5neck" serial="1">
<ulong v="1" />
@@ -1705,621 +526,12 @@
</pc>
<behaviour layer="blia" name="room" />
</entity>
- <entity name="body 28">
- <pc name="pcrigidbody" serial="1">
- <string v="neck body" />
- <pc locref="19" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES2rigid body" />
- <ulong v="0" />
- </pc>
- <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES2rigid body" serial="1">
- <ulong v="4" />
- <ubyte v="1" />
- <string v="mass" />
- <float v="1" />
- <ubyte v="7" />
- <string v="transform" />
- <ulong v="2" />
- <ubyte v="8" />
- <string v="transform.rotation" />
- <ulong v="2" />
- <ubyte v="10" />
- <string v="transform.rotation.axis" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.y" />
- <float v="1" />
- <ubyte v="1" />
- <string v="transform.rotation.axis.z" />
- <float v="0" />
- <ubyte v="1" />
- <string v="transform.rotation.angle" />
- <float v="3.14" />
- <ubyte v="10" />
- <string v="transform.position" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="transform.position.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="transform.position.y" />
- <float v="1.5" />
- <ubyte v="1" />
- <string v="transform.position.z" />
- <float v="0" />
- <ubyte v="2" />
- <string v="static" />
- <bool v="1" />
- <ubyte v="5" />
- <string v="body group" />
- <long v="0" />
- </pc>
- <behaviour layer="blia" name="room" />
- </entity>
- <entity name="joint 52">
- <pc name="pcodejoint" serial="1">
- <string v="ode joint" />
- <pc locref="20" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES1ode joint" />
- <ulong v="0" />
- </pc>
- <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES1ode joint" serial="1">
- <ulong v="16" />
- <ubyte v="11" />
- <string v="rot_const" />
- <ulong v="3" />
- <ubyte v="2" />
- <string v="rot_const.x" />
- <bool v="0" />
- <ubyte v="2" />
- <string v="rot_const.y" />
- <bool v="0" />
- <ubyte v="2" />
- <string v="rot_const.z" />
- <bool v="0" />
- <ubyte v="11" />
- <string v="trans_const" />
- <ulong v="3" />
- <ubyte v="2" />
- <string v="trans_const.x" />
- <bool v="1" />
- <ubyte v="2" />
- <string v="trans_const.y" />
- <bool v="1" />
- <ubyte v="2" />
- <string v="trans_const.z" />
- <bool v="1" />
- <ubyte v="10" />
- <string v="bounce" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="bounce.x" />
- <float v="0" />
- <ubyte v="1" />
- <string v="bounce.y" />
- <float v="0" />
- <ubyte v="1" />
- <string v="bounce.z" />
- <float v="0" />
- <ubyte v="10" />
- <string v="desired_velocity" />
- <ulong v="3" />
- <ubyte v="1" />
- <string v="desired_velocity.x" />
- <float v="0" /...
[truncated message content] |
|
From: <ob...@us...> - 2008-04-01 12:46:57
|
Revision: 354
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=354&view=rev
Author: obi666
Date: 2008-04-01 05:47:03 -0700 (Tue, 01 Apr 2008)
Log Message:
-----------
- added new plugin using new bullet wrapper library
- fixed build system
Modified Paths:
--------------
trunk/Jamfile.in
trunk/mk/autoconf/jamcache.m4
trunk/mk/jam/flags.jam
trunk/mk/msvcgen/custom.cslib
trunk/msvc/7/appiaeditor.vcproj
trunk/msvc/7/grpall_iaeditor.vcproj
trunk/msvc/7/grpapps_iaeditor.vcproj
trunk/msvc/7/grpiaeditorall_iaeditor.vcproj
trunk/msvc/7/grplibs_iaeditor.vcproj
trunk/msvc/7/grpplugins_iaeditor.vcproj
trunk/msvc/7/libdynbullet.vcproj
trunk/msvc/7/libpropgrid.vcproj
trunk/msvc/7/plgbehaviourlayer.vcproj
trunk/msvc/7/plgcsobjects.vcproj
trunk/msvc/7/plgforce_script.vcproj
trunk/msvc/7/plgpfcharacter.vcproj
trunk/msvc/7/plgpfguiactor.vcproj
trunk/msvc/7/plgpfobj_properties.vcproj
trunk/msvc/7/plgpfodedynamics.vcproj
trunk/msvc/7/wksiaeditor.sln
trunk/msvc/71/appiaeditor.vcproj
trunk/msvc/71/grpall_iaeditor.vcproj
trunk/msvc/71/grpapps_iaeditor.vcproj
trunk/msvc/71/grpiaeditorall_iaeditor.vcproj
trunk/msvc/71/grplibs_iaeditor.vcproj
trunk/msvc/71/grpplugins_iaeditor.vcproj
trunk/msvc/71/libdynbullet.vcproj
trunk/msvc/71/libpropgrid.vcproj
trunk/msvc/71/plgbehaviourlayer.vcproj
trunk/msvc/71/plgcsobjects.vcproj
trunk/msvc/71/plgforce_script.vcproj
trunk/msvc/71/plgpfcharacter.vcproj
trunk/msvc/71/plgpfguiactor.vcproj
trunk/msvc/71/plgpfobj_properties.vcproj
trunk/msvc/71/plgpfodedynamics.vcproj
trunk/msvc/71/wksiaeditor.sln
trunk/msvc/8/appiaeditor.vcproj
trunk/msvc/8/grpall_iaeditor.vcproj
trunk/msvc/8/grpapps_iaeditor.vcproj
trunk/msvc/8/grpiaeditorall_iaeditor.vcproj
trunk/msvc/8/grplibs_iaeditor.vcproj
trunk/msvc/8/grpplugins_iaeditor.vcproj
trunk/msvc/8/libdynbullet.vcproj
trunk/msvc/8/libpropgrid.vcproj
trunk/msvc/8/plgbehaviourlayer.vcproj
trunk/msvc/8/plgcsobjects.vcproj
trunk/msvc/8/plgforce_script.vcproj
trunk/msvc/8/plgpfcharacter.vcproj
trunk/msvc/8/plgpfguiactor.vcproj
trunk/msvc/8/plgpfobj_properties.vcproj
trunk/msvc/8/plgpfodedynamics.vcproj
trunk/msvc/8/wksiaeditor.sln
trunk/msvc/9/appiaeditor.vcproj
trunk/msvc/9/grpall_iaeditor.vcproj
trunk/msvc/9/grpapps_iaeditor.vcproj
trunk/msvc/9/grpiaeditorall_iaeditor.vcproj
trunk/msvc/9/grplibs_iaeditor.vcproj
trunk/msvc/9/grpplugins_iaeditor.vcproj
trunk/msvc/9/libdynbullet.vcproj
trunk/msvc/9/libpropgrid.vcproj
trunk/msvc/9/plgbehaviourlayer.vcproj
trunk/msvc/9/plgcsobjects.vcproj
trunk/msvc/9/plgforce_script.vcproj
trunk/msvc/9/plgpfcharacter.vcproj
trunk/msvc/9/plgpfguiactor.vcproj
trunk/msvc/9/plgpfobj_properties.vcproj
trunk/msvc/9/plgpfodedynamics.vcproj
trunk/msvc/9/wksiaeditor.sln
trunk/src/apps/editor/Jamfile
trunk/src/apps/editor/gui/gui_common.h
trunk/src/apps/editor/gui/widgets/iaMainFrame.cpp
trunk/src/apps/editor/gui/widgets/iaMainFrame.h
trunk/src/apps/editor/gui/widgets/iaObjectTree.cpp
trunk/src/apps/editor/gui/widgets/iaObjectTree.h
trunk/src/apps/editor/gui/widgets/iaObjectsManager.h
trunk/src/apps/editor/gui/widgets/iaParentWindow.h
trunk/src/apps/editor/gui/widgets/iaPropertyGrid.cpp
trunk/src/apps/editor/gui/widgets/iaPropertyGrid.h
trunk/src/apps/editor/gui/widgets/iaPropertySheet.cpp
trunk/src/apps/editor/gui/widgets/iaPropertySheet.h
trunk/src/apps/editor/gui/widgets/iaSimulationPanel.cpp
trunk/src/apps/editor/gui/widgets/iaSimulationPanel.h
trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.cpp
trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.h
trunk/src/apps/editor/gui/widgets/iaTrackCtrl.cpp
trunk/src/apps/editor/gui/widgets/iaTrackCtrl.h
trunk/src/apps/editor/iaCSApplication.cpp
trunk/src/apps/editor/iaCSApplication.h
trunk/src/libs/dynamics/bullet/Jamfile
trunk/src/libs/dynamics/bullet/dynbullet.cpp
trunk/src/libs/dynamics/bullet/dynbullet.h
trunk/src/plugins/behaviourlayer/behave.cpp
trunk/src/plugins/character/animation.h
trunk/src/plugins/character/bone.cpp
trunk/src/plugins/character/bone.h
trunk/src/plugins/character/character.cpp
trunk/src/plugins/character/character.h
trunk/src/plugins/character/ragdoll.cpp
trunk/src/plugins/character/ragdoll.h
trunk/src/plugins/csobjects/mesh_object.h
trunk/src/plugins/dynamics/Jamfile
trunk/src/plugins/dynamics/ode_dynamics/body.cpp
trunk/src/plugins/dynamics/ode_dynamics/body.h
trunk/src/plugins/dynamics/ode_dynamics/collider.h
trunk/src/plugins/dynamics/ode_dynamics/ode_joint.h
trunk/src/plugins/dynamics/ode_dynamics/ode_simulation.cpp
trunk/src/plugins/dynamics/ode_dynamics/ode_simulation.h
trunk/src/plugins/force_script/script_controller.cpp
trunk/src/plugins/force_script/script_controller.h
trunk/src/plugins/gui_actor/cam_move.h
trunk/src/plugins/gui_actor/selector.cpp
trunk/src/plugins/gui_actor/selector.h
trunk/src/plugins/objproperties/properties.h
Added Paths:
-----------
trunk/mk/autoconf/Jamfile
trunk/mk/jam/Jamfile
trunk/mk/jam/crystalspace_staticplugins_msvc.jam
trunk/mk/msvcgen/Jamfile
trunk/mk/msvcgen/config.jam
trunk/mk/msvcgen/custom2.cslib
trunk/mk/msvcgen/workspaces.jam
trunk/msvc/7/plgpfbulletdynamics.vcproj
trunk/msvc/71/plgpfbulletdynamics.vcproj
trunk/msvc/8/plgpfbulletdynamics.vcproj
trunk/msvc/9/plgpfbulletdynamics.vcproj
trunk/msvc/libpfbulletdynamics_staticreg.cpp
trunk/msvc/plgpfbulletdynamics.rc
trunk/src/include/iaeditor/
trunk/src/include/iaeditor/editor.h
trunk/src/include/iaeditor/iPcAnimation.h
trunk/src/include/iaeditor/iPcBone.h
trunk/src/include/iaeditor/iPcCamMove.h
trunk/src/include/iaeditor/iPcCharacter.h
trunk/src/include/iaeditor/iPcCollider.h
trunk/src/include/iaeditor/iPcController.h
trunk/src/include/iaeditor/iPcDynamicsSystem.h
trunk/src/include/iaeditor/iPcJoint.h
trunk/src/include/iaeditor/iPcMeshObject.h
trunk/src/include/iaeditor/iPcObjectProperties.h
trunk/src/include/iaeditor/iPcRigidBody.h
trunk/src/include/iaeditor/iPcSelector.h
trunk/src/include/iaeditor/iRagdoll.h
trunk/src/include/iaeditor/iScriptController.h
trunk/src/include/iaeditor/ia-tool/
trunk/src/include/iaeditor/ia-tool/iaBaseObject.h
trunk/src/include/iaeditor/ia-tool/iaBaseObjectListener.h
trunk/src/include/iasdk/
trunk/src/include/iasdk/dynamics/
trunk/src/include/iasdk/dynamics/iDynamicsSystem.h
trunk/src/include/iatypes.h
trunk/src/plugins/dynamics/bullet_dynamics/
trunk/src/plugins/dynamics/bullet_dynamics/Jamfile
trunk/src/plugins/dynamics/bullet_dynamics/body.cpp
trunk/src/plugins/dynamics/bullet_dynamics/body.h
trunk/src/plugins/dynamics/bullet_dynamics/collider.cpp
trunk/src/plugins/dynamics/bullet_dynamics/collider.h
trunk/src/plugins/dynamics/bullet_dynamics/joint.cpp
trunk/src/plugins/dynamics/bullet_dynamics/joint.h
trunk/src/plugins/dynamics/bullet_dynamics/pfbulletdynamics.csplugin
trunk/src/plugins/dynamics/bullet_dynamics/system.cpp
trunk/src/plugins/dynamics/bullet_dynamics/system.h
Removed Paths:
-------------
trunk/src/include/editor.h
trunk/src/include/iPcAnimation.h
trunk/src/include/iPcBone.h
trunk/src/include/iPcCamMove.h
trunk/src/include/iPcCharacter.h
trunk/src/include/iPcCollider.h
trunk/src/include/iPcController.h
trunk/src/include/iPcDynamicsSystem.h
trunk/src/include/iPcJoint.h
trunk/src/include/iPcMeshObject.h
trunk/src/include/iPcObjectProperties.h
trunk/src/include/iPcRigidBody.h
trunk/src/include/iPcSelector.h
trunk/src/include/iRagdoll.h
trunk/src/include/iScriptController.h
trunk/src/include/ia-tool/
Modified: trunk/Jamfile.in
===================================================================
--- trunk/Jamfile.in 2008-03-25 18:51:36 UTC (rev 353)
+++ trunk/Jamfile.in 2008-04-01 12:47:03 UTC (rev 354)
@@ -74,7 +74,18 @@
[ ConcatDirs "$(hash)(CRYSTAL)" out debug$(MSVC_VERSION) libs ]
[ ConcatDirs "$(hash)(CRYSTAL)" libs csutil win32 libs ] ;
+MsvcGenConfig dynbullet.AVAILABLE : yes ;
+MsvcGenConfig dynbullet.DEFINES ;
+MsvcGenConfig dynbullet.CFLAGS ;
+MsvcGenConfig dynbullet.LFLAGS ;
+MsvcGenConfig dynbullet.LIBS : "libdynbullet.lib" ;
+MsvcGenConfig dynbullet.LIBS.DEBUG : "libdynbullet_d.lib" ;
+MsvcGenConfig dynbullet.LIBDIRS :
+ [ ConcatDirs .. .. out release$(MSVC_VERSION) libs ] ;
+MsvcGenConfig dynbullet.LIBDIRS.DEBUG :
+ [ ConcatDirs .. .. out debug$(MSVC_VERSION) libs ] ;
+
if $(CEL.DESIRED) = yes
{
MsvcGenConfig CEL.AVAILABLE : yes ;
@@ -106,10 +117,10 @@
MsvcGenConfig WX.LIBS.DEBUG : "wxbase28d.lib wxmsw28d_core.lib wxmsw28d_gl.lib opengl32.lib wxmsw28d_aui.lib" ;
MsvcGenConfig BULLET.AVAILABLE : yes ;
-MsvcGenConfig BULLET.LIBS : "bulletcollision-vc8.lib" ;
+MsvcGenConfig BULLET.LIBS : "libbulletcollision.lib libbulletmath.lib libbulletdynamics.lib" ;
MsvcGenConfig BULLET.CFLAGS : "" ;
MsvcGenConfig BULLET.LFLAGS : "" ;
-MsvcGenConfig WX.LIBS.DEBUG : "bulletcollision-vc8_d.lib" ;
+MsvcGenConfig BULLET.LIBS.DEBUG : "libbulletcollision_d.lib libbulletmath_d.lib libbulletdynamics_d.lib" ;
# Set project-specific compiler and linker options for msvcgen.
#MsvcDefine MY_DEFINE : "my value" ;
Added: trunk/mk/autoconf/Jamfile
===================================================================
--- trunk/mk/autoconf/Jamfile (rev 0)
+++ trunk/mk/autoconf/Jamfile 2008-04-01 12:47:03 UTC (rev 354)
@@ -0,0 +1,3 @@
+SubDir TOP mk autoconf ;
+
+InstallData [ Wildcard *.m4 config.* ] install-sh : build autoconf ;
Modified: trunk/mk/autoconf/jamcache.m4
===================================================================
--- trunk/mk/autoconf/jamcache.m4 2008-03-25 18:51:36 UTC (rev 353)
+++ trunk/mk/autoconf/jamcache.m4 2008-04-01 12:47:03 UTC (rev 354)
@@ -1,58 +1,58 @@
-# jamcache.m4 -*- Autoconf -*-
-#==============================================================================
-# Copyright (C)2003 by Eric Sunshine <sun...@su...>
-#
-# This library is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Library General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.
-#
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
-# License for more details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this library; if not, write to the Free Software Foundation,
-# Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-#==============================================================================
-AC_PREREQ([2.56])
-
-#------------------------------------------------------------------------------
-# Text cache facility for Jam-style properties. The cache is stored in
-# the shell variable cs_jamfile_text.
-#
-# CS_JAMCONFIG_APPEND(TEXT)
-# Append text to the Jam text cache. This is a cover for
-# CS_TEXT_CACHE_APPEND().
-#
-# CS_JAMCONFIG_PREPEND(TEXT)
-# Prepend text to the Jam text cache. This is a cover for
-# CS_TEXT_CACHE_PREPEND().
-#
-# CS_JAMCONFIG_PROPERTY(KEY, VALUE, [APPEND], [UNCONDITIONAL])
-# Append a line of the form "KEY ?= VALUE" to the Jam text cache. If the
-# APPEND argument is not the empty string, then VALUE is appended to the
-# existing value of KEY using the form "KEY += VALUE". If the
-# UNCONDITIONAL argument is not empty, then the value of KEY is set
-# unconditionally "KEY = VALUE", rather than via "KEY ?= VALUE". APPEND
-# takes precedence over UNCONDITIONAL. Note that if VALUE references
-# other Jam variables, for example $(OBJS), then be sure to protect the
-# value with AS_ESCAPE(). For example:
-# CS_JAMCONFIG_PROPERTY([ALLOBJS], [AS_ESCAPE([$(OBJS) $(LIBOBJS)])])
-#
-# CS_JAMCONFIG_OUTPUT(FILENAME)
-# Instruct config.status to write the Jam text cache to the given
-# filename. This is a cover for CS_TEXT_CACHE_OUTPUT().
-#------------------------------------------------------------------------------
-AC_DEFUN([CS_JAMCONFIG_APPEND],
- [CS_TEXT_CACHE_APPEND([cs_jamconfig_text], [$1])])
-AC_DEFUN([CS_JAMCONFIG_PREPEND],
- [CS_TEXT_CACHE_PREPEND([cs_jamconfig_text], [$1])])
-AC_DEFUN([CS_JAMCONFIG_PROPERTY],
- [CS_JAMCONFIG_APPEND(
- [$1 m4_ifval([$3], [+=], m4_ifval([$4], [=], [?=])) \"$2\" ;
-])])
-AC_DEFUN([CS_JAMCONFIG_OUTPUT],
- [CS_TEXT_CACHE_OUTPUT([cs_jamconfig_text], [$1])])
+# jamcache.m4 -*- Autoconf -*-
+#==============================================================================
+# Copyright (C)2003 by Eric Sunshine <sun...@su...>
+#
+# This library is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Library General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your
+# option) any later version.
+#
+# This library is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with this library; if not, write to the Free Software Foundation,
+# Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+#==============================================================================
+AC_PREREQ([2.56])
+
+#------------------------------------------------------------------------------
+# Text cache facility for Jam-style properties. The cache is stored in
+# the shell variable cs_jamfile_text.
+#
+# CS_JAMCONFIG_APPEND(TEXT)
+# Append text to the Jam text cache. This is a cover for
+# CS_TEXT_CACHE_APPEND().
+#
+# CS_JAMCONFIG_PREPEND(TEXT)
+# Prepend text to the Jam text cache. This is a cover for
+# CS_TEXT_CACHE_PREPEND().
+#
+# CS_JAMCONFIG_PROPERTY(KEY, VALUE, [APPEND], [UNCONDITIONAL])
+# Append a line of the form "KEY ?= VALUE" to the Jam text cache. If the
+# APPEND argument is not the empty string, then VALUE is appended to the
+# existing value of KEY using the form "KEY += VALUE". If the
+# UNCONDITIONAL argument is not empty, then the value of KEY is set
+# unconditionally "KEY = VALUE", rather than via "KEY ?= VALUE". APPEND
+# takes precedence over UNCONDITIONAL. Note that if VALUE references
+# other Jam variables, for example $(OBJS), then be sure to protect the
+# value with AS_ESCAPE(). For example:
+# CS_JAMCONFIG_PROPERTY([ALLOBJS], [AS_ESCAPE([$(OBJS) $(LIBOBJS)])])
+#
+# CS_JAMCONFIG_OUTPUT(FILENAME)
+# Instruct config.status to write the Jam text cache to the given
+# filename. This is a cover for CS_TEXT_CACHE_OUTPUT().
+#------------------------------------------------------------------------------
+AC_DEFUN([CS_JAMCONFIG_APPEND],
+ [CS_TEXT_CACHE_APPEND([cs_jamconfig_text], [$1])])
+AC_DEFUN([CS_JAMCONFIG_PREPEND],
+ [CS_TEXT_CACHE_PREPEND([cs_jamconfig_text], [$1])])
+AC_DEFUN([CS_JAMCONFIG_PROPERTY],
+ [CS_JAMCONFIG_APPEND(
+ [$1 m4_ifval([$3], [+=], m4_ifval([$4], [=], [?=])) $2 ;
+])])
+AC_DEFUN([CS_JAMCONFIG_OUTPUT],
+ [CS_TEXT_CACHE_OUTPUT([cs_jamconfig_text], [$1])])
Added: trunk/mk/jam/Jamfile
===================================================================
--- trunk/mk/jam/Jamfile (rev 0)
+++ trunk/mk/jam/Jamfile 2008-04-01 12:47:03 UTC (rev 354)
@@ -0,0 +1,3 @@
+SubDir TOP mk jam ;
+
+InstallData [ Wildcard *.jam ] : build jam ;
Added: trunk/mk/jam/crystalspace_staticplugins_msvc.jam
===================================================================
--- trunk/mk/jam/crystalspace_staticplugins_msvc.jam (rev 0)
+++ trunk/mk/jam/crystalspace_staticplugins_msvc.jam 2008-04-01 12:47:03 UTC (rev 354)
@@ -0,0 +1,15 @@
+# This is an example on how to include the MSVC static plugins information
+# for external projects.
+# The information itself is split across multiple files, one for each
+# supported version of MSVC; the files for the desired MSVC versions must
+# be included (usually all).
+
+# The inclusions below are of examplary nature and would only work within
+# the source tree of CS. For an external project you could either directly
+# refer to the files inside CS or a copy in your project's sources; either
+# way, the include statements below would obviously have to adjusted
+# appropriately.
+include $(TOP)/mk/msvc/crystalspace_staticplugins_msvc7.jam ;
+include $(TOP)/mk/msvc/crystalspace_staticplugins_msvc71.jam ;
+include $(TOP)/mk/msvc/crystalspace_staticplugins_msvc8.jam ;
+include $(TOP)/mk/msvc/crystalspace_staticplugins_msvc9.jam ;
Modified: trunk/mk/jam/flags.jam
===================================================================
--- trunk/mk/jam/flags.jam 2008-03-25 18:51:36 UTC (rev 353)
+++ trunk/mk/jam/flags.jam 2008-04-01 12:47:03 UTC (rev 354)
@@ -40,10 +40,14 @@
}
Depends $($(<)_TARGET) : $(rawlibs) ;
- NEEDLIBS on $($(<)_TARGET) += $(libs) ;
+ NEEDLIBS on $($(<)_TARGET) =
+ [ MergeLFlags [ on $($(<)_TARGET) GetVar NEEDLIBS ] : $(libs) ] ;
$(<).NEEDLIBS += $(rawlibs) ;
- LFlags $(<) : $($($(rawlibs).EXTERNALLIBS).LFLAGS) ;
+ for l in $(rawlibs)
+ {
+ LFlags $(<) : $($($(l).EXTERNALLIBS).LFLAGS) ;
+ }
}
## CFlags target : flags [ : options ]
@@ -98,8 +102,9 @@
CheckOptions nostatic : $(3) : $(<) ;
NotFile $(>) ;
- NEEDLIBS on $($(<)_TARGET) += $(>) ;
- $(<).LFLAGS += $(>) ;
+ NEEDLIBS on $($(<)_TARGET) = [ Reverse [ RemoveDups [ Reverse
+ [ on $($(<)_TARGET) GetVar NEEDLIBS ] $(>) ] ] ] ;
+ $(<).LFLAGS = [ Reverse [ RemoveDups [ Reverse $($(<).LFLAGS) $(>) ] ] ] ;
UnitTestLFlags $(<) : $(>) : $(3) ;
}
Added: trunk/mk/msvcgen/Jamfile
===================================================================
--- trunk/mk/msvcgen/Jamfile (rev 0)
+++ trunk/mk/msvcgen/Jamfile 2008-04-01 12:47:03 UTC (rev 354)
@@ -0,0 +1,141 @@
+#==============================================================================
+# MSVC-specific customizations for msvcgen
+# Copyright (C) 2004 by Eric Sunshine <sun...@su...>
+#
+# This library is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Library General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your
+# option) any later version.
+#
+# This library is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with this library; if not, write to the Free Software Foundation,
+# Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+#==============================================================================
+
+GREP ?= grep ;
+
+SubDir TOP mk msvcgen ;
+
+InstallData [ Wildcard *.cslib *.jam *.tlib ] : build msvcgen ;
+
+MsvcGenSubDir TOP mk msvc : common ;
+MsvcGenSubDir TOP mk msvc7 : 7 ;
+MsvcGenSubDir TOP mk msvc71 : 71 ;
+MsvcGenSubDir TOP mk msvc8 : 8 ;
+MsvcGenSubDir TOP mk msvc9 : 9 ;
+MsvcGenTemplateDir TOP mk msvcgen ;
+
+if [ Property build : projgen ] = msvc
+{
+ # New, cs-win32libs >= 1.3_002 include dir
+ IncludeDir win32libs "include" ;
+ # "Old" include dir
+ IncludeDir "include" csutil win32 ;
+}
+
+# We need to customize the list of build configurations.
+MsvcGenVariable customize : custom.cslib custom2.cslib ;
+
+# Set up the workspaces we want msvcgen to synthesize.
+include [ ConcatDirs $(SUBDIR) workspaces.jam ] ;
+
+# Crystal Space-specific interpolation values.
+MsvcGenVariable libdir :
+ # New, cs-win32libs >= 1.3_002 libraries dir
+ "../../win32libs/lib"
+ # "Old" libraries dir
+ "../../libs/csutil/win32/libs" ;
+MsvcGenVariable libdirdebug :
+ "../../win32libs/lib"
+ "../../libs/csutil/win32/libs" ;
+
+#------------------------------------------------------------------------------
+# The msvcgen process needs to be presented with configuration information
+# suitable for Windows regardless of which platform is actually invoking
+# msvcgen. This information comes from the static CS/mk/msvcgen/config.jam
+# file. It controls which modules will be seen by msvcgen, and provides
+# additional compiler and linker flags when appropriate.
+#
+# On the other hand, local tools, such as Perl, are required for the actual
+# invocation of msvcgen, thus we need to use our own local configuration,
+# $(BUILDTOP)/Jamconfig; yet this configuration may cause the wrong set of
+# progjects to be built if it is specific to a platform other than Windows.
+# For instance, on MacOS/X, a local Jamconfig will cause msvcgen to generate a
+# project file for the CoreAudio plugin, which is specific to Macintosh.
+#
+# To work around this problem, we compose a special-purpose Jamconfig.msvcgen,
+# which is a combination of CS/mk/msvcgen/config.jam and the module-agnostic
+# information from $(BUILDTOP)/Jamconfig; that is, we extract information about
+# local tools, such as Perl, but omit information about modules relevant to the
+# local platform, such as CoreAudio. The resulting Jamconfig.msvcgen is
+# essentially a cross-building configuration, suitable for generating project
+# files for Windows from the local platform (which might not be Windows). We
+# create Jamconfig.msvcgen only when needed by making it a dependency of the
+# top-level msvcgen targets, and we instruct Jamrules to utilize this custom
+# configuration file by overriding JAMCONFIG.
+#------------------------------------------------------------------------------
+
+## MsvcJamconfig customconfig : jamconfig : jamconfigdir : boilerplate :
+## boilerplatedir [ : rejects ]
+## Create a hybrid Jam configuration file (as discussed above) by combining
+## the 'boilerplate' file (which should contain MSVC-specific configuration)
+## with a filtered version of this platform's Jamconfig file, 'jamconfig'
+## (which resides in 'jamconfigdir'). The generated hybrid configuration
+## file, 'customconfig' will be placed in 'jamconfigdir'. 'rejects' is a
+## list of grep-style expressions which will filter out unwanted content from
+## 'jamconfig', leaving only the content which is required for actually
+## running msvcgen. (These are not extended grep-style patterns. If you
+## need those, then you will also need to redefine $(GREP) as "egrep" or
+## "grep -E", if supported by the platform.) 'customconfig' will be made a
+## dependency of each of the 'msvcgen' targets to ensure that it is created
+## in time for th actual project synthesis run; and will be cleaned by
+## 'msvcclean', 'clean', and 'distclean'.
+rule MsvcJamconfig
+{
+ local target = $(1) ;
+ local source = $(2) ;
+ local sourcedir = $(3) ;
+ local boilerplate = $(4) ;
+ local boilerdir = $(5) ;
+ local rejects = " | $(GREP) -v '$(6)' " ;
+
+ target = $(target:G=msvcgenconfig) ;
+ source = $(source:G=msvcgenconfig) ;
+ boilerplate = $(boilerplate:G=msvcgenconfig) ;
+
+ SEARCH on $(source) = $(sourcedir) ;
+ SEARCH on $(boilerplate) = $(boilerdir) ;
+ BOILERPLATE on $(target) = $(boilerplate) ;
+ REJECTS on $(target) = $(rejects) ;
+
+ MakeLocate $(target) : $(sourcedir) ;
+ Always $(target) ;
+ Depends $(target) : $(source) $(boilerplate) ;
+ MsvcJamconfig1 $(target) : $(source) ;
+ Clean msvcclean : $(target) ;
+
+ local i ;
+ for i in $(MSVCGEN_TARGETS)
+ {
+ Depends $(i) : $(target) ;
+ }
+
+ local fullpath = [ ConcatDirs $(sourcedir) $(target:G=) ] ;
+ MSVCGEN_JAMOPTIONS += -sJAMCONFIG='$(fullpath)' ;
+ return $(fullpath) ;
+}
+
+actions MsvcJamconfig1 bind BOILERPLATE
+{
+ cat $(BOILERPLATE) > $(<)
+ cat $(>) $(REJECTS) >> $(<)
+}
+
+MsvcJamconfig Jamconfig.msvcgen : $(JAMCONFIG:BS) : $(JAMCONFIG:D) :
+ config.jam : $(SUBDIR) : AVAILABLE CFLAGS C++FLAGS LFLAGS ;
Added: trunk/mk/msvcgen/config.jam
===================================================================
--- trunk/mk/msvcgen/config.jam (rev 0)
+++ trunk/mk/msvcgen/config.jam 2008-04-01 12:47:03 UTC (rev 354)
@@ -0,0 +1,112 @@
+#==============================================================================
+# MSVC-specific configuration for msvcgen
+#
+# This library is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Library General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your
+# option) any later version.
+#
+# This library is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with this library; if not, write to the Free Software Foundation,
+# Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+#==============================================================================
+#------------------------------------------------------------------------------
+# This file contains extra configuration information for the msvcgen process.
+# The most common use of this file is to provide MSVC-specific fallback values
+# for the library checks normally performed by the Crystal Space configure
+# script, and which the various Jamfiles reference via the ExternalLibs rule.
+# Such fallbacks consist of variables named TAG.CFLAGS, TAG.LFLAGS, and
+# TAG.LIBS, where TAG represents the library's identifier emitted by the
+# configure script. For instance, to provide MSVC-specific fallback values for
+# the FreeType2 library, which the configure script identifies as FT2, you can
+# define variables named FT2.CFLAGS, FT2.LFLAGS, and FT2.LIBS. You should also
+# set TAG.AVAILABLE variables to "yes" to ensure that the correct Jamfiles are
+# loaded for MSVC and that the correct project targets get created. For
+# instance, to ensure that the FreeType2 plugin's project file is generated,
+# set FT2.AVAILABLE to "yes".
+#------------------------------------------------------------------------------
+
+3DS.AVAILABLE = yes ;
+3DS.DEFINES = LIB3DS_GENERIC_DATA_IO_CALLBACKS ;
+3DS.LIBS = lib3ds.lib ;
+BULLET.AVAILABLE = yes ;
+BULLET.LIBS.7 = bulletcollision-vc7.lib bulletdynamics-vc7.lib bulletmath-vc7.lib ;
+BULLET.LIBS.DEBUG.7 = bulletcollision-vc7_d.lib bulletdynamics-vc7_d.lib bulletmath-vc7_d.lib ;
+BULLET.LIBS.71 = bulletcollision-vc71.lib bulletdynamics-vc71.lib bulletmath-vc71.lib ;
+BULLET.LIBS.DEBUG.71 = bulletcollision-vc71_d.lib bulletdynamics-vc71_d.lib bulletmath-vc71_d.lib ;
+BULLET.LIBS.8 = bulletcollision-vc8.lib bulletdynamics-vc8.lib bulletmath-vc8.lib ;
+BULLET.LIBS.DEBUG.8 = bulletcollision-vc8_d.lib bulletdynamics-vc8_d.lib bulletmath-vc8_d.lib ;
+BULLET.LIBS.9 = bulletcollision-vc9.lib bulletdynamics-vc9.lib bulletmath-vc9.lib ;
+BULLET.LIBS.DEBUG.9 = bulletcollision-vc9_d.lib bulletdynamics-vc9_d.lib bulletmath-vc9_d.lib ;
+CACA.AVAILABLE = yes ;
+CACA.LIBS = libcaca.lib ;
+CUCUL.AVAILABLE = yes ;
+CUCUL.LIBS = libcucul.lib ;
+CAL3D.AVAILABLE = yes ;
+CAL3D.DEFINES = CS_HAVE_CAL3D ;
+CAL3D.LIBS.7 = cal3d-vc7.lib ;
+CAL3D.LIBS.DEBUG.7 = cal3d-vc7_d.lib ;
+CAL3D.LIBS.71 = cal3d-vc71.lib ;
+CAL3D.LIBS.DEBUG.71 = cal3d-vc71_d.lib ;
+CAL3D.LIBS.8 = cal3d-vc8.lib ;
+CAL3D.LIBS.DEBUG.8 = cal3d-vc8_d.lib ;
+CAL3D.LIBS.9 = cal3d-vc9.lib ;
+CAL3D.LIBS.DEBUG.9 = cal3d-vc9_d.lib ;
+CEGUI.AVAILABLE = yes ;
+CEGUI.LIBS.7 = CEGUIBase-vc7.lib ;
+CEGUI.LIBS.DEBUG.7 = CEGUIBase-vc7_d.lib ;
+CEGUI.LIBS.71 = CEGUIBase-vc71.lib ;
+CEGUI.LIBS.DEBUG.71 = CEGUIBase-vc71_d.lib ;
+CEGUI.LIBS.8 = CEGUIBase-vc8.lib ;
+CEGUI.LIBS.DEBUG.8 = CEGUIBase-vc8_d.lib ;
+CEGUI.LIBS.9 = CEGUIBase-vc9.lib ;
+CEGUI.LIBS.DEBUG.9 = CEGUIBase-vc9_d.lib ;
+CG.AVAILABLE = yes ;
+CG.LIBS = cg.lib cgGL.lib ;
+DIRECTX.AVAILABLE = yes ;
+DIRECTX.LIBS = dsound.lib ddraw.lib dinput.lib ;
+DIRECTX8.AVAILABLE = yes ;
+DIRECTX8.LIBS = dsound.lib ddraw.lib dinput.lib ;
+FT2.AVAILABLE = yes ;
+FT2.LIBS = freetype2.lib ;
+GL.AVAILABLE = yes ;
+GL.LIBS = opengl32.lib ;
+JPEG.AVAILABLE = yes ;
+JPEG.LIBS = libjpeg.lib ;
+JS.AVAILABLE = yes ;
+JS.DEFINES = XP_WIN ;
+JS.LIBS = js.lib ;
+MIKMOD.AVAILABLE = yes ;
+MIKMOD.LIBS = mikmod.lib ;
+MNG.AVAILABLE = yes ;
+MNG.LIBS = libmng.lib ;
+ODE.AVAILABLE = yes ;
+ODE.LIBS = ode.lib ;
+OPENAL.AVAILABLE = yes ;
+OPENAL.LIBS = openal32.lib ;
+PNG.AVAILABLE = yes ;
+PNG.LIBS = libpng.lib ;
+PYTHON.DEFINES = SWIG_GLOBAL ;
+PYTHON.AVAILABLE = yes ;
+SOCKET.AVAILABLE = yes ;
+SOCKET.LIBS = wsock32.lib ;
+STL.AVAILABLE = yes ;
+VORBISFILE.AVAILABLE = yes ;
+VORBISFILE.LIBS = vorbisfile.lib vorbis.lib ogg.lib ;
+VOS.AVAILABLE = yes ;
+VOS.LIBS = libvutil.lib libvip.lib libvos.lib libmetaobject_a3dl.lib libmetaobject_misc.lib ;
+WAVEOUT.AVAILABLE = yes ;
+WAVEOUT.LIBS = winmm.lib ;
+WX.AVAILABLE = yes ;
+WX.DEFINES = wxUSE_GUI=1 WXUSINGDLL=1 ;
+WX.LIBS = wxbase26.lib wxmsw26_core.lib wxmsw26_gl.lib opengl32.lib ;
+WX.DEFINES.DEBUG = wxUSE_GUI=1 WXUSINGDLL=1 WXDEBUG=1 ;
+WX.LIBS.DEBUG = wxbase26d.lib wxmsw26d_core.lib wxmsw26d_gl.lib opengl32.lib ;
+ZLIB.AVAILABLE = yes ;
+ZLIB.LIBS = zlib.lib ;
Modified: trunk/mk/msvcgen/custom.cslib
===================================================================
--- trunk/mk/msvcgen/custom.cslib 2008-03-25 18:51:36 UTC (rev 353)
+++ trunk/mk/msvcgen/custom.cslib 2008-04-01 12:47:03 UTC (rev 354)
@@ -37,7 +37,8 @@
# configurations.
#------------------------------------------------------------------------------
FOREACH build IN builds;
- build.defines = build.defines.merge(['CS_WIN32_CSCONFIG','__CRYSTAL_SPACE__']);
+ build.defines = build.defines.merge(['CS_WIN32_CSCONFIG','__CRYSTAL_SPACE__',
+ 'CS_SUPPORTS_MMX']);
END;
END %]
Added: trunk/mk/msvcgen/custom2.cslib
===================================================================
--- trunk/mk/msvcgen/custom2.cslib (rev 0)
+++ trunk/mk/msvcgen/custom2.cslib 2008-04-01 12:47:03 UTC (rev 354)
@@ -0,0 +1,58 @@
+[% FILTER null;
+#==============================================================================
+# TemplateToolkit2 CrystalSpace customizations for MSVC project generation
+# Copyright (C) 2004 by Eric Sunshine <sun...@su...>
+#
+# This library is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Library General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your
+# option) any later version.
+#
+# This library is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with this library; if not, write to the Free Software Foundation,
+# Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+#==============================================================================
+
+#------------------------------------------------------------------------------
+# Search the default 'debug' build configuration since the RefTracker and
+# MemoryTracker configurations are based on the 'debug' one.
+#------------------------------------------------------------------------------
+builddebug = {};
+FOREACH build IN builds;
+ IF build.tag == 'debug';
+ builddebug = build;
+ BREAK;
+ END;
+END;
+
+#------------------------------------------------------------------------------
+# Crystal Space adds additional build configurations to the default set
+# provided by the generic, project-agnostic builds[] array (control.tlib).
+#------------------------------------------------------------------------------
+# Build MemoryTracker config by copying the default debug config and changing
+# some fields.
+buildmemtrack = {};
+buildmemtrack.import(builddebug);
+buildmemtrack.import({
+ name => 'MemoryTracker',
+ defines => builddebug.defines.merge(['CS_MEMORY_TRACKER']),
+ priority => 400
+ });
+# Likewise for RefTracker.
+buildreftrack = {};
+buildreftrack.import(builddebug);
+buildreftrack.import({
+ name => 'RefTracker',
+ defines => builddebug.defines.merge(['CS_REF_TRACKER']),
+ priority => 500
+ });
+# Merge into the builds array
+builds = builds.merge([buildmemtrack, buildreftrack]);
+
+END %]
Added: trunk/mk/msvcgen/workspaces.jam
===================================================================
--- trunk/mk/msvcgen/workspaces.jam (rev 0)
+++ trunk/mk/msvcgen/workspaces.jam 2008-04-01 12:47:03 UTC (rev 354)
@@ -0,0 +1,44 @@
+#==============================================================================
+#
+# Automatic MSVC-compliant workspace and project generation component
+# Copyright (C) 2004 by Eric Sunshine <sun...@su...>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this library; if not, write to the Free
+# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+#==============================================================================
+
+# Everything.
+# MsvcGenWorkspace all : : "grp.+_(?!all$)" ;
+
+# List of filters for "convenience projects" - that is, VC projects which are
+# generated but don't appear in any workspaces (since e.g. required libraries
+# are relatively uncommon and/or not shipped with cs-win32libs).
+MSVC_CONVENIENCE_PROJECTS = perl ;
+
+# What the typical user will need. Presently, everything but wxWidgets.
+MsvcGenWorkspace typical : :
+ "grp.+_(?!typical$)" wx static $(MSVC_CONVENIENCE_PROJECTS) py ;
+
+# Similar to "typical", but with wxWidgets.
+MsvcGenWorkspace wxtypical : :
+ "grp.+_(?!wxtypical$)" static $(MSVC_CONVENIENCE_PROJECTS) py ;
+
+# Similar to "typical", but with Python.
+MsvcGenWorkspace pytypical : :
+ "grp.+_(?!pytypical$)" static $(MSVC_CONVENIENCE_PROJECTS) ;
+
+# Workspace for static variants of plugins and apps.
+MsvcGenWorkspace static : static ^lib.* :
+ "grp.+_(?!static$)" wx $(MSVC_CONVENIENCE_PROJECTS) py ;
Modified: trunk/msvc/7/appiaeditor.vcproj
===================================================================
--- trunk/msvc/7/appiaeditor.vcproj 2008-03-25 18:51:36 UTC (rev 353)
+++ trunk/msvc/7/appiaeditor.vcproj 2008-04-01 12:47:03 UTC (rev 354)
@@ -30,7 +30,7 @@
BufferSecurityCheck="FALSE"
ProgramDataBaseFileName="..\..\out\release7\build\appiaeditor\iaeditor.pdb"
PreprocessorDefinitions="
-NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1;USE_CEL;WIN32"
+NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1;USE_CEL;WIN32"
OptimizeForProcessor="1"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include;..\..\..\CS\include;..\..\..\CS\include\csutil\win32;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil\win32;..\..\..\cel\include;$(CEL)\include;$(CEL)\include\cel"
@@ -65,7 +65,7 @@
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1;USE_CEL"
+ PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1;USE_CEL"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
@@ -80,7 +80,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1;USE_CEL;PROJECTGEN_VERSION=7"
+ PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1;USE_CEL;PROJECTGEN_VERSION=7"
AdditionalIncludeDirectories=".;..\..\src\apps\editor;..\..;..\..\src;..\..\src\include;..\..\..\CS\include;..\..\..\CS\include\csutil\win32;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil\win32;..\..\..\cel\include;$(CEL)\include;$(CEL)\include\cel"
Culture="1033"/>
<Tool
@@ -107,7 +107,7 @@
BufferSecurityCheck="FALSE"
ProgramDataBaseFileName="..\..\out\release7\build\appiaeditor\iaeditor.pdb"
PreprocessorDefinitions="
-NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1;USE_CEL;WIN32;CS_BUILD_SHARED_LIBS"
+NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1;USE_CEL;WIN32;CS_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include;..\..\..\CS\include;..\..\..\CS\include\csutil\win32;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil\win32;..\..\..\cel\include;$(CEL)\include;$(CEL)\include\cel"
@@ -142,7 +142,7 @@
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1;USE_CEL"
+ PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1;USE_CEL"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
@@ -157,7 +157,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1;USE_CEL;PROJECTGEN_VERSION=7"
+ PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1;USE_CEL;PROJECTGEN_VERSION=7"
AdditionalIncludeDirectories=".;..\..\src\apps\editor;..\..;..\..\src;..\..\src\include;..\..\..\CS\include;..\..\..\CS\include\csutil\win32;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil\win32;..\..\..\cel\include;$(CEL)\include;$(CEL)\include\cel"
Culture="1033"/>
<Tool
@@ -183,7 +183,7 @@
ProgramDataBaseFileName="..\..\out\debug7\build\appiaeditor\iaeditor.pdb"
PreprocessorDefinitions="
-_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;USE_CEL;WIN32"
+_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;USE_CEL;WIN32"
OptimizeForProcessor="1"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include;..\..\..\CS\include;..\..\..\CS\include\csutil\win32;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil\win32;..\..\..\cel\include;$(CEL)\include;$(CEL)\include\cel"
@@ -216,7 +216,7 @@
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;USE_CEL"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;USE_CEL"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
@@ -231,7 +231,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;USE_CEL;PROJECTGEN_VERSION=7"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;USE_CEL;PROJECTGEN_VERSION=7"
AdditionalIncludeDirectories=".;..\..\src\apps\editor;..\..;..\..\src;..\..\src\include;..\..\..\CS\include;..\..\..\CS\include\csutil\win32;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil\win32;..\..\..\cel\include;$(CEL)\include;$(CEL)\include\cel"
Culture="1033"/>
<Tool
@@ -257,7 +257,7 @@
ProgramDataBaseFileName="..\..\out\debug7\build\appiaeditor\iaeditor.pdb"
PreprocessorDefinitions="
-_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;USE_CEL;WIN32;CS_BUILD_SHARED_LIBS"
+_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;USE_CEL;WIN32;CS_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include;..\..\..\CS\include;..\..\..\CS\include\csutil\win32;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil\win32;..\..\..\cel\include;$(CEL)\include;$(CEL)\include\cel"
@@ -290,7 +290,7 @@
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;USE_CEL"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;USE_CEL"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
@@ -305,7 +305,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;USE_CEL;PROJECTGEN_VERSION=7"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;USE_CEL;PROJECTGEN_VERSION=7"
AdditionalIncludeDirectories=".;..\..\src\apps\editor;..\..;..\..\src;..\..\src\include;..\..\..\CS\include;..\..\..\CS\include\csutil\win32;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil\win32;..\..\..\cel\include;$(CEL)\include;$(CEL)\include\cel"
Culture="1033"/>
<Tool
Modified: trunk/msvc/7/grpall_iaeditor.vcproj
===================================================================
--- trunk/msvc/7/grpall_iaeditor.vcproj 2008-03-25 18:51:36 UTC (rev 353)
+++ trunk/msvc/7/grpall_iaeditor.vcproj 2008-04-01 12:47:03 UTC (rev 354)
@@ -27,7 +27,7 @@
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
PreprocessorDefinitions="
-NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;WIN32"
+NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;WIN32"
OptimizeForProcessor="1"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include"
@@ -60,7 +60,7 @@
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__"
+ PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
@@ -75,7 +75,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PROJECTGEN_VERSION=7"
+ PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;PROJECTGEN_VERSION=7"
AdditionalIncludeDirectories=".;..\..\src\plugins\csobjects;..\..;..\..\src;..\..\src\include"
Culture="1033"/>
<Tool
@@ -99,7 +99,7 @@
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
PreprocessorDefinitions="
-NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;WIN32;CS_BUILD_SHARED_LIBS"
+NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;WIN32;CS_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include"
@@ -132,7 +132,7 @@
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__"
+ PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
@@ -147,7 +147,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PROJECTGEN_VERSION=7"
+ PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;PROJECTGEN_VERSION=7"
AdditionalIncludeDirectories=".;..\..\src\plugins\csobjects;..\..;..\..\src;..\..\src\include"
Culture="1033"/>
<Tool
@@ -171,7 +171,7 @@
RuntimeLibrary="3"
PreprocessorDefinitions="
-_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;WIN32"
+_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;WIN32"
OptimizeForProcessor="1"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include"
@@ -202,7 +202,7 @@
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
@@ -217,7 +217,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PROJECTGEN_VERSION=7"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;PROJECTGEN_VERSION=7"
AdditionalIncludeDirectories=".;..\..\src\plugins\csobjects;..\..;..\..\src;..\..\src\include"
Culture="1033"/>
<Tool
@@ -241,7 +241,7 @@
RuntimeLibrary="3"
PreprocessorDefinitions="
-_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;WIN32;CS_BUILD_SHARED_LIBS"
+_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;WIN32;CS_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include"
@@ -272,7 +272,7 @@
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
@@ -287,7 +287,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PROJECTGEN_VERSION=7"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;PROJECTGEN_VERSION=7"
AdditionalIncludeDirectories=".;..\..\src\plugins\csobjects;..\..;..\..\src;..\..\src\include"
Culture="1033"/>
<Tool
Modified: trunk/msvc/7/grpapps_iaeditor.vcproj
===================================================================
--- trunk/msvc/7/grpapps_iaeditor.vcproj 2008-03-25 18:51:36 UTC (rev 353)
+++ trunk/msvc/7/grpapps_iaeditor.vcproj 2008-04-01 12:47:03 UTC (rev 354)
@@ -27,7 +27,7 @@
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
PreprocessorDefinitions="
-NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;WIN32"
+NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;WIN32"
OptimizeForProcessor="1"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include"
@@ -60,7 +60,7 @@
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__"
+ PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
@@ -75,7 +75,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PROJECTGEN_VERSION=7"
+ PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;PROJECTGEN_VERSION=7"
AdditionalIncludeDirectories=".;..\..\src\apps\editor;..\..;..\..\src;..\..\src\include"
Culture="1033"/>
<Tool
@@ -99,7 +99,7 @@
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
PreprocessorDefinitions="
-NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;WIN32;CS_BUILD_SHARED_LIBS"
+NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;WIN32;CS_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include"
@@ -132,7 +132,7 @@
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__"
+ PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
@@ -147,7 +147,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PROJECTGEN_VERSION=7"
+ PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;PROJECTGEN_VERSION=7"
AdditionalIncludeDirectories=".;..\..\src\apps\editor;..\..;..\..\src;..\..\src\include"
Culture="1033"/>
<Tool
@@ -171,7 +171,7 @@
RuntimeLibrary="3"
PreprocessorDefinitions="
-_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;WIN32"
+_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;WIN32"
OptimizeForProcessor="1"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include"
@@ -202,7 +202,7 @@
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
@@ -217,7 +217,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PROJECTGEN_VERSION=7"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;PROJECTGEN_VERSION=7"
AdditionalIncludeDirectories=".;..\..\src\apps\editor;..\..;..\..\src;..\..\src\include"
Culture="1033"/>
<Tool
@@ -241,7 +241,7 @@
RuntimeLibrary="3"
PreprocessorDefinitions="
-_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;WIN32;CS_BUILD_SHARED_LIBS"
+_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;WIN32;CS_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include"
@@ -272,7 +272,7 @@
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
@@ -287,7 +287,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PROJECTGEN_VERSION=7"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;PROJECTGEN_VERSION=7"
AdditionalIncludeDirectories=".;..\..\src\apps\editor;..\..;..\..\src;..\..\src\include"
Culture="1033"/>
<Tool
Modified: trunk/msvc/7/grpiaeditorall_iaeditor.vcproj
===================================================================
--- trunk/msvc/7/grpiaeditorall_iaeditor.vcproj 2008-03-25 18:51:36 UTC (rev 353)
+++ trunk/msvc/7/grpiaeditorall_iaeditor.vcproj 2008-04-01 12:47:03 UTC (rev 354)
@@ -27,7 +27,7 @@
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
PreprocessorDefinitions="
-NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;WIN32"
+NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;WIN32"
OptimizeForProcessor="1"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include"
@@ -60,7 +60,7 @@
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__"
+ PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
@@ -75,7 +75,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PROJECTGEN_VERSION=7"
+ PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;PROJECTGEN_VERSION=7"
AdditionalIncludeDirectories=".;..\..\.;..\..;..\..\src;..\..\src\include"
Culture="1033"/>
<Tool
@@ -99,7 +99,7 @@
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
PreprocessorDefinitions="
-NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;WIN32;CS_BUILD_SHARED_LIBS"
+NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;WIN32;CS_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include"
@@ -132,7 +132,7 @@
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__"
+ PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
@@ -147,7 +147,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PROJECTGEN_VERSION=7"
+ PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;PROJECTGEN_VERSION=7"
AdditionalIncludeDirectories=".;..\..\.;..\..;..\..\src;..\..\src\include"
Culture="1033"/>
<Tool
@@ -171,7 +171,7 @@
RuntimeLibrary="3"
PreprocessorDefinitions="
-_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;WIN32"
+_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;WIN32"
OptimizeForProcessor="1"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include"
@@ -202,7 +202,7 @@
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
@@ -217,7 +217,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PROJECTGEN_VERSION=7"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;PROJECTGEN_VERSION=7"
AdditionalIncludeDirectories=".;..\..\.;..\..;..\..\src;..\..\src\include"
Culture="1033"/>
<Tool
@@ -241,7 +241,7 @@
RuntimeLibrary="3"
PreprocessorDefinitions="
-_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;WIN32;CS_BUILD_SHARED_LIBS"
+_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;WIN32;CS_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include"
@@ -272,7 +272,7 @@
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
@@ -287,7 +287,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PROJECTGEN_VERSION=7"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;PROJECTGEN_VERSION=7"
AdditionalIncludeDirectories=".;..\..\.;..\..;..\..\src;..\..\src\include"
Culture="1033"/>
<Tool
Modified: trunk/msvc/7/grplibs_iaeditor.vcproj
===================================================================
--- trunk/msvc/7/grplibs_iaeditor.vcproj 2008-03-25 18:51:36 UTC (rev 353)
+++ trunk/msvc/7/grplibs_iaeditor.vcproj 2008-04-01 12:47:03 UTC (rev 354)
@@ -27,7 +27,7 @@
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
PreprocessorDefinitions="
-NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;WIN32"
+NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;WIN32"
OptimizeForProcessor="1"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include"
@@ -60,7 +60,7 @@
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__"
+ PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
@@ -75,7 +75,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PROJECTGEN_VERSION=7"
+ PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;PROJECTGEN_VERSION=7"
AdditionalIncludeDirectories=".;..\..\src\apps\editor;..\..;..\..\src;..\..\src\include"
Culture="1033"/>
<Tool
@@ -99,7 +99,7 @@
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
PreprocessorDefinitions="
-NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;WIN32;CS_BUILD_SHARED_LIBS"
+NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;WIN32;CS_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include"
@@ -132,7 +132,7 @@
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__"
+ PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
@@ -147,7 +147,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PROJECTGEN_VERSION=7"
+ PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;PROJECTGEN_VERSION=7"
AdditionalIncludeDirectories=".;..\..\src\apps\editor;..\..;..\..\src;..\..\src\include"
Culture="1033"/>
<Tool
@@ -171,7 +171,7 @@
RuntimeLibrary="3"
PreprocessorDefinitions="
-_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;WIN32"
+_DEBUG;CS_DEBUG...
[truncated message content] |
|
From: <ob...@us...> - 2008-03-25 18:51:29
|
Revision: 353
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=353&view=rev
Author: obi666
Date: 2008-03-25 11:51:36 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
Added vc9 msvcgen handling.
Started new cs-independent dynamics library.
Modified Paths:
--------------
trunk/Jamfile.in
trunk/configure
trunk/configure.ac
trunk/mk/autoconf/cel.m4
trunk/mk/autoconf/checkbuild.m4
trunk/mk/autoconf/checkcommon.m4
trunk/mk/autoconf/checklib.m4
trunk/mk/autoconf/checkprog.m4
trunk/mk/autoconf/checkpython.m4
trunk/mk/autoconf/compiler.m4
trunk/mk/autoconf/crystal.m4
trunk/mk/autoconf/emit.m4
trunk/mk/autoconf/packageinfo.m4
trunk/mk/autoconf/warnings.m4
trunk/mk/jam/application.jam
trunk/mk/jam/assembler.jam
trunk/mk/jam/bisonflex.jam
trunk/mk/jam/build.jam
trunk/mk/jam/clean.jam
trunk/mk/jam/compiler.jam
trunk/mk/jam/docs.jam
trunk/mk/jam/dump.jam
trunk/mk/jam/flags.jam
trunk/mk/jam/groups.jam
trunk/mk/jam/help.jam
trunk/mk/jam/helper.jam
trunk/mk/jam/install.jam
trunk/mk/jam/jamcompatibility.jam
trunk/mk/jam/library.jam
trunk/mk/jam/macosx.jam
trunk/mk/jam/msvcgen.jam
trunk/mk/jam/objectivec.jam
trunk/mk/jam/objects.jam
trunk/mk/jam/options.jam
trunk/mk/jam/plugin.jam
trunk/mk/jam/property.jam
trunk/mk/jam/pythmod.jam
trunk/mk/jam/resource.jam
trunk/mk/jam/static.jam
trunk/mk/jam/subdir.jam
trunk/mk/jam/swig.jam
trunk/mk/jam/unittest.jam
trunk/mk/jam/unix.jam
trunk/mk/jam/variant.jam
trunk/mk/jam/win32.jam
trunk/mk/msvcgen/control.tlib
trunk/mk/msvcgen/custom.cslib
trunk/mk/msvcgen/macros.tlib
trunk/mk/msvcgen/project6.tlib
trunk/mk/msvcgen/project7.tlib
trunk/mk/msvcgen/projectx6.tlib
trunk/mk/msvcgen/projectx7.tlib
trunk/mk/msvcgen/workspace6.tlib
trunk/mk/msvcgen/workspace7.tlib
trunk/msvc/7/appiaeditor.vcproj
trunk/msvc/7/grpall_iaeditor.vcproj
trunk/msvc/7/grpapps_iaeditor.vcproj
trunk/msvc/7/grpiaeditorall_iaeditor.vcproj
trunk/msvc/7/grplibs_iaeditor.vcproj
trunk/msvc/7/grpplugins_iaeditor.vcproj
trunk/msvc/7/libpropgrid.vcproj
trunk/msvc/7/plgbehaviourlayer.vcproj
trunk/msvc/7/plgcsobjects.vcproj
trunk/msvc/7/plgforce_script.vcproj
trunk/msvc/7/plgpfcharacter.vcproj
trunk/msvc/7/plgpfguiactor.vcproj
trunk/msvc/7/plgpfobj_properties.vcproj
trunk/msvc/7/plgpfodedynamics.vcproj
trunk/msvc/7/wksiaeditor.sln
trunk/msvc/71/appiaeditor.vcproj
trunk/msvc/71/grpall_iaeditor.vcproj
trunk/msvc/71/grpapps_iaeditor.vcproj
trunk/msvc/71/grpiaeditorall_iaeditor.vcproj
trunk/msvc/71/grplibs_iaeditor.vcproj
trunk/msvc/71/grpplugins_iaeditor.vcproj
trunk/msvc/71/libpropgrid.vcproj
trunk/msvc/71/plgbehaviourlayer.vcproj
trunk/msvc/71/plgcsobjects.vcproj
trunk/msvc/71/plgforce_script.vcproj
trunk/msvc/71/plgpfcharacter.vcproj
trunk/msvc/71/plgpfguiactor.vcproj
trunk/msvc/71/plgpfobj_properties.vcproj
trunk/msvc/71/plgpfodedynamics.vcproj
trunk/msvc/71/wksiaeditor.sln
trunk/msvc/8/appiaeditor.vcproj
trunk/msvc/8/grpall_iaeditor.vcproj
trunk/msvc/8/grpapps_iaeditor.vcproj
trunk/msvc/8/grpiaeditorall_iaeditor.vcproj
trunk/msvc/8/grplibs_iaeditor.vcproj
trunk/msvc/8/grpplugins_iaeditor.vcproj
trunk/msvc/8/libpropgrid.vcproj
trunk/msvc/8/plgbehaviourlayer.vcproj
trunk/msvc/8/plgcsobjects.vcproj
trunk/msvc/8/plgforce_script.vcproj
trunk/msvc/8/plgpfcharacter.vcproj
trunk/msvc/8/plgpfguiactor.vcproj
trunk/msvc/8/plgpfobj_properties.vcproj
trunk/msvc/8/plgpfodedynamics.vcproj
trunk/msvc/8/wksiaeditor.sln
trunk/msvc/appiaeditor.manifest
trunk/msvc/appiaeditor.rc
trunk/msvc/libbehaviourlayer_staticreg.cpp
trunk/msvc/libcsobjects_staticreg.cpp
trunk/msvc/libforce_script_staticreg.cpp
trunk/msvc/libpfcharacter_staticreg.cpp
trunk/msvc/libpfguiactor_staticreg.cpp
trunk/msvc/libpfobj_properties_staticreg.cpp
trunk/msvc/libpfodedynamics_staticreg.cpp
trunk/msvc/plgbehaviourlayer.rc
trunk/msvc/plgcsobjects.rc
trunk/msvc/plgforce_script.rc
trunk/msvc/plgpfcharacter.rc
trunk/msvc/plgpfguiactor.rc
trunk/msvc/plgpfobj_properties.rc
trunk/msvc/plgpfodedynamics.rc
trunk/src/Jamfile
trunk/src/apps/editor/Jamfile
trunk/src/plugins/objproperties/properties.cpp
Added Paths:
-----------
trunk/mk/autoconf/checkstl.m4
trunk/mk/autoconf/visibility.m4
trunk/mk/jam/debuginfo.jam
trunk/mk/jam/pymarshall.jam
trunk/mk/jam/upload.jam
trunk/mk/msvcgen/custom.cellib
trunk/msvc/7/libdynbullet.vcproj
trunk/msvc/71/libdynbullet.vcproj
trunk/msvc/8/libdynbullet.vcproj
trunk/msvc/9/
trunk/msvc/9/appiaeditor.vcproj
trunk/msvc/9/grpall_iaeditor.vcproj
trunk/msvc/9/grpapps_iaeditor.vcproj
trunk/msvc/9/grpiaeditorall_iaeditor.vcproj
trunk/msvc/9/grplibs_iaeditor.vcproj
trunk/msvc/9/grpplugins_iaeditor.vcproj
trunk/msvc/9/libdynbullet.vcproj
trunk/msvc/9/libpropgrid.vcproj
trunk/msvc/9/plgbehaviourlayer.vcproj
trunk/msvc/9/plgcsobjects.vcproj
trunk/msvc/9/plgforce_script.vcproj
trunk/msvc/9/plgpfcharacter.vcproj
trunk/msvc/9/plgpfguiactor.vcproj
trunk/msvc/9/plgpfobj_properties.vcproj
trunk/msvc/9/plgpfodedynamics.vcproj
trunk/msvc/9/wksiaeditor.sln
trunk/src/libs/
trunk/src/libs/Jamfile
trunk/src/libs/dynamics/
trunk/src/libs/dynamics/Jamfile
trunk/src/libs/dynamics/bullet/
trunk/src/libs/dynamics/bullet/Jamfile
trunk/src/libs/dynamics/bullet/dynbullet.cpp
trunk/src/libs/dynamics/bullet/dynbullet.h
Modified: trunk/Jamfile.in
===================================================================
--- trunk/Jamfile.in 2008-03-04 13:52:37 UTC (rev 352)
+++ trunk/Jamfile.in 2008-03-25 18:51:36 UTC (rev 353)
@@ -1,122 +1,129 @@
-TOP ?= "@top_srcdir@" ;
-BUILDTOP ?= "@top_builddir@" ;
-
-SubDir TOP ;
-
-IncludeDir ;
-IncludeDir src ;
-IncludeDir src include ;
-IncludeDir $(BUILDTOP) : : literal transient ;
-
-CleanDir clean :
- out ;
-Clean distclean :
- aclocal.m4
- config.h
- config.h.in~
- config.log
- config.status
- config.status.lineno
- config.cache
- configure.lineno
- Jamconfig
- Jamfile ;
-CleanDir distclean :
- autom4te.cache ;
-Depends distclean : clean ;
-
-Clean maintainerclean :
- config.h.in
- configure ;
-Depends maintainerclean : distclean ;
-
-Help distclean : "Remove built targets and configuration" ;
-Help maintainerclean :
- "Remove built targets, configuration, and generated files." ;
-
-# Set up subdirectories into which the different generated project for
-# different go.
-MsvcGenSubDir TOP msvc : common ;
-MsvcGenSubDir TOP msvc 7 : 7 ;
-MsvcGenSubDir TOP msvc 71 : 71 ;
-MsvcGenSubDir TOP msvc 8 : 8 ;
-MsvcGenTemplateDir TOP mk msvcgen ;
-
-# Customize the build configurations to contain some defines required by
-# CrystalSpace. NOTE: The file with the customization options is assumed
-# to reside in mk/msvcgen/.
-MsvcGenVariable customize : custom.cslib ;
-
-# Set up the workspace we want msvcgen to synthesize.
-MsvcGenWorkspace iaeditor ;
-
-local hash = "\$" ;
-MsvcGenConfig CRYSTAL.AVAILABLE : yes ;
-MsvcGenConfig CRYSTAL.DEFINES ;
-MsvcGenConfig CRYSTAL.CFLAGS ;
-MsvcGenConfig CRYSTAL.LFLAGS ;
-MsvcGenConfig CRYSTAL.LIBS : "libcrystalspace.lib" ;
-MsvcGenConfig CRYSTAL.LIBS.DEBUG : "libcrystalspace_d.lib" ;
-MsvcGenConfig CRYSTAL.INCDIRS :
- [ ConcatDirs .. .. .. CS include ]
- [ ConcatDirs .. .. .. CS include csutil win32 ]
- [ ConcatDirs "$(hash)(CRYSTAL)" include ]
- [ ConcatDirs "$(hash)(CRYSTAL)" include csutil win32 ] ;
-MsvcGenConfig CRYSTAL.LIBDIRS :
- [ ConcatDirs .. .. .. CS out release$(MSVC_VERSION) libs ]
- [ ConcatDirs .. .. .. CS libs csutil win32 libs ]
- [ ConcatDirs "$(hash)(CRYSTAL)" out release$(MSVC_VERSION) libs ]
- [ ConcatDirs "$(hash)(CRYSTAL)" libs csutil win32 libs ] ;
-MsvcGenConfig CRYSTAL.LIBDIRS.DEBUG :
- [ ConcatDirs .. .. .. CS out debug$(MSVC_VERSION) libs ]
- [ ConcatDirs .. .. .. CS libs csutil win32 libs ]
- [ ConcatDirs "$(hash)(CRYSTAL)" out debug$(MSVC_VERSION) libs ]
- [ ConcatDirs "$(hash)(CRYSTAL)" libs csutil win32 libs ] ;
-
-
-if $(CEL.DESIRED) = yes
-{
- MsvcGenConfig CEL.AVAILABLE : yes ;
- MsvcGenConfig CEL.DEFINES : USE_CEL ;
- MsvcGenConfig CEL.CFLAGS ;
- MsvcGenConfig CEL.LFLAGS ;
- MsvcGenConfig CEL.LIBS : "libceltool.lib" ;
- MsvcGenConfig CEL.LIBS.DEBUG : "libceltool_d.lib" ;
- MsvcGenConfig CEL.INCDIRS :
- [ ConcatDirs .. .. .. cel include ]
- [ ConcatDirs "$(hash)(CEL)" include ]
- [ ConcatDirs "$(hash)(CEL)" include cel ] ;
- MsvcGenConfig CEL.LIBDIRS :
- [ ConcatDirs .. .. .. cel out release libs ]
- [ ConcatDirs "$(hash)(CEL)" out release libs ]
- [ ConcatDirs "$(hash)(CEL)" libs ] ;
- MsvcGenConfig CEL.LIBDIRS.DEBUG :
- [ ConcatDirs .. .. .. cel out debug libs ]
- [ ConcatDirs "$(hash)(CEL)" out debug libs ]
- [ ConcatDirs "$(hash)(CEL)" libs ] ;
-}
-
-MsvcGenConfig WX.AVAILABLE : yes ;
-MsvcGenConfig WX.DEFINES : "wxUSE_GUI=1 WXUSINGDLL=1" ;
-MsvcGenConfig WX.LIBS : "wxbase28.lib wxmsw28_core.lib wxmsw28_gl.lib opengl32.lib wxmsw28_aui.lib" ;
-MsvcGenConfig WX.DEFINES.DEBUG : "wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;" ;
-MsvcGenConfig WX.CFLAGS : "" ;
-MsvcGenConfig WX.LFLAGS : "" ;
-MsvcGenConfig WX.LIBS.DEBUG : "wxbase28d.lib wxmsw28d_core.lib wxmsw28d_gl.lib opengl32.lib wxmsw28d_aui.lib" ;
-
-# Set project-specific compiler and linker options for msvcgen.
-#MsvcDefine MY_DEFINE : "my value" ;
-#MsvcDefine MY_RELEASE_DEFINE : "my release value" : release ;
-#MsvcDefine MY_DEBUG_DEFINE : "my debug value" : debug ;
-#MsvcCFlags : "/I \"my\\inc\\path\"" : release ;
-#MsvcCFlags : "/I \"my\\debuginc\\path\"" : debug ;
-#MsvcLFlags : "/libpath:\"my\\lib\\path\"" : release ;
-#MsvcLFlags : "/libpath:\"my\\debuglib\\path\"" : debug ;
-#MsvcGenConfig SUPERCOOL.AVAILABLE : yes ;
-#MsvcGenConfig SUPERCOOL.LIBS : supercool.lib ;
-#MsvcGenConfig SUPERCOOL.LIBS.DEBUG : supercooldebug.lib ;
-
-Description iaeditorall : "IAEditor and related plugins" ;
-RegisterCompileGroups iaeditorall ;
-
-SubInclude TOP src ;
+TOP ?= "@top_srcdir@" ;
+BUILDTOP ?= "@top_builddir@" ;
+
+SubDir TOP ;
+
+IncludeDir ;
+IncludeDir src ;
+IncludeDir src include ;
+IncludeDir $(BUILDTOP) : : literal transient ;
+
+CleanDir clean :
+ out ;
+Clean distclean :
+ aclocal.m4
+ config.h
+ config.h.in~
+ config.log
+ config.status
+ config.status.lineno
+ config.cache
+ configure.lineno
+ Jamconfig
+ Jamfile ;
+CleanDir distclean :
+ autom4te.cache ;
+Depends distclean : clean ;
+
+Clean maintainerclean :
+ config.h.in
+ configure ;
+Depends maintainerclean : distclean ;
+
+Help distclean : "Remove built targets and configuration" ;
+Help maintainerclean :
+ "Remove built targets, configuration, and generated files." ;
+
+# Set up subdirectories into which the different generated project for
+# different go.
+MsvcGenSubDir TOP msvc : common ;
+MsvcGenSubDir TOP msvc 7 : 7 ;
+MsvcGenSubDir TOP msvc 71 : 71 ;
+MsvcGenSubDir TOP msvc 8 : 8 ;
+MsvcGenSubDir TOP msvc 9 : 9 ;
+MsvcGenTemplateDir TOP mk msvcgen ;
+
+# Customize the build configurations to contain some defines required by
+# CrystalSpace. NOTE: The file with the customization options is assumed
+# to reside in mk/msvcgen/.
+MsvcGenVariable customize : custom.cslib ;
+
+# Set up the workspace we want msvcgen to synthesize.
+MsvcGenWorkspace iaeditor ;
+
+local hash = "\$" ;
+MsvcGenConfig CRYSTAL.AVAILABLE : yes ;
+MsvcGenConfig CRYSTAL.DEFINES ;
+MsvcGenConfig CRYSTAL.CFLAGS ;
+MsvcGenConfig CRYSTAL.LFLAGS ;
+MsvcGenConfig CRYSTAL.LIBS : "libcrystalspace.lib" ;
+MsvcGenConfig CRYSTAL.LIBS.DEBUG : "libcrystalspace_d.lib" ;
+MsvcGenConfig CRYSTAL.INCDIRS :
+ [ ConcatDirs .. .. .. CS include ]
+ [ ConcatDirs .. .. .. CS include csutil win32 ]
+ [ ConcatDirs "$(hash)(CRYSTAL)" include ]
+ [ ConcatDirs "$(hash)(CRYSTAL)" include csutil win32 ] ;
+MsvcGenConfig CRYSTAL.LIBDIRS :
+ [ ConcatDirs .. .. .. CS out release$(MSVC_VERSION) libs ]
+ [ ConcatDirs .. .. .. CS libs csutil win32 libs ]
+ [ ConcatDirs "$(hash)(CRYSTAL)" out release$(MSVC_VERSION) libs ]
+ [ ConcatDirs "$(hash)(CRYSTAL)" libs csutil win32 libs ] ;
+MsvcGenConfig CRYSTAL.LIBDIRS.DEBUG :
+ [ ConcatDirs .. .. .. CS out debug$(MSVC_VERSION) libs ]
+ [ ConcatDirs .. .. .. CS libs csutil win32 libs ]
+ [ ConcatDirs "$(hash)(CRYSTAL)" out debug$(MSVC_VERSION) libs ]
+ [ ConcatDirs "$(hash)(CRYSTAL)" libs csutil win32 libs ] ;
+
+
+if $(CEL.DESIRED) = yes
+{
+ MsvcGenConfig CEL.AVAILABLE : yes ;
+ MsvcGenConfig CEL.DEFINES : USE_CEL ;
+ MsvcGenConfig CEL.CFLAGS ;
+ MsvcGenConfig CEL.LFLAGS ;
+ MsvcGenConfig CEL.LIBS : "libceltool.lib" ;
+ MsvcGenConfig CEL.LIBS.DEBUG : "libceltool_d.lib" ;
+ MsvcGenConfig CEL.INCDIRS :
+ [ ConcatDirs .. .. .. cel include ]
+ [ ConcatDirs "$(hash)(CEL)" include ]
+ [ ConcatDirs "$(hash)(CEL)" include cel ] ;
+ MsvcGenConfig CEL.LIBDIRS :
+ [ ConcatDirs .. .. .. cel out release libs ]
+ [ ConcatDirs "$(hash)(CEL)" out release libs ]
+ [ ConcatDirs "$(hash)(CEL)" libs ] ;
+ MsvcGenConfig CEL.LIBDIRS.DEBUG :
+ [ ConcatDirs .. .. .. cel out debug libs ]
+ [ ConcatDirs "$(hash)(CEL)" out debug libs ]
+ [ ConcatDirs "$(hash)(CEL)" libs ] ;
+}
+
+MsvcGenConfig WX.AVAILABLE : yes ;
+MsvcGenConfig WX.DEFINES : "wxUSE_GUI=1 WXUSINGDLL=1" ;
+MsvcGenConfig WX.LIBS : "wxbase28.lib wxmsw28_core.lib wxmsw28_gl.lib opengl32.lib wxmsw28_aui.lib" ;
+MsvcGenConfig WX.DEFINES.DEBUG : "wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;" ;
+MsvcGenConfig WX.CFLAGS : "" ;
+MsvcGenConfig WX.LFLAGS : "" ;
+MsvcGenConfig WX.LIBS.DEBUG : "wxbase28d.lib wxmsw28d_core.lib wxmsw28d_gl.lib opengl32.lib wxmsw28d_aui.lib" ;
+
+MsvcGenConfig BULLET.AVAILABLE : yes ;
+MsvcGenConfig BULLET.LIBS : "bulletcollision-vc8.lib" ;
+MsvcGenConfig BULLET.CFLAGS : "" ;
+MsvcGenConfig BULLET.LFLAGS : "" ;
+MsvcGenConfig WX.LIBS.DEBUG : "bulletcollision-vc8_d.lib" ;
+
+# Set project-specific compiler and linker options for msvcgen.
+#MsvcDefine MY_DEFINE : "my value" ;
+#MsvcDefine MY_RELEASE_DEFINE : "my release value" : release ;
+#MsvcDefine MY_DEBUG_DEFINE : "my debug value" : debug ;
+#MsvcCFlags : "/I \"my\\inc\\path\"" : release ;
+#MsvcCFlags : "/I \"my\\debuginc\\path\"" : debug ;
+#MsvcLFlags : "/libpath:\"my\\lib\\path\"" : release ;
+#MsvcLFlags : "/libpath:\"my\\debuglib\\path\"" : debug ;
+#MsvcGenConfig SUPERCOOL.AVAILABLE : yes ;
+#MsvcGenConfig SUPERCOOL.LIBS : supercool.lib ;
+#MsvcGenConfig SUPERCOOL.LIBS.DEBUG : supercooldebug.lib ;
+
+Description iaeditorall : "IAEditor and related plugins" ;
+RegisterCompileGroups iaeditorall ;
+
+SubInclude TOP src ;
Modified: trunk/configure
===================================================================
--- trunk/configure 2008-03-04 13:52:37 UTC (rev 352)
+++ trunk/configure 2008-03-25 18:51:36 UTC (rev 353)
@@ -705,6 +705,10 @@
CPP
GREP
EGREP
+CONFIG_BULLET
+ac_ct_CONFIG_BULLET
+CONFIG_BULLETDYNAMICS
+ac_ct_CONFIG_BULLETDYNAMICS
CONFIG_WX
ac_ct_CONFIG_WX
CRYSTAL
@@ -1309,6 +1313,8 @@
--enable-as-needed Utilize --as-needed linker flag, if supported by
linker and if the used binutils version is recent
enough to support it properly (default YES)
+ --enable-gc-sections Utilize --gc-sections linker flag for some targets
+ (default YES)
--enable-cstest verify that the Crystal Space SDK is actually usable
(default YES)
--enable-celtest verify that the CEL SDK is actually usable (default
@@ -1336,12 +1342,15 @@
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-cppunit=dir specify location of libcppunit if not detected
- automatically; searches dir/include, dir/lib, and
- dir
- --with-wx=dir specify location of libwx if not detected
- automatically; searches dir/include, dir/lib, and
- dir
+ --with-cppunit=dir specify additional location to search libcppunit if
+ not detected automatically; directories searched
+ include dir/include, dir/lib, and dir
+ --with-bullet=dir specify additional location to search libbullet if
+ not detected automatically; directories searched
+ include dir/include, dir/lib, and dir
+ --with-wx=dir specify additional location to search libwx if not
+ detected automatically; directories searched include
+ dir/include, dir/lib, and dir
--without-cs do not look for an installed Crystal Space SDK; this
option is useful only if you need to perform routine
maintenance tasks, such as generating project files
@@ -1358,9 +1367,9 @@
--with-cel-prefix=CEL_PREFIX
specify location of CEL installation; this is the
\$prefix value used when installing the SDK
- --with-bfd=dir specify location of libbfd if not detected
- automatically; searches dir/include, dir/lib, and
- dir
+ --with-bfd=dir specify additional location to search libbfd if not
+ detected automatically; directories searched include
+ dir/include, dir/lib, and dir
Some influential environment variables:
CC C compiler command
@@ -2874,7 +2883,27 @@
"
fi
+ if test "$ac_compiler_gnu" = yes; then
+ cs_compiler_name_c=GCC
+else
+ cs_compiler_name_c=`echo "$CC" | $as_tr_cpp`
+fi
+ cs_build_prop_val="$cs_compiler_name_c"
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}COMPILER.C.TYPE ?= \"$cs_build_prop_val\" ;
+"
+fi
+
+ cs_build_prop_val="$cs_compiler_name_c"
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}COMPILER.TYPE = \"$cs_build_prop_val\" ;
+"
+fi
+
+
# Check if compiler recognizes -pipe directive.
{ echo "$as_me:$LINENO: checking if $CC accepts -pipe" >&5
echo $ECHO_N "checking if $CC accepts -pipe... $ECHO_C" >&6; }
@@ -3423,7 +3452,6 @@
"
fi
-
cs_build_prop_val="$CPPFLAGS $CXXFLAGS"
cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
if test -n "$cs_build_prop_val"; then
@@ -3431,7 +3459,27 @@
"
fi
+ if test "$ac_compiler_gnu" = yes; then
+ cs_compiler_name_cxx=GCC
+else
+ cs_compiler_name_cxx=`echo "$CXX" | $as_tr_cpp`
+fi
+ cs_build_prop_val="$cs_compiler_name_cxx"
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}COMPILER.C++.TYPE ?= \"$cs_build_prop_val\" ;
+"
+fi
+
+ cs_build_prop_val="$cs_compiler_name_cxx"
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}COMPILER.TYPE = \"$cs_build_prop_val\" ;
+"
+fi
+
+
# Check if compiler can be instructed to produce position-independent-code
# (PIC). This feature is required by some platforms when building plugin
# modules and shared libraries.
@@ -3769,7 +3817,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -4145,6 +4193,125 @@
fi
+
+ if test "$cs_prog_path_prepared" != yes; then
+ cs_prog_path_prepared=yes
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
+ export PATH
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in ld
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_LD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$LD"; then
+ ac_cv_prog_LD="$LD" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_LD="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+LD=$ac_cv_prog_LD
+if test -n "$LD"; then
+ { echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$LD" && break
+ done
+fi
+if test -z "$LD"; then
+ ac_ct_LD=$LD
+ for ac_prog in ld
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_LD"; then
+ ac_cv_prog_ac_ct_LD="$ac_ct_LD" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_LD="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_LD=$ac_cv_prog_ac_ct_LD
+if test -n "$ac_ct_LD"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_LD" >&5
+echo "${ECHO_T}$ac_ct_LD" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$ac_ct_LD" && break
+done
+
+ if test "x$ac_ct_LD" = x; then
+ LD=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&2;}
+ac_tool_warned=yes ;;
+esac
+ LD=$ac_ct_LD
+ fi
+fi
+
+ cs_build_prop_val="$LD"
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}CMD.LD ?= \"$cs_build_prop_val\" ;
+"
+fi
+
+
cs_build_prop_val="$LDFLAGS"
cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
if test -n "$cs_build_prop_val"; then
@@ -5062,7 +5229,181 @@
fi
+ # Check if linker supports --gc-sections.
+ # Check whether --enable-gc-sections was given.
+if test "${enable_gc_sections+set}" = set; then
+ enableval=$enable_gc_sections;
+fi
+ if test -z "$enable_gc_sections"; then
+ enable_gc_sections=yes
+fi
+
+ if test "$enable_gc_sections" != "no"; then
+ { echo "$as_me:$LINENO: checking if --gc-sections is supported" >&5
+echo $ECHO_N "checking if --gc-sections is supported... $ECHO_C" >&6; }
+if test "${cs_cv_prog_link_gc_sections_ok+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ cs_cflags_save="$CXXFLAGS"
+ cs_lflags_save="$LDFLAGS"
+ cs_libs_save="$LIBS"
+ cs_build_ok=no
+
+
+ for cs_build_item in `echo @-Wl,--gc-sections@@ | sed 'y% %#%'`
+ do
+
+ set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
+ { for (i=1; i <= NF; ++i)
+ { if ($i == "") print "filler"; else print $i } }'`
+ shift
+ if test $# -eq 0; then
+ cs_dummy=''
+else
+ if test "$1" = filler; then
+ cs_dummy=''
+else
+ cs_dummy=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_cflags_test=''
+else
+ if test "$1" = filler; then
+ cs_cflags_test=''
+else
+ cs_cflags_test=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_lflags_test=''
+else
+ if test "$1" = filler; then
+ cs_lflags_test=''
+else
+ cs_lflags_test=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_libs_test=''
+else
+ if test "$1" = filler; then
+ cs_libs_test=''
+else
+ cs_libs_test=$1
+fi
+
+ shift
+fi
+
+ cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
+ cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
+ cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
+
+ CXXFLAGS="$cs_cflags_test $cs_cflags_save"
+ LDFLAGS="$cs_lflags_test $cs_lflags_save"
+ LIBS="$cs_libs_test $cs_libs_save"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ cs_build_ok=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ if test $cs_build_ok = yes; then
+ break
+fi
+
+ done
+
+
+ CXXFLAGS=$cs_cflags_save
+ LDFLAGS=$cs_lflags_save
+ LIBS=$cs_libs_save
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ if test $cs_build_ok = yes; then
+ cs_build_cflags=`echo x$cs_cflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_build_lflags=`echo x$cs_lflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_build_libs=`echo x$cs_libs_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_cv_prog_link_gc_sections=`echo x$cs_build_cflags $cs_build_lflags $cs_build_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_cv_prog_link_gc_sections_ok="$cs_cv_prog_link_gc_sections"
+else
+ cs_cv_prog_link_gc_sections=''
+ cs_cv_prog_link_gc_sections_ok=no
+fi
+
+fi
+{ echo "$as_me:$LINENO: result: $cs_cv_prog_link_gc_sections_ok" >&5
+echo "${ECHO_T}$cs_cv_prog_link_gc_sections_ok" >&6; }
+ if test "$cs_cv_prog_link_gc_sections_ok" != no; then
+ cs_build_prop_val="$cs_cv_prog_link_gc_sections"
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}LINK.GC_SECTIONS ?= \"$cs_build_prop_val\" ;
+"
+fi
+
+fi
+
+fi
+
+
+
# The default RANLIB in Jambase is wrong on some platforms, and is also
# unsuitable during cross-compilation, so we set the value unconditionally
# (sixth argument of CS_EMIT_BUILD_PROPERTY).
@@ -5173,7 +5514,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -5292,7 +5633,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -5349,7 +5690,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -5468,7 +5809,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -5525,7 +5866,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -5582,7 +5923,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -5639,7 +5980,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -5696,7 +6037,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -5753,7 +6094,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -5813,7 +6154,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -5831,7 +6172,7 @@
ac_cv_prog_LIBTOOL_TEST="$LIBTOOL_TEST" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /sw/bin$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin
+for as_dir in /sw/bin$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5875,7 +6216,7 @@
ac_cv_prog_ac_ct_LIBTOOL_TEST="$ac_ct_LIBTOOL_TEST" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /sw/bin$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin
+for as_dir in /sw/bin$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5925,7 +6266,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -5942,7 +6283,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /sw/bin$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin
+for as_dir in /sw/bin$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5990,7 +6331,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -6114,7 +6455,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -6131,7 +6472,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6321,7 +6662,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -6378,7 +6719,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -6446,7 +6787,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -6511,7 +6852,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -6876,7 +7217,8 @@
fi
if test "$with_cppunit" != no; then
- # If --with-cppunit value is same as cached value, then assume other
+
+ # If --with-cppunit value is same as cached value, then assume other
# cached values are also valid; otherwise, ignore all cached values.
if test "$with_cppunit" != "$cs_cv_with_cppunit"; then
cs_ignore_cache=yes
@@ -6885,13 +7227,23 @@
fi
+ # Put relevant subdirs of the library directory into PATH and PKGCONFIG
+ PATH_SAVE="$PATH"
+ if test $with_cppunit != yes; then
+ PATH="$with_cppunit/bin$PATH_SEPARATOR$PATH"
+ PKG_CONFIG_PATH_SAVE_1="$PKG_CONFIG_PATH"
+ PKG_CONFIG_PATH="/usr/local/lib/pkgconfig$PATH_SEPARATOR/sw/lib/pkgconfig$PATH_SEPARATOR/opt/local/lib/pkgconfig$PATH_SEPARATOR/opt/lib/pkgconfig$PATH_SEPARATOR$PKG_CONFIG_PATH"
+ PKG_CONFIG_PATH="$with_cppunit$PATH_SEPARATOR$with_cppunit/lib/pkgconfig$PATH_SEPARATOR$PKG_CONFIG_PATH"
+ export PKG_CONFIG_PATH
+fi
+
+
cs_check_lib_flags=''
- if test $with_cppunit = yes; then
- if test "$cs_prog_pkg_config_checked" != yes; then
+ if test "$cs_prog_pkg_config_checked" != yes; then
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -6999,8 +7351,6 @@
fi
fi
- PKG_CONFIG_PATH="/usr/local/lib/pkgconfig$PATH_SEPARATOR/sw/lib/pkgconfig$PATH_SEPARATOR/opt/local/lib/pkgconfig$PATH_SEPARATOR/opt/lib/pkgconfig$PATH_SEPARATOR$PKG_CONFIG_PATH"
- export PKG_CONFIG_PATH
cs_prog_pkg_config_checked=yes
fi
@@ -7057,7 +7407,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -7197,9 +7547,7 @@
fi
-fi
-
if test $with_cppunit != yes; then
cs_check_lib_paths=$with_cppunit
else
@@ -7626,6 +7974,14 @@
fi
+
+ PATH="$PATH_SAVE"
+ if test $with_cppunit != yes; then
+ PKG_CONFIG_PATH="$PKG_CONFIG_PATH_SAVE_1"
+ export PKG_CONFIG_PATH
+fi
+
+
else
cs_cv_libcppunit=no
fi
@@ -9293,6 +9649,1251 @@
#------------------------------------------------------------------------------
+# Check for bullet physics library.
+#------------------------------------------------------------------------------
+# Note: The pkg-config package name for Bullet 2.x is 'bullet', but the actual
+# libraries are bulletdynamics, bulletcollision and bulletmath. So note that
+# there is actually no 'bullet' library.
+
+# Check whether --with-bullet was given.
+if test "${with_bullet+set}" = set; then
+ withval=$with_bullet;
+fi
+
+
+ # Backward compatibility: Recognize --with-libbullet as alias for --with-bullet.
+ if test -n "$with_libbullet" &&
+ test -z "$with_bullet"; then
+ with_bullet="$with_libbullet"
+fi
+
+
+ if test -z "$with_bullet"; then
+ with_bullet=yes
+fi
+
+ if test "$with_bullet" != no; then
+
+ # If --with-bullet value is same as cached value, then assume other
+ # cached values are also valid; otherwise, ignore all cached values.
+ if test "$with_bullet" != "$cs_cv_with_bullet"; then
+ cs_ignore_cache=yes
+else
+ cs_ignore_cache=no
+fi
+
+
+ # Put relevant subdirs of the library directory into PATH and PKGCONFIG
+ PATH_SAVE="$PATH"
+ if test $with_bullet != yes; then
+ PATH="$with_bullet/bin$PATH_SEPARATOR$PATH"
+ PKG_CONFIG_PATH_SAVE_1="$PKG_CONFIG_PATH"
+ PKG_CONFIG_PATH="/usr/local/lib/pkgconfig$PATH_SEPARATOR/sw/lib/pkgconfig$PATH_SEPARATOR/opt/local/lib/pkgconfig$PATH_SEPARATOR/opt/lib/pkgconfig$PATH_SEPARATOR$PKG_CONFIG_PATH"
+ PKG_CONFIG_PATH="$with_bullet$PATH_SEPARATOR$with_bullet/lib/pkgconfig$PATH_SEPARATOR$PKG_CONFIG_PATH"
+ export PKG_CONFIG_PATH
+fi
+
+
+ cs_check_lib_flags=''
+ if test "$cs_prog_pkg_config_checked" != yes; then
+
+ if test "$cs_prog_path_prepared" != yes; then
+ cs_prog_path_prepared=yes
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
+ export PATH
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in pkg-config
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$PKG_CONFIG"; then
+ ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_PKG_CONFIG="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$PKG_CONFIG" && break
+ done
+fi
+if test -z "$PKG_CONFIG"; then
+ ac_ct_PKG_CONFIG=$PKG_CONFIG
+ for ac_prog in pkg-config
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_PKG_CONFIG"; then
+ ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_PKG_CONFIG="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
+if test -n "$ac_ct_PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_ct_PKG_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$ac_ct_PKG_CONFIG" && break
+done
+
+ if test "x$ac_ct_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_ct_PKG_CONFIG
+ fi
+fi
+
+ cs_prog_pkg_config_checked=yes
+fi
+
+ if test -z "$cs_cv_prog_pkg_config_ok"; then
+ if test -n "$PKG_CONFIG"; then
+ if $PKG_CONFIG --atleast-pkgconfig-version=0.9.0; then
+ cs_cv_prog_pkg_config_ok=yes
+else
+ cs_cv_prog_pkg_config_ok=no
+fi
+
+else
+ cs_cv_prog_pkg_config_ok=no
+fi
+
+fi
+
+ if test $cs_cv_prog_pkg_config_ok = yes; then
+ { echo "$as_me:$LINENO: checking if $PKG_CONFIG recognizes bullet" >&5
+echo $ECHO_N "checking if $PKG_CONFIG recognizes bullet... $ECHO_C" >&6; }
+if test "${cs_cv_prog_pkg_config_bullet+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if $PKG_CONFIG --exists bullet; then
+ cs_cv_prog_pkg_config_bullet=yes
+else
+ cs_cv_prog_pkg_config_bullet=no
+fi
+
+fi
+{ echo "$as_me:$LINENO: result: $cs_cv_prog_pkg_config_bullet" >&5
+echo "${ECHO_T}$cs_cv_prog_pkg_config_bullet" >&6; }
+ if test $cs_cv_prog_pkg_config_bullet = yes; then
+ if test -z "$cs_cv_prog_pkg_config_bullet_flags"; then
+ cs_check_lib_cflag=`{ (echo "$as_me:$LINENO: \$PKG_CONFIG --cflags bullet") >&5
+ ($PKG_CONFIG --cflags bullet) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_check_lib_lflag=''
+ cs_check_lib_libs=`{ (echo "$as_me:$LINENO: \$PKG_CONFIG --libs bullet") >&5
+ ($PKG_CONFIG --libs bullet) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_cv_prog_pkg_config_bullet_flags=`echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_libs | sed 'y% %#%'`
+fi
+
+ cs_check_lib_flags="$cs_check_lib_flags $cs_cv_prog_pkg_config_bullet_flags"
+fi
+
+fi
+
+
+ if test "$cs_prog_path_prepared" != yes; then
+ cs_prog_path_prepared=yes
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
+ export PATH
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in bullet-config
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CONFIG_BULLET+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$CONFIG_BULLET"; then
+ ac_cv_prog_CONFIG_BULLET="$CONFIG_BULLET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CONFIG_BULLET="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CONFIG_BULLET=$ac_cv_prog_CONFIG_BULLET
+if test -n "$CONFIG_BULLET"; then
+ { echo "$as_me:$LINENO: result: $CONFIG_BULLET" >&5
+echo "${ECHO_T}$CONFIG_BULLET" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$CONFIG_BULLET" && break
+ done
+fi
+if test -z "$CONFIG_BULLET"; then
+ ac_ct_CONFIG_BULLET=$CONFIG_BULLET
+ for ac_prog in bullet-config
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_CONFIG_BULLET+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_CONFIG_BULLET"; then
+ ac_cv_prog_ac_ct_CONFIG_BULLET="$ac_ct_CONFIG_BULLET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CONFIG_BULLET="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CONFIG_BULLET=$ac_cv_prog_ac_ct_CONFIG_BULLET
+if test -n "$ac_ct_CONFIG_BULLET"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_CONFIG_BULLET" >&5
+echo "${ECHO_T}$ac_ct_CONFIG_BULLET" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$ac_ct_CONFIG_BULLET" && break
+done
+
+ if test "x$ac_ct_CONFIG_BULLET" = x; then
+ CONFIG_BULLET=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&2;}
+ac_tool_warned=yes ;;
+esac
+ CONFIG_BULLET=$ac_ct_CONFIG_BULLET
+ fi
+fi
+
+ if test -n "$CONFIG_BULLET"; then
+ if test -z "$cs_cv_prog_config_bullet_ok"; then
+ if $CONFIG_BULLET --cflags --libs >/dev/null 2>&1; then
+ cs_cv_prog_config_bullet_ok=yes
+else
+ cs_cv_prog_config_bullet_ok=no
+fi
+
+fi
+
+ if test $cs_cv_prog_config_bullet_ok = yes; then
+ if test -z "$cs_cv_prog_config_bullet_flags"; then
+ cs_check_lib_cflag=`{ (echo "$as_me:$LINENO: \$CONFIG_BULLET --cflags ") >&5
+ ($CONFIG_BULLET --cflags ) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_check_lib_lflag=''
+ cs_check_lib_libs=`{ (echo "$as_me:$LINENO: \$CONFIG_BULLET --libs ") >&5
+ ($CONFIG_BULLET --libs ) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_cv_prog_config_bullet_flags=`echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_libs | sed 'y% %#%'`
+fi
+
+ cs_check_lib_flags="$cs_check_lib_flags $cs_cv_prog_config_bullet_flags"
+fi
+
+fi
+
+ if test "$cs_prog_pkg_config_checked" != yes; then
+
+ if test "$cs_prog_path_prepared" != yes; then
+ cs_prog_path_prepared=yes
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
+ export PATH
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in pkg-config
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$PKG_CONFIG"; then
+ ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_PKG_CONFIG="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$PKG_CONFIG" && break
+ done
+fi
+if test -z "$PKG_CONFIG"; then
+ ac_ct_PKG_CONFIG=$PKG_CONFIG
+ for ac_prog in pkg-config
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_PKG_CONFIG"; then
+ ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_PKG_CONFIG="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
+if test -n "$ac_ct_PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_ct_PKG_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$ac_ct_PKG_CONFIG" && break
+done
+
+ if test "x$ac_ct_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_ct_PKG_CONFIG
+ fi
+fi
+
+ cs_prog_pkg_config_checked=yes
+fi
+
+ if test -z "$cs_cv_prog_pkg_config_ok"; then
+ if test -n "$PKG_CONFIG"; then
+ if $PKG_CONFIG --atleast-pkgconfig-version=0.9.0; then
+ cs_cv_prog_pkg_config_ok=yes
+else
+ cs_cv_prog_pkg_config_ok=no
+fi
+
+else
+ cs_cv_prog_pkg_config_ok=no
+fi
+
+fi
+
+ if test $cs_cv_prog_pkg_config_ok = yes; then
+ { echo "$as_me:$LINENO: checking if $PKG_CONFIG recognizes bulletdynamics" >&5
+echo $ECHO_N "checking if $PKG_CONFIG recognizes bulletdynamics... $ECHO_C" >&6; }
+if test "${cs_cv_prog_pkg_config_bulletdynamics+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if $PKG_CONFIG --exists bulletdynamics; then
+ cs_cv_prog_pkg_config_bulletdynamics=yes
+else
+ cs_cv_prog_pkg_config_bulletdynamics=no
+fi
+
+fi
+{ echo "$as_me:$LINENO: result: $cs_cv_prog_pkg_config_bulletdynamics" >&5
+echo "${ECHO_T}$cs_cv_prog_pkg_config_bulletdynamics" >&6; }
+ if test $cs_cv_prog_pkg_config_bulletdynamics = yes; then
+ if test -z "$cs_cv_prog_pkg_config_bulletdynamics_flags"; then
+ cs_check_lib_cflag=`{ (echo "$as_me:$LINENO: \$PKG_CONFIG --cflags bulletdynamics") >&5
+ ($PKG_CONFIG --cflags bulletdynamics) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_check_lib_lflag=''
+ cs_check_lib_libs=`{ (echo "$as_me:$LINENO: \$PKG_CONFIG --libs bulletdynamics") >&5
+ ($PKG_CONFIG --libs bulletdynamics) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_cv_prog_pkg_config_bulletdynamics_flags=`echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_libs | sed 'y% %#%'`
+fi
+
+ cs_check_lib_flags="$cs_check_lib_flags $cs_cv_prog_pkg_config_bulletdynamics_flags"
+fi
+
+fi
+
+
+ if test "$cs_prog_path_prepared" != yes; then
+ cs_prog_path_prepared=yes
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
+ export PATH
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in bulletdynamics-config
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CONFIG_BULLETDYNAMICS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$CONFIG_BULLETDYNAMICS"; then
+ ac_cv_prog_CONFIG_BULLETDYNAMICS="$CONFIG_BULLETDYNAMICS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CONFIG_BULLETDYNAMICS="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CONFIG_BULLETDYNAMICS=$ac_cv_prog_CONFIG_BULLETDYNAMICS
+if test -n "$CONFIG_BULLETDYNAMICS"; then
+ { echo "$as_me:$LINENO: result: $CONFIG_BULLETDYNAMICS" >&5
+echo "${ECHO_T}$CONFIG_BULLETDYNAMICS" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$CONFIG_BULLETDYNAMICS" && break
+ done
+fi
+if test -z "$CONFIG_BULLETDYNAMICS"; then
+ ac_ct_CONFIG_BULLETDYNAMICS=$CONFIG_BULLETDYNAMICS
+ for ac_prog in bulletdynamics-config
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_CONFIG_BULLETDYNAMICS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_CONFIG_BULLETDYNAMICS"; then
+ ac_cv_prog_ac_ct_CONFIG_BULLETDYNAMICS="$ac_ct_CONFIG_BULLETDYNAMICS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CONFIG_BULLETDYNAMICS="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CONFIG_BULLETDYNAMICS=$ac_cv_prog_ac_ct_CONFIG_BULLETDYNAMICS
+if test -n "$ac_ct_CONFIG_BULLETDYNAMICS"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_CONFIG_BULLETDYNAMICS" >&5
+echo "${ECHO_T}$ac_ct_CONFIG_BULLETDYNAMICS" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$ac_ct_CONFIG_BULLETDYNAMICS" && break
+done
+
+ if test "x$ac_ct_CONFIG_BULLETDYNAMICS" = x; then
+ CONFIG_BULLETDYNAMICS=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&2;}
+ac_tool_warned=yes ;;
+esac
+ CONFIG_BULLETDYNAMICS=$ac_ct_CONFIG_BULLETDYNAMICS
+ fi
+fi
+
+ if test -n "$CONFIG_BULLETDYNAMICS"; then
+ if test -z "$cs_cv_prog_config_bulletdynamics_ok"; then
+ if $CONFIG_BULLETDYNAMICS --cflags --libs >/dev/null 2>&1; then
+ cs_cv_prog_config_bulletdynamics_ok=yes
+else
+ cs_cv_prog_config_bulletdynamics_ok=no
+fi
+
+fi
+
+ if test $cs_cv_prog_config_bulletdynamics_ok = yes; then
+ if test -z "$cs_cv_prog_config_bulletdynamics_flags"; then
+ cs_check_lib_cflag=`{ (echo "$as_me:$LINENO: \$CONFIG_BULLETDYNAMICS --cflags ") >&5
+ ($CONFIG_BULLETDYNAMICS --cflags ) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_check_lib_lflag=''
+ cs_check_lib_libs=`{ (echo "$as_me:$LINENO: \$CONFIG_BULLETDYNAMICS --libs ") >&5
+ ($CONFIG_BULLETDYNAMICS --libs ) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_cv_prog_config_bulletdynamics_flags=`echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_libs | sed 'y% %#%'`
+fi
+
+ cs_check_lib_flags="$cs_check_lib_flags $cs_cv_prog_config_bulletdynamics_flags"
+fi
+
+fi
+
+
+
+ if test $with_bullet != yes; then
+ cs_check_lib_paths=$with_bullet
+else
+ cs_check_lib_paths="| /usr/local/include|/usr/local/lib \
+ /sw/include|/sw/lib \
+ /opt/local/include|/opt/local/lib \
+ /opt/include|/opt/lib "
+fi
+
+ for cs_lib_item in $cs_check_lib_paths
+ do
+ case $cs_lib_item in
+ *\|*)
+ set filler `echo "$cs_lib_item" | awk 'BEGIN { FS="|" }
+ { for (i=1; i <= NF; ++i)
+ { if ($i == "") print "filler"; else print $i } }'`
+ shift
+ if test $# -eq 0; then
+ cs_check_incdir=''
+else
+ if test "$1" = filler; then
+ cs_check_incdir=''
+else
+ cs_check_incdir=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_check_libdir=''
+else
+ if test "$1" = filler; then
+ cs_check_libdir=''
+else
+ cs_check_libdir=$1
+fi
+
+ shift
+fi
+
+ if test -n "$cs_check_incdir"; then
+ cs_check_lib_cflag="-I$cs_check_incdir"
+else
+ cs_check_lib_cflag=''
+fi
+
+ if test -n "$cs_check_libdir"; then
+ cs_check_lib_lflag="-L$cs_check_libdir"
+else
+ cs_check_lib_lflag=''
+fi
+
+ if test -n "bullet"; then
+ cs_check_lib_libs="-lbullet"
+ cs_check_lib_framework="-framework bullet"
+else
+ cs_check_lib_libs=''
+ cs_check_lib_framework=''
+fi
+
+ cs_check_lib_flags="$cs_check_lib_flags
+ `echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_framework | sed 'y% %#%'`
+ `echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_libs | sed 'y% %#%'...
[truncated message content] |
|
From: <ob...@us...> - 2008-03-04 13:52:32
|
Revision: 352
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=352&view=rev
Author: obi666
Date: 2008-03-04 05:52:37 -0800 (Tue, 04 Mar 2008)
Log Message:
-----------
Preparation for attaching whole, predefined character to model:
- Added new simplified test level
- Added new simple test model.
Removed unused joint parameters (to follow CS changes)
Changed properties changes handling - progress of animation and simulation will be stopped with each progress change.
Modified Paths:
--------------
trunk/data/models/genskybox
trunk/src/apps/editor/iaCSApplication.cpp
trunk/src/apps/editor/iaCSApplication.h
trunk/src/include/editor.h
trunk/src/include/iPcCharacter.h
trunk/src/include/ia-tool/iaBaseObject.h
trunk/src/plugins/character/animation.h
trunk/src/plugins/character/bone.cpp
trunk/src/plugins/character/bone.h
trunk/src/plugins/character/ragdoll.cpp
trunk/src/plugins/csobjects/mesh_object.cpp
trunk/src/plugins/dynamics/ode_dynamics/body.cpp
trunk/src/plugins/dynamics/ode_dynamics/collider.cpp
trunk/src/plugins/dynamics/ode_dynamics/ode_joint.cpp
trunk/src/plugins/dynamics/ode_dynamics/ode_joint.h
trunk/src/plugins/dynamics/ode_dynamics/ode_simulation.cpp
trunk/src/plugins/objproperties/properties.cpp
trunk/src/plugins/objproperties/properties.h
trunk/vfs.cfg
Added Paths:
-----------
trunk/data/models/default/
trunk/data/models/default/defaultModel.lib
trunk/data/models/default/defaultModelSkeleton.skel
trunk/data/projects/
trunk/data/projects/simple/
trunk/data/projects/simple/objects.iaobj
trunk/data/projects/simple/world
trunk/data/projects/simple/world.iaprj
Added: trunk/data/models/default/defaultModel.lib
===================================================================
--- trunk/data/models/default/defaultModel.lib (rev 0)
+++ trunk/data/models/default/defaultModel.lib 2008-03-04 13:52:37 UTC (rev 352)
@@ -0,0 +1,19 @@
+<library>
+
+ <shaders>
+ <shader><file>/shader/character/character2.xml</file></shader>
+ <shader><file>/shader/character/character_bump2.xml</file></shader>
+ </shaders>
+
+ <meshfact name="defaultModel">
+ <plugin>crystalspace.mesh.loader.factory.genmesh</plugin>
+ <params>
+ <numvt>0</numvt>
+ <numtri>0</numtri>
+ <autonormals />
+ <animcontrol plugin="crystalspace.mesh.anim.skeleton2">
+ <skelfile>defaultModelSkeleton.skel</skelfile>
+ </animcontrol>
+ </params>
+ </meshfact>
+</library>
\ No newline at end of file
Added: trunk/data/models/default/defaultModelSkeleton.skel
===================================================================
--- trunk/data/models/default/defaultModelSkeleton.skel (rev 0)
+++ trunk/data/models/default/defaultModelSkeleton.skel 2008-03-04 13:52:37 UTC (rev 352)
@@ -0,0 +1,142 @@
+<skelfact name="defaultSkeleton">
+ <bone name="pelvis">
+ <move>
+ <v x="0.0" y="1.0" z="0.0" />
+ <matrix>
+ <rotx>0.0</rotx>
+ <roty>0.0</roty>
+ <rotz>0.0</rotz>
+ </matrix>
+ </move>
+ <bone name="spine1">
+ <move>
+ <v x="0.0" y="0.2" z="0.0" />
+ <matrix>
+ <rotx>0.0</rotx>
+ <roty>0.0</roty>
+ <rotz>0.0</rotz>
+ </matrix>
+ </move>
+ <bone name="spine2">
+ <move>
+ <v x="0.0" y="0.2" z="0.0" />
+ <matrix>
+ <rotx>0.0</rotx>
+ <roty>0.0</roty>
+ <rotz>0.0</rotz>
+ </matrix>
+ </move>
+ <bone name="RArm">
+ <move>
+ <v x="-0.3" y="0.0" z="0.0" />
+ <matrix>
+ <rotx>0.0</rotx>
+ <roty>0.0</roty>
+ <rotz>0.0</rotz>
+ </matrix>
+ </move>
+ <bone name="RForearm">
+ <move>
+ <v x="-0.2" y="0.0" z="0.0" />
+ <matrix>
+ <rotx>0.0</rotx>
+ <roty>0.0</roty>
+ <rotz>0.0</rotz>
+ </matrix>
+ </move>
+ </bone>
+ </bone>
+ <bone name="LArm">
+ <move>
+ <v x="0.3" y="0.0" z="0.0" />
+ <matrix>
+ <rotx>0.0</rotx>
+ <roty>0.0</roty>
+ <rotz>0.0</rotz>
+ </matrix>
+ </move>
+ <bone name="LForearm">
+ <move>
+ <v x="0.2" y="0.0" z="0.0" />
+ <matrix>
+ <rotx>0.0</rotx>
+ <roty>0.0</roty>
+ <rotz>0.0</rotz>
+ </matrix>
+ </move>
+ </bone>
+ </bone>
+ <bone name="neck">
+ <move>
+ <v x="0.0" y="0.1" z="0.0" />
+ <matrix>
+ <rotx>0.0</rotx>
+ <roty>0.0</roty>
+ <rotz>0.0</rotz>
+ </matrix>
+ </move>
+ </bone>
+ </bone>
+ </bone>
+ <bone name="LThigh">
+ <move>
+ <v x="0.2" y="-0.4" z="0.0" />
+ <matrix>
+ <rotx>0.0</rotx>
+ <roty>0.0</roty>
+ <rotz>0.0</rotz>
+ </matrix>
+ </move>
+ <bone name="LCalf">
+ <move>
+ <v x="0.0" y="-0.3" z="0.0" />
+ <matrix>
+ <rotx>0.0</rotx>
+ <roty>0.0</roty>
+ <rotz>0.0</rotz>
+ </matrix>
+ </move>
+ <bone name="LFeet">
+ <move>
+ <v x="0.0" y="0.0" z="0.1" />
+ <matrix>
+ <rotx>0.0</rotx>
+ <roty>0.0</roty>
+ <rotz>0.0</rotz>
+ </matrix>
+ </move>
+ </bone>
+ </bone>
+ </bone>
+ <bone name="RThigh">
+ <move>
+ <v x="-0.2" y="-0.4" z="0.0" />
+ <matrix>
+ <rotx>0.0</rotx>
+ <roty>0.0</roty>
+ <rotz>0.0</rotz>
+ </matrix>
+ </move>
+ <bone name="RCalf">
+ <move>
+ <v x="0.0" y="-0.3" z="0.0" />
+ <matrix>
+ <rotx>0.0</rotx>
+ <roty>0.0</roty>
+ <rotz>0.0</rotz>
+ </matrix>
+ </move>
+ <bone name="RFeet">
+ <move>
+ <v x="0.0" y="0.0" z="0.1" />
+ <matrix>
+ <rotx>0.0</rotx>
+ <roty>0.0</roty>
+ <rotz>0.0</rotz>
+ </matrix>
+ </move>
+ </bone>
+ </bone>
+ </bone>
+ </bone>
+</skelfact>
\ No newline at end of file
Modified: trunk/data/models/genskybox
===================================================================
--- trunk/data/models/genskybox 2007-12-17 18:17:37 UTC (rev 351)
+++ trunk/data/models/genskybox 2008-03-04 13:52:37 UTC (rev 352)
@@ -1,6 +1,6 @@
<library>
<meshfact name='genskybox'>
- <plugin>genmeshfact</plugin>
+ <plugin>genmeshFactory</plugin>
<priority>sky</priority>
<zuse/>
<params>
Added: trunk/data/projects/simple/objects.iaobj
===================================================================
--- trunk/data/projects/simple/objects.iaobj (rev 0)
+++ trunk/data/projects/simple/objects.iaobj 2008-03-04 13:52:37 UTC (rev 352)
@@ -0,0 +1,4923 @@
+<celentities>
+ <firstpass>
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ <entity />
+ </firstpass>
+ <secondpass>
+ <entity name="dynamics">
+ <pc name="pcodedynamicsystem" serial="616">
+ <string v="dynamics system" />
+ <pc locref="0" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES6dynamics system" />
+ <ulong v="4" />
+ <pc locref="1" name="pcmesh_object" />
+ <pc locref="2" name="pcia-character" />
+ <pc locref="52" name="pcmesh_object" />
+ <pc locref="53" name="pcmesh_object" />
+ </pc>
+ <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES6dynamics system" serial="1">
+ <ulong v="5" />
+ <ubyte v="10" />
+ <string v="gravity" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="gravity.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="gravity.y" />
+ <float v="-9.8" />
+ <ubyte v="1" />
+ <string v="gravity.z" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="cfm" />
+ <float v="0.01" />
+ <ubyte v="1" />
+ <string v="erp" />
+ <float v="0.9" />
+ <ubyte v="1" />
+ <string v="step size" />
+ <float v="0.01" />
+ <ubyte v="5" />
+ <string v="groups cnt" />
+ <long v="1" />
+ </pc>
+ <behaviour layer="blia" name="room" />
+ </entity>
+ <entity name="sky">
+ <pc name="pcmesh_object" serial="616">
+ <string v="sky" />
+ <pc locref="1" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES7mesh" />
+ <ulong v="0" />
+ </pc>
+ <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES7mesh" serial="1">
+ <ulong v="1" />
+ <ubyte v="7" />
+ <string v="transform" />
+ <ulong v="2" />
+ <ubyte v="8" />
+ <string v="transform.rotation" />
+ <ulong v="2" />
+ <ubyte v="10" />
+ <string v="transform.rotation.axis" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.x" />
+ <float v="1" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.z" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.angle" />
+ <float v="0" />
+ <ubyte v="10" />
+ <string v="transform.position" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.position.x" />
+ <float v="7.62939e-006" />
+ <ubyte v="1" />
+ <string v="transform.position.y" />
+ <float v="301.2" />
+ <ubyte v="1" />
+ <string v="transform.position.z" />
+ <float v="-7.62939e-006" />
+ </pc>
+ <pc name="pcmesh" serial="2">
+ <ubyte v="2" />
+ <string v="sky" />
+ <bool v="1" />
+ <string />
+ <uword v="1" />
+ <string v="room" />
+ <vector3 x="1.65845" y="0.431168" z="-0.629869" />
+ <float v="1" />
+ <float v="0" />
+ <float v="0" />
+ <float v="0" />
+ <float v="1" />
+ <float v="0" />
+ <float v="0" />
+ <float v="0" />
+ <float v="1" />
+ </pc>
+ <behaviour layer="blia" name="room" />
+ </entity>
+ <entity name="defaultModel">
+ <pc name="pcia-character" serial="616">
+ <string v="defaultModel" />
+ <pc locref="2" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES3character" />
+ <ulong v="3" />
+ <pc locref="3" name="pcbone" />
+ <pc locref="50" name="pcanimation" />
+ <pc locref="51" name="pcanimation" />
+ </pc>
+ <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES3character" serial="1">
+ <ulong v="1" />
+ <ubyte v="7" />
+ <string v="transform" />
+ <ulong v="2" />
+ <ubyte v="8" />
+ <string v="transform.rotation" />
+ <ulong v="2" />
+ <ubyte v="10" />
+ <string v="transform.rotation.axis" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.y" />
+ <float v="1" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.z" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.angle" />
+ <float v="3.14" />
+ <ubyte v="10" />
+ <string v="transform.position" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.position.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.position.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.position.z" />
+ <float v="0" />
+ </pc>
+ <pc name="pcmesh" serial="2">
+ <ubyte v="2" />
+ <string v="defaultModel" />
+ <bool v="1" />
+ <string />
+ <uword v="1" />
+ <string v="room" />
+ <vector3 x="0" y="0" z="0" />
+ <float v="-0.999999" />
+ <float v="0" />
+ <float v="0.00159255" />
+ <float v="0" />
+ <float v="1" />
+ <float v="0" />
+ <float v="-0.00159255" />
+ <float v="0" />
+ <float v="-0.999999" />
+ </pc>
+ <behaviour layer="blia" name="room" />
+ </entity>
+ <entity name="defaultModel: pelvis">
+ <pc name="pcbone" serial="1">
+ <string v="pelvis" />
+ <pc locref="3" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5pelvis" />
+ <ulong v="4" />
+ <pc locref="4" name="pcbone" />
+ <pc locref="24" name="pcbone" />
+ <pc locref="36" name="pcbone" />
+ <pc locref="48" name="pcrigidbody" />
+ </pc>
+ <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5pelvis" serial="1">
+ <ulong v="1" />
+ <ubyte v="7" />
+ <string v="transform" />
+ <ulong v="2" />
+ <ubyte v="8" />
+ <string v="transform.rotation" />
+ <ulong v="2" />
+ <ubyte v="10" />
+ <string v="transform.rotation.axis" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.x" />
+ <float v="1" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.z" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.angle" />
+ <float v="0" />
+ <ubyte v="10" />
+ <string v="transform.position" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.position.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.position.y" />
+ <float v="1" />
+ <ubyte v="1" />
+ <string v="transform.position.z" />
+ <float v="0" />
+ </pc>
+ <behaviour layer="blia" name="room" />
+ </entity>
+ <entity name="defaultModel: spine1">
+ <pc name="pcbone" serial="1">
+ <string v="spine1" />
+ <pc locref="4" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5spine1" />
+ <ulong v="2" />
+ <pc locref="5" name="pcbone" />
+ <pc locref="23" name="pcrigidbody" />
+ </pc>
+ <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5spine1" serial="1">
+ <ulong v="1" />
+ <ubyte v="7" />
+ <string v="transform" />
+ <ulong v="2" />
+ <ubyte v="8" />
+ <string v="transform.rotation" />
+ <ulong v="2" />
+ <ubyte v="10" />
+ <string v="transform.rotation.axis" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.x" />
+ <float v="1" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.z" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.angle" />
+ <float v="0" />
+ <ubyte v="10" />
+ <string v="transform.position" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.position.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.position.y" />
+ <float v="0.2" />
+ <ubyte v="1" />
+ <string v="transform.position.z" />
+ <float v="0" />
+ </pc>
+ <behaviour layer="blia" name="room" />
+ </entity>
+ <entity name="defaultModel: spine2">
+ <pc name="pcbone" serial="1">
+ <string v="spine2" />
+ <pc locref="5" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5spine2" />
+ <ulong v="5" />
+ <pc locref="6" name="pcbone" />
+ <pc locref="12" name="pcbone" />
+ <pc locref="18" name="pcbone" />
+ <pc locref="21" name="pcrigidbody" />
+ <pc locref="22" name="pcodejoint" />
+ </pc>
+ <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5spine2" serial="1">
+ <ulong v="1" />
+ <ubyte v="7" />
+ <string v="transform" />
+ <ulong v="2" />
+ <ubyte v="8" />
+ <string v="transform.rotation" />
+ <ulong v="2" />
+ <ubyte v="10" />
+ <string v="transform.rotation.axis" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.x" />
+ <float v="1" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.z" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.angle" />
+ <float v="0" />
+ <ubyte v="10" />
+ <string v="transform.position" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.position.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.position.y" />
+ <float v="0.2" />
+ <ubyte v="1" />
+ <string v="transform.position.z" />
+ <float v="0" />
+ </pc>
+ <behaviour layer="blia" name="room" />
+ </entity>
+ <entity name="defaultModel: RArm">
+ <pc name="pcbone" serial="1">
+ <string v="RArm" />
+ <pc locref="6" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5RArm" />
+ <ulong v="3" />
+ <pc locref="7" name="pcbone" />
+ <pc locref="10" name="pcrigidbody" />
+ <pc locref="11" name="pcodejoint" />
+ </pc>
+ <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5RArm" serial="1">
+ <ulong v="1" />
+ <ubyte v="7" />
+ <string v="transform" />
+ <ulong v="2" />
+ <ubyte v="8" />
+ <string v="transform.rotation" />
+ <ulong v="2" />
+ <ubyte v="10" />
+ <string v="transform.rotation.axis" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.x" />
+ <float v="1" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.z" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.angle" />
+ <float v="0" />
+ <ubyte v="10" />
+ <string v="transform.position" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.position.x" />
+ <float v="-0.3" />
+ <ubyte v="1" />
+ <string v="transform.position.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.position.z" />
+ <float v="0" />
+ </pc>
+ <behaviour layer="blia" name="room" />
+ </entity>
+ <entity name="defaultModel: RForearm">
+ <pc name="pcbone" serial="1">
+ <string v="RForearm" />
+ <pc locref="7" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5RForearm" />
+ <ulong v="2" />
+ <pc locref="8" name="pcrigidbody" />
+ <pc locref="9" name="pcodejoint" />
+ </pc>
+ <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5RForearm" serial="1">
+ <ulong v="1" />
+ <ubyte v="7" />
+ <string v="transform" />
+ <ulong v="2" />
+ <ubyte v="8" />
+ <string v="transform.rotation" />
+ <ulong v="2" />
+ <ubyte v="10" />
+ <string v="transform.rotation.axis" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.x" />
+ <float v="1" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.z" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.angle" />
+ <float v="0" />
+ <ubyte v="10" />
+ <string v="transform.position" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.position.x" />
+ <float v="-0.2" />
+ <ubyte v="1" />
+ <string v="transform.position.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.position.z" />
+ <float v="0" />
+ </pc>
+ <behaviour layer="blia" name="room" />
+ </entity>
+ <entity name="body 25">
+ <pc name="pcrigidbody" serial="1">
+ <string v="RForearm body" />
+ <pc locref="8" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES2rigid body" />
+ <ulong v="0" />
+ </pc>
+ <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES2rigid body" serial="1">
+ <ulong v="4" />
+ <ubyte v="1" />
+ <string v="mass" />
+ <float v="1" />
+ <ubyte v="7" />
+ <string v="transform" />
+ <ulong v="2" />
+ <ubyte v="8" />
+ <string v="transform.rotation" />
+ <ulong v="2" />
+ <ubyte v="10" />
+ <string v="transform.rotation.axis" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.y" />
+ <float v="1" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.z" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.angle" />
+ <float v="3.14" />
+ <ubyte v="10" />
+ <string v="transform.position" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.position.x" />
+ <float v="0.499999" />
+ <ubyte v="1" />
+ <string v="transform.position.y" />
+ <float v="1.4" />
+ <ubyte v="1" />
+ <string v="transform.position.z" />
+ <float v="-0.000796274" />
+ <ubyte v="2" />
+ <string v="static" />
+ <bool v="1" />
+ <ubyte v="5" />
+ <string v="body group" />
+ <long v="0" />
+ </pc>
+ <behaviour layer="blia" name="room" />
+ </entity>
+ <entity name="joint 49">
+ <pc name="pcodejoint" serial="1">
+ <string v="ode joint" />
+ <pc locref="9" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES1ode joint" />
+ <ulong v="0" />
+ </pc>
+ <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES1ode joint" serial="1">
+ <ulong v="16" />
+ <ubyte v="11" />
+ <string v="rot_const" />
+ <ulong v="3" />
+ <ubyte v="2" />
+ <string v="rot_const.x" />
+ <bool v="0" />
+ <ubyte v="2" />
+ <string v="rot_const.y" />
+ <bool v="0" />
+ <ubyte v="2" />
+ <string v="rot_const.z" />
+ <bool v="0" />
+ <ubyte v="11" />
+ <string v="trans_const" />
+ <ulong v="3" />
+ <ubyte v="2" />
+ <string v="trans_const.x" />
+ <bool v="1" />
+ <ubyte v="2" />
+ <string v="trans_const.y" />
+ <bool v="1" />
+ <ubyte v="2" />
+ <string v="trans_const.z" />
+ <bool v="1" />
+ <ubyte v="10" />
+ <string v="bounce" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="bounce.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="bounce.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="bounce.z" />
+ <float v="0" />
+ <ubyte v="10" />
+ <string v="desired_velocity" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="desired_velocity.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="desired_velocity.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="desired_velocity.z" />
+ <float v="0" />
+ <ubyte v="10" />
+ <string v="max_force" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="max_force.x" />
+ <float v="1000" />
+ <ubyte v="1" />
+ <string v="max_force.y" />
+ <float v="1000" />
+ <ubyte v="1" />
+ <string v="max_force.z" />
+ <float v="1000" />
+ <ubyte v="10" />
+ <string v="min_angle" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="min_angle.x" />
+ <float v="-3.14" />
+ <ubyte v="1" />
+ <string v="min_angle.y" />
+ <float v="-3.14" />
+ <ubyte v="1" />
+ <string v="min_angle.z" />
+ <float v="-3.14" />
+ <ubyte v="10" />
+ <string v="max_angle" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="max_angle.x" />
+ <float v="3.14" />
+ <ubyte v="1" />
+ <string v="max_angle.y" />
+ <float v="3.14" />
+ <ubyte v="1" />
+ <string v="max_angle.z" />
+ <float v="3.14" />
+ <ubyte v="10" />
+ <string v="min_distance" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="min_distance.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="min_distance.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="min_distance.z" />
+ <float v="0" />
+ <ubyte v="10" />
+ <string v="max_distance" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="max_distance.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="max_distance.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="max_distance.z" />
+ <float v="0" />
+ <ubyte v="7" />
+ <string v="transform" />
+ <ulong v="2" />
+ <ubyte v="8" />
+ <string v="transform.rotation" />
+ <ulong v="2" />
+ <ubyte v="10" />
+ <string v="transform.rotation.axis" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.y" />
+ <float v="1" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.z" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.angle" />
+ <float v="3.14" />
+ <ubyte v="10" />
+ <string v="transform.position" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.position.x" />
+ <float v="0.499999" />
+ <ubyte v="1" />
+ <string v="transform.position.y" />
+ <float v="1.4" />
+ <ubyte v="1" />
+ <string v="transform.position.z" />
+ <float v="-0.000796274" />
+ <ubyte v="10" />
+ <string v="cfm" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="cfm.x" />
+ <float v="0.01" />
+ <ubyte v="1" />
+ <string v="cfm.y" />
+ <float v="0.01" />
+ <ubyte v="1" />
+ <string v="cfm.z" />
+ <float v="0.01" />
+ <ubyte v="10" />
+ <string v="fudge factor" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="fudge factor.x" />
+ <float v="1" />
+ <ubyte v="1" />
+ <string v="fudge factor.y" />
+ <float v="1" />
+ <ubyte v="1" />
+ <string v="fudge factor.z" />
+ <float v="1" />
+ <ubyte v="10" />
+ <string v="stop cfm" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="stop cfm.x" />
+ <float v="0.01" />
+ <ubyte v="1" />
+ <string v="stop cfm.y" />
+ <float v="0.01" />
+ <ubyte v="1" />
+ <string v="stop cfm.z" />
+ <float v="0.01" />
+ <ubyte v="10" />
+ <string v="stop erp" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="stop erp.x" />
+ <float v="0.9" />
+ <ubyte v="1" />
+ <string v="stop erp.y" />
+ <float v="0.9" />
+ <ubyte v="1" />
+ <string v="stop erp.z" />
+ <float v="0.9" />
+ <ubyte v="10" />
+ <string v="suspension cfm" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="suspension cfm.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="suspension cfm.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="suspension cfm.z" />
+ <float v="0" />
+ <ubyte v="10" />
+ <string v="suspension erp" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="suspension erp.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="suspension erp.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="suspension erp.z" />
+ <float v="0" />
+ </pc>
+ <behaviour layer="blia" name="room" />
+ </entity>
+ <entity name="body 24">
+ <pc name="pcrigidbody" serial="1">
+ <string v="RArm body" />
+ <pc locref="10" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES2rigid body" />
+ <ulong v="0" />
+ </pc>
+ <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES2rigid body" serial="1">
+ <ulong v="4" />
+ <ubyte v="1" />
+ <string v="mass" />
+ <float v="1" />
+ <ubyte v="7" />
+ <string v="transform" />
+ <ulong v="2" />
+ <ubyte v="8" />
+ <string v="transform.rotation" />
+ <ulong v="2" />
+ <ubyte v="10" />
+ <string v="transform.rotation.axis" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.y" />
+ <float v="1" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.z" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.angle" />
+ <float v="3.14" />
+ <ubyte v="10" />
+ <string v="transform.position" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.position.x" />
+ <float v="0.3" />
+ <ubyte v="1" />
+ <string v="transform.position.y" />
+ <float v="1.4" />
+ <ubyte v="1" />
+ <string v="transform.position.z" />
+ <float v="-0.000477764" />
+ <ubyte v="2" />
+ <string v="static" />
+ <bool v="1" />
+ <ubyte v="5" />
+ <string v="body group" />
+ <long v="0" />
+ </pc>
+ <behaviour layer="blia" name="room" />
+ </entity>
+ <entity name="joint 48">
+ <pc name="pcodejoint" serial="1">
+ <string v="ode joint" />
+ <pc locref="11" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES1ode joint" />
+ <ulong v="0" />
+ </pc>
+ <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES1ode joint" serial="1">
+ <ulong v="16" />
+ <ubyte v="11" />
+ <string v="rot_const" />
+ <ulong v="3" />
+ <ubyte v="2" />
+ <string v="rot_const.x" />
+ <bool v="0" />
+ <ubyte v="2" />
+ <string v="rot_const.y" />
+ <bool v="0" />
+ <ubyte v="2" />
+ <string v="rot_const.z" />
+ <bool v="0" />
+ <ubyte v="11" />
+ <string v="trans_const" />
+ <ulong v="3" />
+ <ubyte v="2" />
+ <string v="trans_const.x" />
+ <bool v="1" />
+ <ubyte v="2" />
+ <string v="trans_const.y" />
+ <bool v="1" />
+ <ubyte v="2" />
+ <string v="trans_const.z" />
+ <bool v="1" />
+ <ubyte v="10" />
+ <string v="bounce" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="bounce.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="bounce.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="bounce.z" />
+ <float v="0" />
+ <ubyte v="10" />
+ <string v="desired_velocity" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="desired_velocity.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="desired_velocity.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="desired_velocity.z" />
+ <float v="0" />
+ <ubyte v="10" />
+ <string v="max_force" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="max_force.x" />
+ <float v="1000" />
+ <ubyte v="1" />
+ <string v="max_force.y" />
+ <float v="1000" />
+ <ubyte v="1" />
+ <string v="max_force.z" />
+ <float v="1000" />
+ <ubyte v="10" />
+ <string v="min_angle" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="min_angle.x" />
+ <float v="-3.14" />
+ <ubyte v="1" />
+ <string v="min_angle.y" />
+ <float v="-3.14" />
+ <ubyte v="1" />
+ <string v="min_angle.z" />
+ <float v="-3.14" />
+ <ubyte v="10" />
+ <string v="max_angle" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="max_angle.x" />
+ <float v="3.14" />
+ <ubyte v="1" />
+ <string v="max_angle.y" />
+ <float v="3.14" />
+ <ubyte v="1" />
+ <string v="max_angle.z" />
+ <float v="3.14" />
+ <ubyte v="10" />
+ <string v="min_distance" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="min_distance.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="min_distance.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="min_distance.z" />
+ <float v="0" />
+ <ubyte v="10" />
+ <string v="max_distance" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="max_distance.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="max_distance.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="max_distance.z" />
+ <float v="0" />
+ <ubyte v="7" />
+ <string v="transform" />
+ <ulong v="2" />
+ <ubyte v="8" />
+ <string v="transform.rotation" />
+ <ulong v="2" />
+ <ubyte v="10" />
+ <string v="transform.rotation.axis" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.y" />
+ <float v="1" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.z" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.angle" />
+ <float v="3.14" />
+ <ubyte v="10" />
+ <string v="transform.position" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.position.x" />
+ <float v="0.3" />
+ <ubyte v="1" />
+ <string v="transform.position.y" />
+ <float v="1.4" />
+ <ubyte v="1" />
+ <string v="transform.position.z" />
+ <float v="-0.000477764" />
+ <ubyte v="10" />
+ <string v="cfm" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="cfm.x" />
+ <float v="0.01" />
+ <ubyte v="1" />
+ <string v="cfm.y" />
+ <float v="0.01" />
+ <ubyte v="1" />
+ <string v="cfm.z" />
+ <float v="0.01" />
+ <ubyte v="10" />
+ <string v="fudge factor" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="fudge factor.x" />
+ <float v="1" />
+ <ubyte v="1" />
+ <string v="fudge factor.y" />
+ <float v="1" />
+ <ubyte v="1" />
+ <string v="fudge factor.z" />
+ <float v="1" />
+ <ubyte v="10" />
+ <string v="stop cfm" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="stop cfm.x" />
+ <float v="0.01" />
+ <ubyte v="1" />
+ <string v="stop cfm.y" />
+ <float v="0.01" />
+ <ubyte v="1" />
+ <string v="stop cfm.z" />
+ <float v="0.01" />
+ <ubyte v="10" />
+ <string v="stop erp" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="stop erp.x" />
+ <float v="0.9" />
+ <ubyte v="1" />
+ <string v="stop erp.y" />
+ <float v="0.9" />
+ <ubyte v="1" />
+ <string v="stop erp.z" />
+ <float v="0.9" />
+ <ubyte v="10" />
+ <string v="suspension cfm" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="suspension cfm.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="suspension cfm.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="suspension cfm.z" />
+ <float v="0" />
+ <ubyte v="10" />
+ <string v="suspension erp" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="suspension erp.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="suspension erp.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="suspension erp.z" />
+ <float v="0" />
+ </pc>
+ <behaviour layer="blia" name="room" />
+ </entity>
+ <entity name="defaultModel: LArm">
+ <pc name="pcbone" serial="1">
+ <string v="LArm" />
+ <pc locref="12" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5LArm" />
+ <ulong v="3" />
+ <pc locref="13" name="pcbone" />
+ <pc locref="16" name="pcrigidbody" />
+ <pc locref="17" name="pcodejoint" />
+ </pc>
+ <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5LArm" serial="1">
+ <ulong v="1" />
+ <ubyte v="7" />
+ <string v="transform" />
+ <ulong v="2" />
+ <ubyte v="8" />
+ <string v="transform.rotation" />
+ <ulong v="2" />
+ <ubyte v="10" />
+ <string v="transform.rotation.axis" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.x" />
+ <float v="1" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.z" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.angle" />
+ <float v="0" />
+ <ubyte v="10" />
+ <string v="transform.position" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.position.x" />
+ <float v="0.3" />
+ <ubyte v="1" />
+ <string v="transform.position.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.position.z" />
+ <float v="0" />
+ </pc>
+ <behaviour layer="blia" name="room" />
+ </entity>
+ <entity name="defaultModel: LForearm">
+ <pc name="pcbone" serial="1">
+ <string v="LForearm" />
+ <pc locref="13" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5LForearm" />
+ <ulong v="2" />
+ <pc locref="14" name="pcrigidbody" />
+ <pc locref="15" name="pcodejoint" />
+ </pc>
+ <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES5LForearm" serial="1">
+ <ulong v="1" />
+ <ubyte v="7" />
+ <string v="transform" />
+ <ulong v="2" />
+ <ubyte v="8" />
+ <string v="transform.rotation" />
+ <ulong v="2" />
+ <ubyte v="10" />
+ <string v="transform.rotation.axis" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.x" />
+ <float v="1" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.z" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.angle" />
+ <float v="0" />
+ <ubyte v="10" />
+ <string v="transform.position" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.position.x" />
+ <float v="0.2" />
+ <ubyte v="1" />
+ <string v="transform.position.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.position.z" />
+ <float v="0" />
+ </pc>
+ <behaviour layer="blia" name="room" />
+ </entity>
+ <entity name="body 27">
+ <pc name="pcrigidbody" serial="1">
+ <string v="LForearm body" />
+ <pc locref="14" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES2rigid body" />
+ <ulong v="0" />
+ </pc>
+ <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES2rigid body" serial="1">
+ <ulong v="4" />
+ <ubyte v="1" />
+ <string v="mass" />
+ <float v="1" />
+ <ubyte v="7" />
+ <string v="transform" />
+ <ulong v="2" />
+ <ubyte v="8" />
+ <string v="transform.rotation" />
+ <ulong v="2" />
+ <ubyte v="10" />
+ <string v="transform.rotation.axis" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.y" />
+ <float v="1" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.z" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.angle" />
+ <float v="3.14" />
+ <ubyte v="10" />
+ <string v="transform.position" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.position.x" />
+ <float v="-0.499999" />
+ <ubyte v="1" />
+ <string v="transform.position.y" />
+ <float v="1.4" />
+ <ubyte v="1" />
+ <string v="transform.position.z" />
+ <float v="0.000796274" />
+ <ubyte v="2" />
+ <string v="static" />
+ <bool v="1" />
+ <ubyte v="5" />
+ <string v="body group" />
+ <long v="0" />
+ </pc>
+ <behaviour layer="blia" name="room" />
+ </entity>
+ <entity name="joint 51">
+ <pc name="pcodejoint" serial="1">
+ <string v="ode joint" />
+ <pc locref="15" name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES1ode joint" />
+ <ulong v="0" />
+ </pc>
+ <pc name="pcobjectproperties" tag="IA EDITOR OBJECT PROPERTIES1ode joint" serial="1">
+ <ulong v="16" />
+ <ubyte v="11" />
+ <string v="rot_const" />
+ <ulong v="3" />
+ <ubyte v="2" />
+ <string v="rot_const.x" />
+ <bool v="0" />
+ <ubyte v="2" />
+ <string v="rot_const.y" />
+ <bool v="0" />
+ <ubyte v="2" />
+ <string v="rot_const.z" />
+ <bool v="0" />
+ <ubyte v="11" />
+ <string v="trans_const" />
+ <ulong v="3" />
+ <ubyte v="2" />
+ <string v="trans_const.x" />
+ <bool v="1" />
+ <ubyte v="2" />
+ <string v="trans_const.y" />
+ <bool v="1" />
+ <ubyte v="2" />
+ <string v="trans_const.z" />
+ <bool v="1" />
+ <ubyte v="10" />
+ <string v="bounce" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="bounce.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="bounce.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="bounce.z" />
+ <float v="0" />
+ <ubyte v="10" />
+ <string v="desired_velocity" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="desired_velocity.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="desired_velocity.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="desired_velocity.z" />
+ <float v="0" />
+ <ubyte v="10" />
+ <string v="max_force" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="max_force.x" />
+ <float v="1000" />
+ <ubyte v="1" />
+ <string v="max_force.y" />
+ <float v="1000" />
+ <ubyte v="1" />
+ <string v="max_force.z" />
+ <float v="1000" />
+ <ubyte v="10" />
+ <string v="min_angle" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="min_angle.x" />
+ <float v="-3.14" />
+ <ubyte v="1" />
+ <string v="min_angle.y" />
+ <float v="-3.14" />
+ <ubyte v="1" />
+ <string v="min_angle.z" />
+ <float v="-3.14" />
+ <ubyte v="10" />
+ <string v="max_angle" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="max_angle.x" />
+ <float v="3.14" />
+ <ubyte v="1" />
+ <string v="max_angle.y" />
+ <float v="3.14" />
+ <ubyte v="1" />
+ <string v="max_angle.z" />
+ <float v="3.14" />
+ <ubyte v="10" />
+ <string v="min_distance" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="min_distance.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="min_distance.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="min_distance.z" />
+ <float v="0" />
+ <ubyte v="10" />
+ <string v="max_distance" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="max_distance.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="max_distance.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="max_distance.z" />
+ <float v="0" />
+ <ubyte v="7" />
+ <string v="transform" />
+ <ulong v="2" />
+ <ubyte v="8" />
+ <string v="transform.rotation" />
+ <ulong v="2" />
+ <ubyte v="10" />
+ <string v="transform.rotation.axis" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.y" />
+ <float v="1" />
+ <ubyte v="1" />
+ <string v="transform.rotation.axis.z" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="transform.rotation.angle" />
+ <float v="3.14" />
+ <ubyte v="10" />
+ <string v="transform.position" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="transform.position.x" />
+ <float v="-0.499999" />
+ <ubyte v="1" />
+ <string v="transform.position.y" />
+ <float v="1.4" />
+ <ubyte v="1" />
+ <string v="transform.position.z" />
+ <float v="0.000796274" />
+ <ubyte v="10" />
+ <string v="cfm" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="cfm.x" />
+ <float v="0.01" />
+ <ubyte v="1" />
+ <string v="cfm.y" />
+ <float v="0.01" />
+ <ubyte v="1" />
+ <string v="cfm.z" />
+ <float v="0.01" />
+ <ubyte v="10" />
+ <string v="fudge factor" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="fudge factor.x" />
+ <float v="1" />
+ <ubyte v="1" />
+ <string v="fudge factor.y" />
+ <float v="1" />
+ <ubyte v="1" />
+ <string v="fudge factor.z" />
+ <float v="1" />
+ <ubyte v="10" />
+ <string v="stop cfm" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="stop cfm.x" />
+ <float v="0.01" />
+ <ubyte v="1" />
+ <string v="stop cfm.y" />
+ <float v="0.01" />
+ <ubyte v="1" />
+ <string v="stop cfm.z" />
+ <float v="0.01" />
+ <ubyte v="10" />
+ <string v="stop erp" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="stop erp.x" />
+ <float v="0.9" />
+ <ubyte v="1" />
+ <string v="stop erp.y" />
+ <float v="0.9" />
+ <ubyte v="1" />
+ <string v="stop erp.z" />
+ <float v="0.9" />
+ <ubyte v="10" />
+ <string v="suspension cfm" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="suspension cfm.x" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="suspension cfm.y" />
+ <float v="0" />
+ <ubyte v="1" />
+ <string v="suspension cfm.z" />
+ <float v="0" />
+ <ubyte v="10" />
+ <string v="suspension erp" />
+ <ulong v="3" />
+ <ubyte v="1" />
+ <string v="suspe...
[truncated message content] |
|
From: <ob...@us...> - 2007-12-17 18:17:34
|
Revision: 351
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=351&view=rev
Author: obi666
Date: 2007-12-17 10:17:37 -0800 (Mon, 17 Dec 2007)
Log Message:
-----------
Msvc projects reconfiguration. Code updates for cs "shared libs" version.
Modified Paths:
--------------
trunk/configure
trunk/configure.ac
trunk/msvc/7/appiaeditor.vcproj
trunk/msvc/7/libpropgrid.vcproj
trunk/msvc/7/wksiaeditor.sln
trunk/msvc/71/appiaeditor.vcproj
trunk/msvc/71/libpropgrid.vcproj
trunk/msvc/71/wksiaeditor.sln
trunk/msvc/8/appiaeditor.vcproj
trunk/msvc/8/libpropgrid.vcproj
trunk/msvc/8/plgbehaviourlayer.vcproj
trunk/msvc/8/plgcsobjects.vcproj
trunk/msvc/8/plgforce_script.vcproj
trunk/msvc/8/plgpfcharacter.vcproj
trunk/msvc/8/plgpfguiactor.vcproj
trunk/msvc/8/plgpfobj_properties.vcproj
trunk/msvc/8/plgpfodedynamics.vcproj
trunk/msvc/8/wksiaeditor.sln
trunk/msvc/appiaeditor.manifest
trunk/msvc/appiaeditor.rc
trunk/msvc/plgbehaviourlayer.rc
trunk/msvc/plgcsobjects.rc
trunk/msvc/plgforce_script.rc
trunk/msvc/plgpfcharacter.rc
trunk/msvc/plgpfguiactor.rc
trunk/msvc/plgpfobj_properties.rc
trunk/msvc/plgpfodedynamics.rc
trunk/src/apps/editor/gui/widgets/iaMainFrame.cpp
trunk/src/apps/editor/iaCSApplication.cpp
trunk/src/plugins/dynamics/ode_dynamics/body.h
trunk/src/plugins/dynamics/ode_dynamics/collider.h
trunk/src/plugins/dynamics/ode_dynamics/ode_joint.cpp
trunk/src/plugins/dynamics/ode_dynamics/ode_joint.h
Modified: trunk/configure
===================================================================
--- trunk/configure 2007-11-28 18:02:21 UTC (rev 350)
+++ trunk/configure 2007-12-17 18:17:37 UTC (rev 351)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for iaeditor 0.0.
+# Generated by GNU Autoconf 2.61 for iaeditor 0.3.
#
# Report bugs to <obr...@gm...>.
#
@@ -576,8 +576,8 @@
# Identity of this package.
PACKAGE_NAME='iaeditor'
PACKAGE_TARNAME='iaeditor'
-PACKAGE_VERSION='0.0'
-PACKAGE_STRING='iaeditor 0.0'
+PACKAGE_VERSION='0.3'
+PACKAGE_STRING='iaeditor 0.3'
PACKAGE_BUGREPORT='obr...@gm...'
ac_unique_file="mk/jam/build.jam"
@@ -1234,7 +1234,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures iaeditor 0.0 to adapt to many kinds of systems.
+\`configure' configures iaeditor 0.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1299,7 +1299,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of iaeditor 0.0:";;
+ short | recursive ) echo "Configuration of iaeditor 0.3:";;
esac
cat <<\_ACEOF
@@ -1440,7 +1440,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-iaeditor configure 0.0
+iaeditor configure 0.3
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1454,7 +1454,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by iaeditor $as_me 0.0, which was
+It was created by iaeditor $as_me 0.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -11247,7 +11247,7 @@
# Y is even (stable version): X.Y, X.Y+2, X.Y+1
# Y is odd (development version): X.Y, X.Y+1, X.Y+3, X.Y+2
-cs_version_desired=1.2
+cs_version_desired=1.1
sed_expr_base=\\\([0-9]\\\+\\\)\.\\\([0-9]\\\+\\\).*
cs_version_major=`echo $cs_version_desired | sed "s/$sed_expr_base/\1/"`
cs_version_minor=`echo $cs_version_desired | sed "s/$sed_expr_base/\2/"`
@@ -11493,9 +11493,9 @@
# Still do cs-config version check - this one will also take the release
# component into account. Also needed for legacy cs-config.
- { echo "$as_me:$LINENO: checking if Crystal Space version >= 1.2" >&5
-echo $ECHO_N "checking if Crystal Space version >= 1.2... $ECHO_C" >&6; }
-if test "${cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok_annotated+set}" = set; then
+ { echo "$as_me:$LINENO: checking if Crystal Space version >= 1.1" >&5
+echo $ECHO_N "checking if Crystal Space version >= 1.1... $ECHO_C" >&6; }
+if test "${cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok_annotated+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cs_prog_Crystal_Space_is_version=
@@ -11519,10 +11519,10 @@
-test -z $cs_prog_Crystal_Space_min_version && cs_prog_Crystal_Space_min_version=`echo 1.2 | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -z $cs_prog_Crystal_Space_min_version && cs_prog_Crystal_Space_min_version=`echo 1.1 | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
test -n "$cs_prog_Crystal_Space_min_version" && test -z $cs_prog_Crystal_Space_min_suffix_done && { cs_prog_Crystal_Space_min_suffix_done=yes ; cs_prog_Crystal_Space_min_suffix= ; }
-test -z $cs_prog_Crystal_Space_min_version && cs_prog_Crystal_Space_min_version=`echo 1.2 | sed '/[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -z $cs_prog_Crystal_Space_min_version && cs_prog_Crystal_Space_min_version=`echo 1.1 | sed '/[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
test -n "$cs_prog_Crystal_Space_min_version" && test -z $cs_prog_Crystal_Space_min_suffix_done && { cs_prog_Crystal_Space_min_suffix_done=yes ; cs_prog_Crystal_Space_min_suffix=.0 ; }
@@ -11534,39 +11534,39 @@
cs_prog_Crystal_Space_min_ver_2=`echo $cs_prog_Crystal_Space_min_version${cs_prog_Crystal_Space_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/'`
cs_prog_Crystal_Space_min_ver_3=`echo $cs_prog_Crystal_Space_min_version${cs_prog_Crystal_Space_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\3/'`
-cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok=''
-test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok" \
+cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok=''
+test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok" \
&& { expr "$cs_prog_Crystal_Space_is_ver_1" ">=" "$cs_prog_Crystal_Space_min_ver_1" >/dev/null \
- || cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok=no ; }
-test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok" \
+ || cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok=no ; }
+test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok" \
&& { expr "$cs_prog_Crystal_Space_min_ver_1" ">=" "$cs_prog_Crystal_Space_is_ver_1" >/dev/null \
- || cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok=yes ; }
-test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok" \
+ || cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok=yes ; }
+test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok" \
&& { expr "$cs_prog_Crystal_Space_is_ver_2" ">=" "$cs_prog_Crystal_Space_min_ver_2" >/dev/null \
- || cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok=no ; }
-test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok" \
+ || cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok=no ; }
+test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok" \
&& { expr "$cs_prog_Crystal_Space_min_ver_2" ">=" "$cs_prog_Crystal_Space_is_ver_2" >/dev/null \
- || cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok=yes ; }
-test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok" \
+ || cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok=yes ; }
+test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok" \
&& { expr "$cs_prog_Crystal_Space_is_ver_3" ">=" "$cs_prog_Crystal_Space_min_ver_3" >/dev/null \
- || cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok=no ; }
-test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok" \
+ || cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok=no ; }
+test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok" \
&& { expr "$cs_prog_Crystal_Space_min_ver_3" ">=" "$cs_prog_Crystal_Space_is_ver_3" >/dev/null \
- || cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok=yes ; }
+ || cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok=yes ; }
-if test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok"; then
- cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok=yes
+if test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok"; then
+ cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok=yes
fi
-if test "$cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok" = yes; then
+if test "$cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok" = yes; then
cs_prog_Crystal_Space_version_ok=yes
else
cs_prog_Crystal_Space_version_ok=no
fi
-cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok_annotated="$cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok"
+cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok_annotated="$cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok"
if test -n "$cs_prog_Crystal_Space_is_version"; then
- cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok_annotated="$cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok_annotated (version $cs_prog_Crystal_Space_is_version)"
+ cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok_annotated="$cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok_annotated (version $cs_prog_Crystal_Space_is_version)"
cs_prog_Crystal_Space_version="$cs_prog_Crystal_Space_is_version"
else
cs_prog_Crystal_Space_version=''
@@ -11574,9 +11574,9 @@
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok_annotated" >&5
-echo "${ECHO_T}$cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok_annotated" >&6; }
-if test "$cs_cv_prog_Crystal_Space_version_m4_default__1_2___cs_min_version_default___ok" = yes; then
+{ echo "$as_me:$LINENO: result: $cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok_annotated" >&5
+echo "${ECHO_T}$cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok_annotated" >&6; }
+if test "$cs_cv_prog_Crystal_Space_version_m4_default__1_1___cs_min_version_default___ok" = yes; then
cs_sdk=yes
else
cs_sdk=no
@@ -11585,7 +11585,7 @@
if test $cs_sdk = yes; then
cs_liblist="crystalspace"
- cs_optlibs=`echo xcrystalspace_opengl | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_optlibs=`echo x$cs_opt_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
if test -n "$cs_optlibs"; then
cs_optlibs=`$cfg --available-libs $cs_optlibs`
cs_liblist="$cs_liblist $cs_optlibs"
@@ -14479,7 +14479,7 @@
"
cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_COPYRIGHT ?= \"$PACKAGE_COPYRIGHT\" ;
"
- for cs_veritem in 0 0; do
+ for cs_veritem in 0 3; do
cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_VERSION_LIST += \"$cs_veritem\" ;
"
done
@@ -14890,7 +14890,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by iaeditor $as_me 0.0, which was
+This file was extended by iaeditor $as_me 0.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14943,7 +14943,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-iaeditor config.status 0.0
+iaeditor config.status 0.3
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-11-28 18:02:21 UTC (rev 350)
+++ trunk/configure.ac 2007-12-17 18:17:37 UTC (rev 351)
@@ -1,408 +1,408 @@
-#----------------------------------------------------------------------------
-# Autoconf input script. Invoke the ./autogen.sh script to generate a
-# configure script from this file.
-#----------------------------------------------------------------------------
-AC_PREREQ([2.54])
-
-#----------------------------------------------------------------------------
-# Initialize Autoconf.
-#----------------------------------------------------------------------------
-AC_INIT(
- [iaeditor],
- [0.0],
- [obr...@gm...])
-CS_PACKAGEINFO(
- [IAEditor],
- [Piotr Obrzut],
- [http://www.sourceforge.net/projects/iaeditor/])
-AC_CONFIG_SRCDIR([mk/jam/build.jam])
-AC_CONFIG_AUX_DIR([mk/autoconf])
-AC_CANONICAL_HOST
-
-#----------------------------------------------------------------------------
-# Setup for the configuration header.
-#----------------------------------------------------------------------------
-AC_CONFIG_HEADERS([config.h])
-
-#----------------------------------------------------------------------------
-# Check for tools.
-#----------------------------------------------------------------------------
-CS_PROG_CC
-AS_IF([test -z "$CC"],
- [AC_MSG_ERROR([Could not find a usable C compiler.])])
-CS_PROG_CXX
-AS_IF([test -z "$CXX"],
- [AC_MSG_ERROR([Could not find a usable C++ compiler.])])
-CS_PROG_LINK
-
-# The default RANLIB in Jambase is wrong on some platforms, and is also
-# unsuitable during cross-compilation, so we set the value unconditionally
-# (sixth argument of CS_EMIT_BUILD_PROPERTY).
-AC_PROG_RANLIB
-CS_EMIT_BUILD_PROPERTY([RANLIB], [$RANLIB], [], [], [], [Y])
-
-CS_CHECK_TOOLS([WINDRES], [windres])
-CS_EMIT_BUILD_PROPERTY([CMD.WINDRES], [$WINDRES])
-
-CS_CHECK_PROGS([DOXYGEN], [doxygen])
-CS_EMIT_BUILD_PROPERTY([CMD.DOXYGEN], [$DOXYGEN])
-
-CS_CHECK_TOOLS([DOT], [dot])
-CS_EMIT_BUILD_PROPERTY([CMD.DOT], [$DOT])
-
-CS_CHECK_PROGS([TEXI2DVI], [texi2dvi])
-CS_EMIT_BUILD_PROPERTY([CMD.TEXI2DVI], [$TEXI2DVI])
-
-CS_CHECK_PROGS([TEXI2PDF], [texi2pdf])
-CS_EMIT_BUILD_PROPERTY([CMD.TEXI2PDF], [$TEXI2PDF])
-
-CS_CHECK_PROGS([DVIPS], [dvips])
-CS_EMIT_BUILD_PROPERTY([CMD.DVIPS], [$DVIPS])
-
-CS_CHECK_PROGS([DVIPDF], [dvipdf])
-CS_EMIT_BUILD_PROPERTY([CMD.DVIPDF], [$DVIPDF])
-
-CS_CHECK_PROGS([MAKEINFO], [makeinfo])
-CS_EMIT_BUILD_PROPERTY([CMD.MAKEINFO], [$MAKEINFO])
-
-CS_CHECK_PROGS([INSTALL], [install])
-CS_EMIT_BUILD_PROPERTY([INSTALL], [$INSTALL])
-
-CS_CHECK_LIBTOOL
-CS_EMIT_BUILD_PROPERTY([LIBTOOL], [$LIBTOOL])
-CS_EMIT_BUILD_PROPERTY([APPLE_LIBTOOL], [$APPLE_LIBTOOL])
-
-CS_CHECK_MKDIR
-CS_EMIT_BUILD_PROPERTY([CMD.MKDIR], [$MKDIR])
-CS_EMIT_BUILD_PROPERTY([CMD.MKDIRS], [$MKDIRS])
-
-CS_CHECK_PROGS([PERL], [perl5 perl])
-CS_EMIT_BUILD_PROPERTY([PERL], [$PERL])
-
-CS_CHECK_TEMPLATE_TOOLKIT2([emit])
-
-CS_CHECK_PROGS([SWIG], [swig])
-AS_IF([test -n "$SWIG"],
- [CS_CHECK_PROG_VERSION([swig], [$SWIG -version 2>&1], [1.3.21],
- [9.9|.9], [CS_EMIT_BUILD_PROPERTY([CMD.SWIG], [$SWIG])])])
-
-#----------------------------------------------------------------------------
-# Determine system type
-#----------------------------------------------------------------------------
-CS_CHECK_HOST
-
-#----------------------------------------------------------------------------
-# Check for syntax problems / header files
-#----------------------------------------------------------------------------
-# Nothing yet.
-
-#----------------------------------------------------------------------------
-# Check for external libraries
-#----------------------------------------------------------------------------
-CS_CHECK_CPPUNIT([emit])
-
-#------------------------------------------------------------------------------
-# Check for BSD-style socket support. Also test for presence of type
-# socklen_t. Note that we must not include both <winsock.h> and the Unix
-# socket-related headers at the same time on Cygwin even though they both exist
-# since the inclusion of both results in errors about structures and functions
-# defined differently between <winsock.h> and the other headers. Therefore, if
-# <winsock.h> is present, we include only it, otherwise we include the Unix
-# socket-related headers. A related problem also occurs with the check for
-# presence of <winsock.h> on Cygwin, thus this check is handled specially. For
-# this check, the "default-includes" normally used by AC_CHECK_HEADER() are
-# suppressed. This prevents complaints about structures and functions in
-# <winsock.h> being defined differently by <sys/types.h> and <unistd.h>
-#------------------------------------------------------------------------------
-m4_define([cs_socket_flags],
- [CS_CREATE_TUPLE() \
- CS_CREATE_TUPLE([], [], [-lsocket]) \
- CS_CREATE_TUPLE([], [], [-lsocket -lnsl]) \
- CS_CREATE_TUPLE([], [], [-lwsock32])])
-
-AC_CHECK_HEADERS([winsock.h], [], [], [/* no default includes */])
-
-AC_CHECK_HEADERS(
- [unistd.h \
- sys/types.h \
- sys/socket.h \
- sys/ioctl.h \
- netinet/in.h \
- arpa/inet.h \
- netdb.h])
-
-CS_CHECK_BUILD([for socket support], [cs_cv_sys_socket],
- [AC_LANG_PROGRAM(
- [[#if HAVE_WINSOCK_H
- #include <winsock.h>
- #else
- #if HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
- #if HAVE_NETINET_IN_H
- #include <netinet/in.h>
- #endif
- #if HAVE_ARPA_INET_H
- #include <arpa/inet.h>
- #endif
- #if HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
- #endif]],
- [struct in_addr a; inet_ntoa(a); socket(0,0,0);])],
- [cs_socket_flags], [],
- [CS_EMIT_BUILD_RESULT([cs_cv_sys_socket], [SOCKET])])
-
-AS_IF([test $cs_cv_sys_socket = yes],
- [AC_CHECK_TYPE([socklen_t],
- [CS_HEADER_PROPERTY([CS_HAVE_SOCKLEN_T])],
- [],
- [[#if HAVE_UNISTD_H
- #include <unistd.h>
- #endif
- #if HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
- #if HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
- #if HAVE_SYS_IOCTL_H
- #include <sys/ioctl.h>
- #endif
- #if HAVE_NETINET_IN_H
- #include <netinet/in.h>
- #endif
- #if HAVE_NETDB_H
- #include <netdb.h>
- #endif
- ]])])
-
-#------------------------------------------------------------------------------
-# Check if STL is available. Although STL is not used heavily in Crystal Space,
-# a few plugin modules take advantage of it, so they need to know if it is
-# available.
-#------------------------------------------------------------------------------
-CS_CHECK_BUILD([for STL], [cs_cv_libstl],
- [AC_LANG_PROGRAM(
- [[#include <map>
- #include <string>]],
- [[std::map<std::string,int> m; m.begin();]])],
- [], [C++], [CS_EMIT_BUILD_RESULT([cs_cv_libstl], [STL])])
-
-
-#------------------------------------------------------------------------------
-# Check for wxWidgets. Also check if it was built with OpenGL support since it
-# is required by the Crystal Space wxWidgets canvas.
-#
-# IMPLEMENTATION NOTE
-#
-# On Windows, wx-config's --gl-libs options incorrectly emits a reference to a
-# non-existent library (wxmsw_glxxx.lib). To handle this broken case, we first
-# try the result of --libs and --gl-libs together; if that fails, then we try
-# only --libs augmented with the results of our own OpenGL checks. On more
-# recent WX versions it seems that on Win32 both the libraries from --gl-libs
-# and the OpenGL checks are needed - the last case.
-#------------------------------------------------------------------------------
-CS_CHECK_LIB_WITH([wx],
- [AC_LANG_PROGRAM(
- [[#include "wx/wxprec.h"
- #ifdef __BORLANDC__
- #pragma hdrstop
- #endif
- #ifndef WX_PRECOMP
- #include "wx/wx.h"
- #endif
- ]],
- [[wxWindow* p = 0; int w,h; p->GetClientSize(&w,&h);]])],
- [], [C++])
-
-AS_IF([test $cs_cv_libwx = yes],
- [AS_IF([test -z "$cs_cv_libwx_opengl"],
- [AS_IF([test -n "$CONFIG_WX"],
- [cs_cv_libwx_gllibs=CS_RUN_PATH_NORMALIZE([$CONFIG_WX --gl-libs])],
- [cs_cv_libwx_gllibs=''])])
- CS_CHECK_BUILD([if wxWidgets is built with OpenGL support],
- [cs_cv_libwx_opengl],
- [AC_LANG_PROGRAM(
- [[#include "wx/wxprec.h"
- #ifdef __BORLANDC__
- #pragma hdrstop
- #endif
- #ifndef WX_PRECOMP
- #include "wx/wx.h"
- #endif
- #include "wx/glcanvas.h"
- ]],
- [wxGLCanvas* f = new wxGLCanvas(0, wxID_ANY, wxPoint()); glVertex3f(0,0,0)])],
- [CS_CREATE_TUPLE(
- [$cs_cv_libwx_cflags],
- [$cs_cv_libwx_lflags],
- [$cs_cv_libwx_libs $cs_cv_libwx_gllibs]) \
- CS_CREATE_TUPLE(
- [$cs_cv_libwx_cflags $cs_cv_libglu_cflags],
- [$cs_cv_libwx_lflags $cs_cv_libglu_lflags],
- [$cs_cv_libwx_libs $cs_cv_libglu_libs]) \
- CS_CREATE_TUPLE(
- [$cs_cv_libwx_cflags $cs_cv_libglu_cflags],
- [$cs_cv_libwx_lflags $cs_cv_libglu_lflags],
- [$cs_cv_libwx_libs $cs_cv_libwx_gllibs $cs_cv_libglu_libs])],
- [C++])],
- [cs_cv_libwx_opengl=no])
-
-AS_IF([test $cs_cv_libwx_opengl = yes],
- [CS_EMIT_BUILD_RESULT([cs_cv_libwx_opengl], [WX])])
-
-AS_IF([test $cs_cv_libwx = yes],
- [CS_CHECK_BUILD([if wxWidgets is built with wxAUI support],
- [cs_cv_libwx_aui],
- [AC_LANG_PROGRAM(
- [[#include "wx/wxprec.h"
- #ifdef __BORLANDC__
- #pragma hdrstop
- #endif
- #ifndef WX_PRECOMP
- #include "wx/wx.h"
- #endif
- #include "wx/aui/aui.h"
- ]],
- [wxAuiManager mgr; wxWindow* w;
- mgr.SetManagedWindow(w);
- mgr.AddPane(w, wxAuiPaneInfo());])],
- [CS_CREATE_TUPLE(
- [$cs_cv_libwx_cflags],
- [$cs_cv_libwx_lflags],
- [$cs_cv_libwx_libs])],
- [C++])],
- [cs_cv_libwx_aui=no])
-
-AS_IF([test $cs_cv_libwx_aui = yes],
- [CS_EMIT_BUILD_RESULT([cs_cv_libwx_aui], [WX.AUI])])
-
-
-#----------------------------------------------------------------------------
-# Check for Crystal Space (CS)
-#----------------------------------------------------------------------------
-AC_ARG_WITH([cs], [AC_HELP_STRING([--without-cs],
- [do not look for an installed Crystal Space SDK; this option is useful only
- if you need to perform routine maintenance tasks, such as generating
- project files or converting documentation, without having the Crystal Space
- SDK installed])])
-AS_IF([test -z "$with_cs"], [with_cs=yes])
-
-AS_IF([test $with_cs != no],
-[CS_PATH_CRYSTAL_EMIT([1.2], [],
- [AC_MSG_ERROR([
-*** Crystal Space could not be found or was unusable. The latest version is
-*** always available from http://www.crystalspace3d.org/
-*** Also, be sure that you have either installed Crystal Space or set the
-*** CRYSTAL environment variable properly.
-])], [crystalspace], [crystalspace_opengl])])
-
-#----------------------------------------------------------------------------
-# Check for Crystal Entity Layer (CEL)
-#----------------------------------------------------------------------------
-m4_define([cel_desired], [yes])
-CS_EMIT_BUILD_PROPERTY([CEL.DESIRED], [cel_desired])
-m4_if(cel_desired, [yes],
-[AC_ARG_WITH([cel], [AC_HELP_STRING([--without-cel],
- [do not look for an installed Crystal Entity Layer SDK; this option is useful
- only if you need to perform routine maintenance tasks, such as generating
- project files or converting documentation, without having the CEL SDK
- installed])])
-AS_IF([test -z "$with_cel"], [with_cel=yes])
-
-AS_IF([test $with_cel != no],
-[CS_PATH_CEL_EMIT([1.2], [],
- [AC_MSG_ERROR([
-*** CEL could not be found or was unusable. The latest version is always
-*** available from http://cel.crystalspace3d.org/
-])])
-AC_DEFINE([USE_CEL], [], [Define to enable CEL.])
-AC_DEFINE_UNQUOTED([CEL_PLUGIN_DIR], ["$CEL_PLUGIN_DIR"],
- [Define with path to CEL plugins.])
-])])
-
-
-#------------------------------------------------------------------------------
-# Determine whether link libraries should be static or shared.
-#------------------------------------------------------------------------------
-AC_MSG_CHECKING([whether to build shared libraries])
-case $host_os in
- mingw*|cygwin*|linux*) enable_shared_default=yes ;;
- *) enable_shared_default=no ;;
-esac
-AC_ARG_ENABLE([shared], [AC_HELP_STRING([--enable-shared],
- [enable creation of shared libraries (default YES on Win32 and Linux,
- NO otherwise)])],
- [], [enable_shared=$enable_shared_default])
-AC_MSG_RESULT([$enable_shared])
-CS_EMIT_BUILD_PROPERTY([BUILD_SHARED_LIBS], [$enable_shared])
-AS_IF([test $enable_shared = yes],
- [CS_HEADER_PROPERTY([CS_BUILD_SHARED_LIBS])])
-
-
-
-#------------------------------------------------------------------------------
-# Determine if the "make" emulation layer should be synthesized.
-#------------------------------------------------------------------------------
-AC_MSG_CHECKING([whether to emulate makefiles])
-AC_ARG_ENABLE([make-emulation],
- [AC_HELP_STRING([--enable-make-emulation],
- [enable emulation layer allowing project to be built with `make', in
- addition to `jam' (default YES)])],
- [], [enable_make_emulation=yes])
-AC_MSG_RESULT([$enable_make_emulation])
-
-#------------------------------------------------------------------------------
-# Determine if plugin meta-information should be embedded directly into plugin
-# modules or if it should exist in stand-alone .csplugin files. On Unix,
-# embedding is accomplished via libbfd which carries a GPL license. If your
-# project is compatible with GPL, then set gpl_compatible to "yes". This will
-# cause embedding to be enabled on Unix by default. Otherwise, set it to "no",
-# which will cause embedding to be disabled by default on Unix. (In any event,
-# the user can override the default setting with the
-# --enable-meta-info-embedding option.)
-#------------------------------------------------------------------------------
-m4_define([gpl_compatible], [yes])
-CS_META_INFO_EMBED([emit], gpl_compatible)
-AS_IF([test $enable_meta_info_embedding = yes],
- [CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS],
- [AS_ESCAPE([$(EMBED_META.CFLAGS)])], [+])
- CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS],
- [AS_ESCAPE([$(EMBED_META.LFLAGS)])], [+])])
-
-#----------------------------------------------------------------------------
-# Package configuration switches.
-#----------------------------------------------------------------------------
-AC_ARG_ENABLE([debug],
- [AC_HELP_STRING([--enable-debug],
- [build with debugging information (default NO)])],
- [], [enable_debug=no])
-
-AC_MSG_CHECKING([build mode])
-AS_IF([test $enable_debug = yes], [build_mode=debug], [build_mode=optimize])
-AC_MSG_RESULT([$build_mode])
-
-CS_EMIT_BUILD_PROPERTY([MODE], [$build_mode])
-
-#-----------------------------------------------------------------------------
-# Emit install paths and package information.
-#-----------------------------------------------------------------------------
-CS_OUTPUT_INSTALLDIRS
-CS_EMIT_PACKAGEINFO
-
-#----------------------------------------------------------------------------
-# Emit generated files.
-#----------------------------------------------------------------------------
-CS_JAMCONFIG_OUTPUT([Jamconfig])
-AC_CONFIG_FILES([Jamfile])
-AC_OUTPUT
-
-AC_MSG_NOTICE([
-
-Please note that this project uses Jam as its build tool,
-therefore you must type 'jam' to build the project.
-
-Jam home: http://www.perforce.com/jam/jam.html
-Jam source: ftp://ftp.perforce.com/jam/
-])
+#----------------------------------------------------------------------------
+# Autoconf input script. Start the ./autogen.sh script for producing a
+# the configure script.
+#----------------------------------------------------------------------------
+AC_PREREQ([2.54])
+
+#----------------------------------------------------------------------------
+# Initialize Autoconf.
+#----------------------------------------------------------------------------
+AC_INIT(
+ [iaeditor],
+ [0.3],
+ [obr...@gm...])
+CS_PACKAGEINFO(
+ [IAEditor],
+ [Piotr Obrzut],
+ [http://www.sourceforge.net/projects/iaeditor/])
+AC_CONFIG_SRCDIR([mk/jam/build.jam])
+AC_CONFIG_AUX_DIR([mk/autoconf])
+AC_CANONICAL_HOST
+
+#----------------------------------------------------------------------------
+# Setup for the configuration header.
+#----------------------------------------------------------------------------
+AC_CONFIG_HEADERS([config.h])
+
+#----------------------------------------------------------------------------
+# Check for tools.
+#----------------------------------------------------------------------------
+CS_PROG_CC
+AS_IF([test -z "$CC"],
+ [AC_MSG_ERROR([Could not find a usable C compiler.])])
+CS_PROG_CXX
+AS_IF([test -z "$CXX"],
+ [AC_MSG_ERROR([Could not find a usable C++ compiler.])])
+CS_PROG_LINK
+
+# The default RANLIB in Jambase is wrong on some platforms, and is also
+# unsuitable during cross-compilation, so we set the value unconditionally
+# (sixth argument of CS_EMIT_BUILD_PROPERTY).
+AC_PROG_RANLIB
+CS_EMIT_BUILD_PROPERTY([RANLIB], [$RANLIB], [], [], [], [Y])
+
+CS_CHECK_TOOLS([WINDRES], [windres])
+CS_EMIT_BUILD_PROPERTY([CMD.WINDRES], [$WINDRES])
+
+CS_CHECK_PROGS([DOXYGEN], [doxygen])
+CS_EMIT_BUILD_PROPERTY([CMD.DOXYGEN], [$DOXYGEN])
+
+CS_CHECK_TOOLS([DOT], [dot])
+CS_EMIT_BUILD_PROPERTY([CMD.DOT], [$DOT])
+
+CS_CHECK_PROGS([TEXI2DVI], [texi2dvi])
+CS_EMIT_BUILD_PROPERTY([CMD.TEXI2DVI], [$TEXI2DVI])
+
+CS_CHECK_PROGS([TEXI2PDF], [texi2pdf])
+CS_EMIT_BUILD_PROPERTY([CMD.TEXI2PDF], [$TEXI2PDF])
+
+CS_CHECK_PROGS([DVIPS], [dvips])
+CS_EMIT_BUILD_PROPERTY([CMD.DVIPS], [$DVIPS])
+
+CS_CHECK_PROGS([DVIPDF], [dvipdf])
+CS_EMIT_BUILD_PROPERTY([CMD.DVIPDF], [$DVIPDF])
+
+CS_CHECK_PROGS([MAKEINFO], [makeinfo])
+CS_EMIT_BUILD_PROPERTY([CMD.MAKEINFO], [$MAKEINFO])
+
+CS_CHECK_PROGS([INSTALL], [install])
+CS_EMIT_BUILD_PROPERTY([INSTALL], [$INSTALL])
+
+CS_CHECK_LIBTOOL
+CS_EMIT_BUILD_PROPERTY([LIBTOOL], [$LIBTOOL])
+CS_EMIT_BUILD_PROPERTY([APPLE_LIBTOOL], [$APPLE_LIBTOOL])
+
+CS_CHECK_MKDIR
+CS_EMIT_BUILD_PROPERTY([CMD.MKDIR], [$MKDIR])
+CS_EMIT_BUILD_PROPERTY([CMD.MKDIRS], [$MKDIRS])
+
+CS_CHECK_PROGS([PERL], [perl5 perl])
+CS_EMIT_BUILD_PROPERTY([PERL], [$PERL])
+
+CS_CHECK_TEMPLATE_TOOLKIT2([emit])
+
+CS_CHECK_PROGS([SWIG], [swig])
+AS_IF([test -n "$SWIG"],
+ [CS_CHECK_PROG_VERSION([swig], [$SWIG -version 2>&1], [1.3.21],
+ [9.9|.9], [CS_EMIT_BUILD_PROPERTY([CMD.SWIG], [$SWIG])])])
+
+#----------------------------------------------------------------------------
+# Determine system type
+#----------------------------------------------------------------------------
+CS_CHECK_HOST
+
+#----------------------------------------------------------------------------
+# Check for syntax problems / header files
+#----------------------------------------------------------------------------
+# Nothing yet.
+
+#----------------------------------------------------------------------------
+# Check for external libraries
+#----------------------------------------------------------------------------
+CS_CHECK_CPPUNIT([emit])
+
+#------------------------------------------------------------------------------
+# Check for BSD-style socket support. Also test for presence of type
+# socklen_t. Note that we must not include both <winsock.h> and the Unix
+# socket-related headers at the same time on Cygwin even though they both exist
+# since the inclusion of both results in errors about structures and functions
+# defined differently between <winsock.h> and the other headers. Therefore, if
+# <winsock.h> is present, we include only it, otherwise we include the Unix
+# socket-related headers. A related problem also occurs with the check for
+# presence of <winsock.h> on Cygwin, thus this check is handled specially. For
+# this check, the "default-includes" normally used by AC_CHECK_HEADER() are
+# suppressed. This prevents complaints about structures and functions in
+# <winsock.h> being defined differently by <sys/types.h> and <unistd.h>
+#------------------------------------------------------------------------------
+m4_define([cs_socket_flags],
+ [CS_CREATE_TUPLE() \
+ CS_CREATE_TUPLE([], [], [-lsocket]) \
+ CS_CREATE_TUPLE([], [], [-lsocket -lnsl]) \
+ CS_CREATE_TUPLE([], [], [-lwsock32])])
+
+AC_CHECK_HEADERS([winsock.h], [], [], [/* no default includes */])
+
+AC_CHECK_HEADERS(
+ [unistd.h \
+ sys/types.h \
+ sys/socket.h \
+ sys/ioctl.h \
+ netinet/in.h \
+ arpa/inet.h \
+ netdb.h])
+
+CS_CHECK_BUILD([for socket support], [cs_cv_sys_socket],
+ [AC_LANG_PROGRAM(
+ [[#if HAVE_WINSOCK_H
+ #include <winsock.h>
+ #else
+ #if HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
+ #if HAVE_NETINET_IN_H
+ #include <netinet/in.h>
+ #endif
+ #if HAVE_ARPA_INET_H
+ #include <arpa/inet.h>
+ #endif
+ #if HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+ #endif
+ #endif]],
+ [struct in_addr a; inet_ntoa(a); socket(0,0,0);])],
+ [cs_socket_flags], [],
+ [CS_EMIT_BUILD_RESULT([cs_cv_sys_socket], [SOCKET])])
+
+AS_IF([test $cs_cv_sys_socket = yes],
+ [AC_CHECK_TYPE([socklen_t],
+ [CS_HEADER_PROPERTY([CS_HAVE_SOCKLEN_T])],
+ [],
+ [[#if HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+ #if HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
+ #if HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+ #endif
+ #if HAVE_SYS_IOCTL_H
+ #include <sys/ioctl.h>
+ #endif
+ #if HAVE_NETINET_IN_H
+ #include <netinet/in.h>
+ #endif
+ #if HAVE_NETDB_H
+ #include <netdb.h>
+ #endif
+ ]])])
+
+#------------------------------------------------------------------------------
+# Check if STL is available. Although STL is not used heavily in Crystal Space,
+# a few plugin modules take advantage of it, so they need to know if it is
+# available.
+#------------------------------------------------------------------------------
+CS_CHECK_BUILD([for STL], [cs_cv_libstl],
+ [AC_LANG_PROGRAM(
+ [[#include <map>
+ #include <string>]],
+ [[std::map<std::string,int> m; m.begin();]])],
+ [], [C++], [CS_EMIT_BUILD_RESULT([cs_cv_libstl], [STL])])
+
+
+#------------------------------------------------------------------------------
+# Check for wxWidgets. Also check if it was built with OpenGL support since it
+# is required by the Crystal Space wxWidgets canvas.
+#
+# IMPLEMENTATION NOTE
+#
+# On Windows, wx-config's --gl-libs options incorrectly emits a reference to a
+# non-existent library (wxmsw_glxxx.lib). To handle this broken case, we first
+# try the result of --libs and --gl-libs together; if that fails, then we try
+# only --libs augmented with the results of our own OpenGL checks. On more
+# recent WX versions it seems that on Win32 both the libraries from --gl-libs
+# and the OpenGL checks are needed - the last case.
+#------------------------------------------------------------------------------
+CS_CHECK_LIB_WITH([wx],
+ [AC_LANG_PROGRAM(
+ [[#include "wx/wxprec.h"
+ #ifdef __BORLANDC__
+ #pragma hdrstop
+ #endif
+ #ifndef WX_PRECOMP
+ #include "wx/wx.h"
+ #endif
+ ]],
+ [[wxWindow* p = 0; int w,h; p->GetClientSize(&w,&h);]])],
+ [], [C++])
+
+AS_IF([test $cs_cv_libwx = yes],
+ [AS_IF([test -z "$cs_cv_libwx_opengl"],
+ [AS_IF([test -n "$CONFIG_WX"],
+ [cs_cv_libwx_gllibs=CS_RUN_PATH_NORMALIZE([$CONFIG_WX --gl-libs])],
+ [cs_cv_libwx_gllibs=''])])
+ CS_CHECK_BUILD([if wxWidgets is built with OpenGL support],
+ [cs_cv_libwx_opengl],
+ [AC_LANG_PROGRAM(
+ [[#include "wx/wxprec.h"
+ #ifdef __BORLANDC__
+ #pragma hdrstop
+ #endif
+ #ifndef WX_PRECOMP
+ #include "wx/wx.h"
+ #endif
+ #include "wx/glcanvas.h"
+ ]],
+ [wxGLCanvas* f = new wxGLCanvas(0, wxID_ANY, wxPoint()); glVertex3f(0,0,0)])],
+ [CS_CREATE_TUPLE(
+ [$cs_cv_libwx_cflags],
+ [$cs_cv_libwx_lflags],
+ [$cs_cv_libwx_libs $cs_cv_libwx_gllibs]) \
+ CS_CREATE_TUPLE(
+ [$cs_cv_libwx_cflags $cs_cv_libglu_cflags],
+ [$cs_cv_libwx_lflags $cs_cv_libglu_lflags],
+ [$cs_cv_libwx_libs $cs_cv_libglu_libs]) \
+ CS_CREATE_TUPLE(
+ [$cs_cv_libwx_cflags $cs_cv_libglu_cflags],
+ [$cs_cv_libwx_lflags $cs_cv_libglu_lflags],
+ [$cs_cv_libwx_libs $cs_cv_libwx_gllibs $cs_cv_libglu_libs])],
+ [C++])],
+ [cs_cv_libwx_opengl=no])
+
+AS_IF([test $cs_cv_libwx_opengl = yes],
+ [CS_EMIT_BUILD_RESULT([cs_cv_libwx_opengl], [WX])])
+
+AS_IF([test $cs_cv_libwx = yes],
+ [CS_CHECK_BUILD([if wxWidgets is built with wxAUI support],
+ [cs_cv_libwx_aui],
+ [AC_LANG_PROGRAM(
+ [[#include "wx/wxprec.h"
+ #ifdef __BORLANDC__
+ #pragma hdrstop
+ #endif
+ #ifndef WX_PRECOMP
+ #include "wx/wx.h"
+ #endif
+ #include "wx/aui/aui.h"
+ ]],
+ [wxAuiManager mgr; wxWindow* w;
+ mgr.SetManagedWindow(w);
+ mgr.AddPane(w, wxAuiPaneInfo());])],
+ [CS_CREATE_TUPLE(
+ [$cs_cv_libwx_cflags],
+ [$cs_cv_libwx_lflags],
+ [$cs_cv_libwx_libs])],
+ [C++])],
+ [cs_cv_libwx_aui=no])
+
+AS_IF([test $cs_cv_libwx_aui = yes],
+ [CS_EMIT_BUILD_RESULT([cs_cv_libwx_aui], [WX.AUI])])
+
+
+#----------------------------------------------------------------------------
+# Check for Crystal Space (CS)
+#----------------------------------------------------------------------------
+AC_ARG_WITH([cs], [AC_HELP_STRING([--without-cs],
+ [do not look for an installed Crystal Space SDK; this option is useful only
+ if you need to perform routine maintenance tasks, such as generating
+ project files or converting documentation, without having the Crystal Space
+ SDK installed])])
+AS_IF([test -z "$with_cs"], [with_cs=yes])
+
+AS_IF([test $with_cs != no],
+ [CS_PATH_CRYSTAL_EMIT([1.1], [],
+ [AC_MSG_ERROR([
+*** Crystal Space could not be found or was unusable. The latest version is
+*** always available from http://www.crystalspace3d.org/
+*** Also, be sure that you have either installed Crystal Space or set the
+*** CRYSTAL environment variable properly.
+])], [crystalspace], [$cs_opt_libs])])
+
+#----------------------------------------------------------------------------
+# Check for Crystal Entity Layer (CEL)
+#----------------------------------------------------------------------------
+m4_define([cel_desired], [yes])
+CS_EMIT_BUILD_PROPERTY([CEL.DESIRED], [cel_desired])
+m4_if(cel_desired, [yes],
+[AC_ARG_WITH([cel], [AC_HELP_STRING([--without-cel],
+ [do not look for an installed Crystal Entity Layer SDK; this option is useful
+ only if you need to perform routine maintenance tasks, such as generating
+ project files or converting documentation, without having the CEL SDK
+ installed])])
+AS_IF([test -z "$with_cel"], [with_cel=yes])
+
+AS_IF([test $with_cel != no],
+[CS_PATH_CEL_EMIT([1.2], [],
+ [AC_MSG_ERROR([
+*** CEL could not be found or was unusable. The latest version is always
+*** available from http://cel.crystalspace3d.org/
+])])
+AC_DEFINE([USE_CEL], [], [Define to enable CEL.])
+AC_DEFINE_UNQUOTED([CEL_PLUGIN_DIR], ["$CEL_PLUGIN_DIR"],
+ [Define with path to CEL plugins.])
+])])
+
+
+#------------------------------------------------------------------------------
+# Determine whether link libraries should be static or shared.
+#------------------------------------------------------------------------------
+AC_MSG_CHECKING([whether to build shared libraries])
+case $host_os in
+ mingw*|cygwin*|linux*) enable_shared_default=yes ;;
+ *) enable_shared_default=no ;;
+esac
+AC_ARG_ENABLE([shared], [AC_HELP_STRING([--enable-shared],
+ [enable creation of shared libraries (default YES on Win32 and Linux,
+ NO otherwise)])],
+ [], [enable_shared=$enable_shared_default])
+AC_MSG_RESULT([$enable_shared])
+CS_EMIT_BUILD_PROPERTY([BUILD_SHARED_LIBS], [$enable_shared])
+AS_IF([test $enable_shared = yes],
+ [CS_HEADER_PROPERTY([CS_BUILD_SHARED_LIBS])])
+
+
+
+#------------------------------------------------------------------------------
+# Determine if the "make" emulation layer should be synthesized.
+#------------------------------------------------------------------------------
+AC_MSG_CHECKING([whether to emulate makefiles])
+AC_ARG_ENABLE([make-emulation],
+ [AC_HELP_STRING([--enable-make-emulation],
+ [enable emulation layer allowing project to be built with `make', in
+ addition to `jam' (default YES)])],
+ [], [enable_make_emulation=yes])
+AC_MSG_RESULT([$enable_make_emulation])
+
+#------------------------------------------------------------------------------
+# Determine if plugin meta-information should be embedded directly into plugin
+# modules or if it should exist in stand-alone .csplugin files. On Unix,
+# embedding is accomplished via libbfd which carries a GPL license. If your
+# project is compatible with GPL, then set gpl_compatible to "yes". This will
+# cause embedding to be enabled on Unix by default. Otherwise, set it to "no",
+# which will cause embedding to be disabled by default on Unix. (In any event,
+# the user can override the default setting with the
+# --enable-meta-info-embedding option.)
+#------------------------------------------------------------------------------
+m4_define([gpl_compatible], [yes])
+CS_META_INFO_EMBED([emit], gpl_compatible)
+AS_IF([test $enable_meta_info_embedding = yes],
+ [CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS],
+ [AS_ESCAPE([$(EMBED_META.CFLAGS)])], [+])
+ CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS],
+ [AS_ESCAPE([$(EMBED_META.LFLAGS)])], [+])])
+
+#----------------------------------------------------------------------------
+# Package configuration switches.
+#----------------------------------------------------------------------------
+AC_ARG_ENABLE([debug],
+ [AC_HELP_STRING([--enable-debug],
+ [build with debugging information (default NO)])],
+ [], [enable_debug=no])
+
+AC_MSG_CHECKING([build mode])
+AS_IF([test $enable_debug = yes], [build_mode=debug], [build_mode=optimize])
+AC_MSG_RESULT([$build_mode])
+
+CS_EMIT_BUILD_PROPERTY([MODE], [$build_mode])
+
+#-----------------------------------------------------------------------------
+# Emit install paths and package information.
+#-----------------------------------------------------------------------------
+CS_OUTPUT_INSTALLDIRS
+CS_EMIT_PACKAGEINFO
+
+#----------------------------------------------------------------------------
+# Emit generated files.
+#----------------------------------------------------------------------------
+CS_JAMCONFIG_OUTPUT([Jamconfig])
+AC_CONFIG_FILES([Jamfile])
+AC_OUTPUT
+
+AC_MSG_NOTICE([
+
+Please note that this project uses Jam as its build tool,
+therefore you must type 'jam' to build the project.
+
+Jam home: http://www.perforce.com/jam/jam.html
+Jam source: ftp://ftp.perforce.com/jam/
+])
Modified: trunk/msvc/7/appiaeditor.vcproj
===================================================================
--- trunk/msvc/7/appiaeditor.vcproj 2007-11-28 18:02:21 UTC (rev 350)
+++ trunk/msvc/7/appiaeditor.vcproj 2007-12-17 18:17:37 UTC (rev 351)
@@ -53,7 +53,7 @@
OutputFile="..\..\iaeditor.exe"
SubSystem="2"
AdditionalOptions=" "
- AdditionalDependencies="libcrystalspace.lib wxbase28.lib wxmsw28_core.lib wxmsw28_gl.lib opengl32.lib libceltool.lib"
+ AdditionalDependencies="libcrystalspace.lib wxbase28.lib wxmsw28_core.lib wxmsw28_gl.lib opengl32.lib wxmsw28_aui.lib libceltool.lib"
IgnoreImportLibrary="TRUE"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\release7\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\release7\libs;$(CRYSTAL)\libs\csutil\win32\libs;..\..\..\cel\out\release\libs;$(CEL)\out\release\libs;$(CEL)\libs"
@@ -101,7 +101,7 @@
DebugInformationFormat="4"
RuntimeTypeInfo="TRUE"
RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1 WXDEBUG=1;USE_CEL;WIN32"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;USE_CEL;WIN32"
OptimizeForProcessor="1"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include;..\..\..\CS\include;..\..\..\CS\include\csutil\win32;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil\win32;..\..\..\cel\include;$(CEL)\include;$(CEL)\include\cel"
@@ -124,7 +124,7 @@
OutputFile="..\..\iaeditor.exe"
SubSystem="1"
AdditionalOptions=" "
- AdditionalDependencies="libcrystalspace_d.lib wxbase28d.lib wxmsw28d_core.lib wxmsw28d_gl.lib opengl32.lib libceltool_d.lib"
+ AdditionalDependencies="libcrystalspace_d.lib wxbase28d.lib wxmsw28d_core.lib wxmsw28d_gl.lib opengl32.lib wxmsw28d_aui.lib libceltool_d.lib"
IgnoreImportLibrary="TRUE"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\debug7\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\debug7\libs;$(CRYSTAL)\libs\csutil\win32\libs;..\..\..\cel\out\debug\libs;$(CEL)\out\debug\libs;$(CEL)\libs"
@@ -135,7 +135,7 @@
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1 WXDEBUG=1;USE_CEL"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;USE_CEL"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
@@ -149,7 +149,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1 WXDEBUG=1;USE_CEL;PROJECTGEN_VERSION=7"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;USE_CEL;PROJECTGEN_VERSION=7"
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include;..\..\..\CS\include;..\..\..\CS\include\csutil\win32;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil\win32;..\..\..\cel\include;$(CEL)\include;$(CEL)\include\cel"
Culture="1033"/>
<Tool
@@ -166,15 +166,15 @@
RelativePath="..\..\src\apps\editor\application.cpp">
</File>
<File
- RelativePath="..\..\src\apps\editor\gui\iaMainFrame.cpp">
- </File>
- <File
RelativePath="..\..\src\apps\editor\gui\utils\stringutils.cpp">
</File>
<File
RelativePath="..\..\src\apps\editor\gui\utils\typeconv.cpp">
</File>
<File
+ RelativePath="..\..\src\apps\editor\gui\widgets\iaMainFrame.cpp">
+ </File>
+ <File
RelativePath="..\..\src\apps\editor\gui\widgets\iaObjectTree.cpp">
</File>
<File
@@ -215,18 +215,18 @@
RelativePath="..\..\src\apps\editor\gui\gui_common.h">
</File>
<File
- RelativePath="..\..\src\apps\editor\gui\iaMainFrame.h">
- </File>
- <File
RelativePath="..\..\src\apps\editor\gui\utils\stringutils.h">
</File>
<File
RelativePath="..\..\src\apps\editor\gui\utils\typeconv.h">
</File>
<File
- RelativePath="..\..\src\apps\editor\gui\widgets\ia_propgrid.h">
+ RelativePath="..\..\src\apps\editor\gui\widgets\iaMainFrame.h">
</File>
<File
+ RelativePath="..\..\src\apps\editor\gui\widgets\iaObjectsManager.h">
+ </File>
+ <File
RelativePath="..\..\src\apps\editor\gui\widgets\iaObjectTree.h">
</File>
<File
Modified: trunk/msvc/7/libpropgrid.vcproj
===================================================================
--- trunk/msvc/7/libpropgrid.vcproj 2007-11-28 18:02:21 UTC (rev 350)
+++ trunk/msvc/7/libpropgrid.vcproj 2007-12-17 18:17:37 UTC (rev 351)
@@ -49,7 +49,7 @@
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
AdditionalOptions=" "
- AdditionalDependencies="wxbase28.lib wxmsw28_core.lib wxmsw28_gl.lib opengl32.lib"
+ AdditionalDependencies="wxbase28.lib wxmsw28_core.lib wxmsw28_gl.lib opengl32.lib wxmsw28_aui.lib"
IgnoreImportLibrary="TRUE"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -97,7 +97,7 @@
DebugInformationFormat="4"
RuntimeTypeInfo="TRUE"
RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_LIB;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1 WXDEBUG=1;WIN32"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_LIB;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;WIN32"
OptimizeForProcessor="1"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include"
@@ -118,7 +118,7 @@
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
AdditionalOptions=" "
- AdditionalDependencies="wxbase28d.lib wxmsw28d_core.lib wxmsw28d_gl.lib opengl32.lib"
+ AdditionalDependencies="wxbase28d.lib wxmsw28d_core.lib wxmsw28d_gl.lib opengl32.lib wxmsw28d_aui.lib"
IgnoreImportLibrary="TRUE"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -130,7 +130,7 @@
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_LIB;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1 WXDEBUG=1"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_LIB;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
@@ -144,7 +144,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_LIB;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1 WXDEBUG=1;PROJECTGEN_VERSION=7"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_LIB;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;PROJECTGEN_VERSION=7"
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include"
Culture="1033"/>
<Tool
Modified: trunk/msvc/7/wksiaeditor.sln
===================================================================
--- trunk/msvc/7/wksiaeditor.sln 2007-11-28 18:02:21 UTC (rev 350)
+++ trunk/msvc/7/wksiaeditor.sln 2007-12-17 18:17:37 UTC (rev 351)
@@ -1,11 +1,19 @@
Microsoft Visual Studio Solution File, Format Version 7.00
# Visual C++ Express 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appiaeditor", "appiaeditor.vcproj", "{133F3D88-940F-DE6D-3661-AD25DF8A3C9A}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpall_iaeditor", "grpall_iaeditor.vcproj", "{D1D7ECA1-1553-368F-9A83-24C347043389}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpapps_iaeditor", "grpapps_iaeditor.vcproj", "{0C486056-C033-073A-1D07-17098688877C}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpiaeditorall_iaeditor", "grpiaeditorall_iaeditor.vcproj", "{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grplibs_iaeditor", "grplibs_iaeditor.vcproj", "{C4CEA535-48F5-C518-8A72-73A9854CCB60}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpplugins_iaeditor", "grpplugins_iaeditor.vcproj", "{D23A398F-9918-ED87-924E-880E7E75BD53}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpropgrid", "libpropgrid.vcproj", "{D8C59DB7-C610-DEB9-C81D-6E14959A2251}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgbehaviourlayer", "plgbehaviourlayer.vcproj", "{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgcsobjects", "plgcsobjects.vcproj", "{50EFF507-6FE4-9526-36E0-E0DED21E1BBC}"
@@ -26,13 +34,19 @@
ConfigName.1 = Debug
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
- {D1D7ECA1-1553-368F-9A83-24C347043389}.0 = {B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.1 = {50EFF507-6FE4-9526-36E0-E0DED21E1BBC}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.2 = {7EA547E0-DD90-151E-6662-2B9FE705C20B}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.3 = {F8896403-AB60-724A-87CD-F37AB1EC9273}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.4 = {746404B0-722D-8038-F10C-3AAFCB45781B}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.5 = {9D180099-DE41-3EDD-341A-3B3D802181A7}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.6 = {79060465-7CA0-C9D6-62E8-25001BA9FF08}
+ {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.0 = {D8C59DB7-C610-DEB9-C81D-6E14959A2251}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.0 = {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.1 = {D8C59DB7-C610-DEB9-C81D-6E14959A2251}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.2 = {B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.3 = {50EFF507-6FE4-9526-36E0-E0DED21E1BBC}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.4 = {7EA547E0-DD90-151E-6662-2B9FE705C20B}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.5 = {F8896403-AB60-724A-87CD-F37AB1EC9273}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.6 = {746404B0-722D-8038-F10C-3AAFCB45781B}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.7 = {9D180099-DE41-3EDD-341A-3B3D802181A7}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.8 = {79060465-7CA0-C9D6-62E8-25001BA9FF08}
+ {0C486056-C033-073A-1D07-17098688877C}.0 = {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}
+ {B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.0 = {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}
+ {C4CEA535-48F5-C518-8A72-73A9854CCB60}.0 = {D8C59DB7-C610-DEB9-C81D-6E14959A2251}
{D23A398F-9918-ED87-924E-880E7E75BD53}.0 = {B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}
{D23A398F-9918-ED87-924E-880E7E75BD53}.1 = {50EFF507-6FE4-9526-36E0-E0DED21E1BBC}
{D23A398F-9918-ED87-924E-880E7E75BD53}.2 = {7EA547E0-DD90-151E-6662-2B9FE705C20B}
@@ -42,18 +56,34 @@
{D23A398F-9918-ED87-924E-880E7E75BD53}.6 = {79060465-7CA0-C9D6-62E8-25001BA9FF08}
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
+ {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Release.ActiveCfg = Release|Win32
+ {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Release.Build.0 = Release|Win32
+ {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Debug.ActiveCfg = Debug|Win32
+ {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Debug.Build.0 = Debug|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Release.ActiveCfg = Release|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Release.Build.0 = Release|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Debug.ActiveCfg = Debug|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Debug.Build.0 = Debug|Win32
+ {0C486056-C033-073A-1D07-17098688877C}.Release.ActiveCfg = Release|Win32
+ {0C486056-C033-073A-1D07-17098688877C}.Release.Build.0 = Release|Win32
+ {0C486056-C033-073A-1D07-17098688877C}.Debug.ActiveCfg = Debug|Win32
+ {0C486056-C033-073A-1D07-17098688877C}.Debug.Build.0 = Debug|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Release.ActiveCfg = Release|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Release.Build.0 = Release|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Debug.ActiveCfg = Debug|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Debug.Build.0 = Debug|Win32
+ {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Release.ActiveCfg = Release|Win32
+ {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Release.Build.0 = Release|Win32
+ {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Debug.ActiveCfg = Debug|Win32
+ {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Debug.Build.0 = Debug|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Release.ActiveCfg = Release|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Release.Build.0 = Release|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Debug.ActiveCfg = Debug|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Debug.Build.0 = Debug|Win32
+ {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Release.ActiveCfg = Release|Win32
+ {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Release.Build.0 = Release|Win32
+ {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Debug.ActiveCfg = Debug|Win32
+ {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Debug.Build.0 = Debug|Win32
{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}.Release.ActiveCfg = Release|Win32
{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}.Release.Build.0 = Release|Win32
{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}.Debug.ActiveCfg = Debug|Win32
Modified: trunk/msvc/71/appiaeditor.vcproj
===================================================================
--- trunk/msvc/71/appiaeditor.vcproj 2007-11-28 18:02:21 UTC (rev 350)
+++ trunk/msvc/71/appiaeditor.vcproj 2007-12-17 18:17:37 UTC (rev 351)
@@ -53,7 +53,7 @@
OutputFile="..\..\iaeditor.exe"
SubSystem="2"
AdditionalOptions=" "
- AdditionalDependencies="libcrystalspace.lib wxbase28.lib wxmsw28_core.lib wxmsw28_gl.lib opengl32.lib libceltool.lib"
+ AdditionalDependencies="libcrystalspace.lib wxbase28.lib wxmsw28_core.lib wxmsw28_gl.lib opengl32.lib wxmsw28_aui.lib libceltool.lib"
IgnoreImportLibrary="TRUE"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\release71\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\release71\libs;$(CRYSTAL)\libs\csutil\win32\libs;..\..\..\cel\out\release\libs;$(CEL)\out\release\libs;$(CEL)\libs"
@@ -101,7 +101,7 @@
DebugInformationFormat="4"
RuntimeTypeInfo="TRUE"
RuntimeLibrary="3"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1 WXDEBUG=1;USE_CEL;WIN32"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;USE_CEL;WIN32"
OptimizeForProcessor="1"
AdditionalOptions=" "
AdditionalIncludeDirectories=".;..\..;..\..\src;..\..\src\include;..\..\..\CS\include;..\..\..\CS\include\csutil\win32;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil\win32;..\..\..\cel\include;$(CEL)\include;$(CEL)\include\cel"
@@ -124,7 +124,7 @@
OutputFile="..\..\iaeditor.exe"
SubSystem="1"
AdditionalOptions=" "
- AdditionalDependencies="libcrystalspace_d.lib wxbase28d.lib wxmsw28d_core.lib wxmsw28d_gl.lib opengl32.lib libceltool_d.lib"
+ AdditionalDependencies="libcrystalspace_d.lib wxbase28d.lib wxmsw28d_core.lib wxmsw28d_gl.lib opengl32.lib wxmsw28d_aui.lib libceltool_d.lib"
IgnoreImportLibrary="TRUE"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\debug71\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\debug71\libs;$(CRYSTAL)\libs\csutil\win32\libs;..\..\..\cel\out\debug\libs;$(CEL)\out\debug\libs;$(CEL)\libs"
@@ -135,7 +135,7 @@
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1 WXDEBUG=1;USE_CEL"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;USE_CEL"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
@@ -149,7 +149,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1 WXUSINGDLL=1 WXDEBUG=1;USE_CEL;PROJECTGEN_VERSION=71"
+ PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;_WINDOWS;wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;;USE_CEL;PROJECTGEN_VERSION=71"
AdditionalIncl...
[truncated message content] |
|
From: <ob...@us...> - 2007-11-28 18:02:17
|
Revision: 350
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=350&view=rev
Author: obi666
Date: 2007-11-28 10:02:21 -0800 (Wed, 28 Nov 2007)
Log Message:
-----------
Configure script tweaks.
Modified Paths:
--------------
branches/release/V0.2/configure
branches/release/V0.2/configure.ac
Modified: branches/release/V0.2/configure
===================================================================
--- branches/release/V0.2/configure 2007-11-28 18:01:46 UTC (rev 349)
+++ branches/release/V0.2/configure 2007-11-28 18:02:21 UTC (rev 350)
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for csextra 0.0.
+# Generated by GNU Autoconf 2.61 for iaeditor 0.0.
#
-# Report bugs to <jor...@gm...>.
+# Report bugs to <obr...@gm...>.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -574,11 +574,11 @@
SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
-PACKAGE_NAME='csextra'
-PACKAGE_TARNAME='csextra'
+PACKAGE_NAME='iaeditor'
+PACKAGE_TARNAME='iaeditor'
PACKAGE_VERSION='0.0'
-PACKAGE_STRING='csextra 0.0'
-PACKAGE_BUGREPORT='jor...@gm...'
+PACKAGE_STRING='iaeditor 0.0'
+PACKAGE_BUGREPORT='obr...@gm...'
ac_unique_file="mk/jam/build.jam"
# Factoring default headers for most tests.
@@ -702,16 +702,9 @@
ac_ct_PKG_CONFIG
CONFIG_CPPUNIT
ac_ct_CONFIG_CPPUNIT
-PYTHON
CPP
GREP
EGREP
-CONFIG_VERSE
-ac_ct_CONFIG_VERSE
-CONFIG_QT_MT
-ac_ct_CONFIG_QT_MT
-CONFIG_JS
-ac_ct_CONFIG_JS
CONFIG_WX
ac_ct_CONFIG_WX
CRYSTAL
@@ -1241,7 +1234,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures csextra 0.0 to adapt to many kinds of systems.
+\`configure' configures iaeditor 0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1289,7 +1282,7 @@
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/csextra]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/iaeditor]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
@@ -1306,7 +1299,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of csextra 0.0:";;
+ short | recursive ) echo "Configuration of iaeditor 0.0:";;
esac
cat <<\_ACEOF
@@ -1342,16 +1335,6 @@
--with-cppunit=dir specify location of libcppunit if not detected
automatically; searches dir/include, dir/lib, and
dir
- --without-python do not use Python
- --with-verse=dir specify location of libverse if not detected
- automatically; searches dir/include, dir/lib, and
- dir
- --with-qt-mt=dir specify location of libqt-mt if not detected
- automatically; searches dir/include, dir/lib, and
- dir
- --with-js=dir specify location of libjs if not detected
- automatically; searches dir/include, dir/lib, and
- dir
--with-wx=dir specify location of libwx if not detected
automatically; searches dir/include, dir/lib, and
dir
@@ -1392,7 +1375,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to <jor...@gm...>.
+Report bugs to <obr...@gm...>.
_ACEOF
ac_status=$?
fi
@@ -1453,7 +1436,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-csextra configure 0.0
+iaeditor configure 0.0
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1467,7 +1450,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by csextra $as_me 0.0, which was
+It was created by iaeditor $as_me 0.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -1820,9 +1803,9 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-PACKAGE_LONGNAME="Crystal Space Extra Stuff"
- PACKAGE_COPYRIGHT="Jorrit Tyberghein"
- PACKAGE_HOMEPAGE="http://www.crystalspace3d.org"
+PACKAGE_LONGNAME="IAEditor"
+ PACKAGE_COPYRIGHT="Piotr Obrzut"
+ PACKAGE_HOMEPAGE="http://www.sourceforge.net/projects/iaeditor/"
ac_aux_dir=
@@ -7985,1201 +7968,6 @@
fi
- case $host_os in
-
- *)
- if test "" != yes; then
- { echo "$as_me:$LINENO: checking for pthread" >&5
-echo $ECHO_N "checking for pthread... $ECHO_C" >&6; }
-if test "${cs_cv_sys_pthread+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- cs_cflags_save="$CFLAGS"
- cs_lflags_save="$LDFLAGS"
- cs_libs_save="$LIBS"
- cs_build_ok=no
-
-
- for cs_build_item in `echo @@@ | sed 'y% %#%'` \
- `echo @@@-lpthread | sed 'y% %#%'` \
- `echo @@@-lpthread -lrt | sed 'y% %#%'` \
- `echo @-pthread@-pthread@ | sed 'y% %#%'` \
- `echo @-pthread@-pthread@-lpthread | sed 'y% %#%'` \
- `echo @-pthread@-pthread@-lc_r | sed 'y% %#%'`
- do
-
- set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
- { for (i=1; i <= NF; ++i)
- { if ($i == "") print "filler"; else print $i } }'`
- shift
- if test $# -eq 0; then
- cs_dummy=''
-else
- if test "$1" = filler; then
- cs_dummy=''
-else
- cs_dummy=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_cflags_test=''
-else
- if test "$1" = filler; then
- cs_cflags_test=''
-else
- cs_cflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_lflags_test=''
-else
- if test "$1" = filler; then
- cs_lflags_test=''
-else
- cs_lflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_libs_test=''
-else
- if test "$1" = filler; then
- cs_libs_test=''
-else
- cs_libs_test=$1
-fi
-
- shift
-fi
-
- cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
- cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
- cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
-
- CFLAGS="$cs_cflags_test $cs_cflags_save"
- LDFLAGS="$cs_lflags_test $cs_lflags_save"
- LIBS="$cs_libs_test $cs_libs_save"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <pthread.h>
- #include <semaphore.h>
- void* worker(void* p) { (void)p; return p; }
-int
-main ()
-{
-pthread_t tid;
- sem_t sem;
- pthread_create(&tid, 0, worker, 0);
- sem_init(&sem, 0, 0);
- sem_destroy(&sem);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- cs_build_ok=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test $cs_build_ok = yes; then
- break
-fi
-
- done
-
-
- CFLAGS=$cs_cflags_save
- LDFLAGS=$cs_lflags_save
- LIBS=$cs_libs_save
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- if test $cs_build_ok = yes; then
- cs_build_cflags=`echo x$cs_cflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_lflags=`echo x$cs_lflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_libs=`echo x$cs_libs_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_sys_pthread=yes
- cs_cv_sys_pthread_cflags=$cs_build_cflags
- cs_cv_sys_pthread_lflags=$cs_build_lflags
- cs_cv_sys_pthread_libs=$cs_build_libs
-else
- cs_cv_sys_pthread=no
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $cs_cv_sys_pthread" >&5
-echo "${ECHO_T}$cs_cv_sys_pthread" >&6; }
-else
- { echo "$as_me:$LINENO: checking for pthread" >&5
-echo $ECHO_N "checking for pthread... $ECHO_C" >&6; }
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- cs_cflags_save="$CFLAGS"
- cs_lflags_save="$LDFLAGS"
- cs_libs_save="$LIBS"
- cs_build_ok=no
-
-
- for cs_build_item in `echo @@@ | sed 'y% %#%'` \
- `echo @@@-lpthread | sed 'y% %#%'` \
- `echo @@@-lpthread -lrt | sed 'y% %#%'` \
- `echo @-pthread@-pthread@ | sed 'y% %#%'` \
- `echo @-pthread@-pthread@-lpthread | sed 'y% %#%'` \
- `echo @-pthread@-pthread@-lc_r | sed 'y% %#%'`
- do
-
- set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
- { for (i=1; i <= NF; ++i)
- { if ($i == "") print "filler"; else print $i } }'`
- shift
- if test $# -eq 0; then
- cs_dummy=''
-else
- if test "$1" = filler; then
- cs_dummy=''
-else
- cs_dummy=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_cflags_test=''
-else
- if test "$1" = filler; then
- cs_cflags_test=''
-else
- cs_cflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_lflags_test=''
-else
- if test "$1" = filler; then
- cs_lflags_test=''
-else
- cs_lflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_libs_test=''
-else
- if test "$1" = filler; then
- cs_libs_test=''
-else
- cs_libs_test=$1
-fi
-
- shift
-fi
-
- cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
- cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
- cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
-
- CFLAGS="$cs_cflags_test $cs_cflags_save"
- LDFLAGS="$cs_lflags_test $cs_lflags_save"
- LIBS="$cs_libs_test $cs_libs_save"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <pthread.h>
- #include <semaphore.h>
- void* worker(void* p) { (void)p; return p; }
-int
-main ()
-{
-pthread_t tid;
- sem_t sem;
- pthread_create(&tid, 0, worker, 0);
- sem_init(&sem, 0, 0);
- sem_destroy(&sem);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- cs_build_ok=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test $cs_build_ok = yes; then
- break
-fi
-
- done
-
-
- CFLAGS=$cs_cflags_save
- LDFLAGS=$cs_lflags_save
- LIBS=$cs_libs_save
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- if test $cs_build_ok = yes; then
- cs_build_cflags=`echo x$cs_cflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_lflags=`echo x$cs_lflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_libs=`echo x$cs_libs_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_sys_pthread=yes
- cs_cv_sys_pthread_cflags=$cs_build_cflags
- cs_cv_sys_pthread_lflags=$cs_build_lflags
- cs_cv_sys_pthread_libs=$cs_build_libs
-else
- cs_cv_sys_pthread=no
-fi
-
- { echo "$as_me:$LINENO: result: $cs_cv_sys_pthread" >&5
-echo "${ECHO_T}$cs_cv_sys_pthread" >&6; }
-fi
-
- if test $cs_cv_sys_pthread = yes; then
- :
-else
- cs_cv_sys_pthread_cflags=''
- cs_cv_sys_pthread_lflags=''
- cs_cv_sys_pthread_libs=''
-
-fi
-
- ;;
- esac
- if test $cs_cv_sys_pthread = yes; then
- { echo "$as_me:$LINENO: checking for pthread recursive mutexes" >&5
-echo $ECHO_N "checking for pthread recursive mutexes... $ECHO_C" >&6; }
-if test "${cs_cv_sys_pthread_mutex_recursive+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- cs_cflags_save="$CFLAGS"
- cs_lflags_save="$LDFLAGS"
- cs_libs_save="$LIBS"
- cs_build_ok=no
-
-
- for cs_build_item in `echo @-DCS_MUTEX_FEATURE=PTHREAD_MUTEX_RECURSIVE@@ | sed 'y% %#%'` \
- `echo @-DCS_MUTEX_FEATURE=PTHREAD_MUTEX_RECURSIVE_NP@@ | sed 'y% %#%'`
- do
-
- set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
- { for (i=1; i <= NF; ++i)
- { if ($i == "") print "filler"; else print $i } }'`
- shift
- if test $# -eq 0; then
- cs_dummy=''
-else
- if test "$1" = filler; then
- cs_dummy=''
-else
- cs_dummy=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_cflags_test=''
-else
- if test "$1" = filler; then
- cs_cflags_test=''
-else
- cs_cflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_lflags_test=''
-else
- if test "$1" = filler; then
- cs_lflags_test=''
-else
- cs_lflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_libs_test=''
-else
- if test "$1" = filler; then
- cs_libs_test=''
-else
- cs_libs_test=$1
-fi
-
- shift
-fi
-
- cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
- cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
- cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
-
- CFLAGS="$cs_cflags_test $cs_cv_sys_pthread_cflags -D_GNU_SOURCE $cs_cflags_save"
- LDFLAGS="$cs_lflags_test $cs_cv_sys_pthread_lflags $cs_lflags_save"
- LIBS="$cs_libs_test $cs_cv_sys_pthread_libs $cs_libs_save"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <pthread.h>
-int
-main ()
-{
-pthread_mutexattr_t attr;
- pthread_mutexattr_settype(&attr, CS_MUTEX_FEATURE);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- cs_build_ok=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test $cs_build_ok = yes; then
- break
-fi
-
- done
-
-
- CFLAGS=$cs_cflags_save
- LDFLAGS=$cs_lflags_save
- LIBS=$cs_libs_save
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- if test $cs_build_ok = yes; then
- cs_build_cflags=`echo x$cs_cflags_test $cs_cv_sys_pthread_cflags -D_GNU_SOURCE | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_lflags=`echo x$cs_lflags_test $cs_cv_sys_pthread_lflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_libs=`echo x$cs_libs_test $cs_cv_sys_pthread_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_sys_pthread_mutex_recursive=`echo $cs_build_cflags | sed 's/.*\(PTHREAD_MUTEX_RECURSIVE_*N*P*\).*/\1/'`
-else
- cs_cv_sys_pthread_mutex_recursive=no
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $cs_cv_sys_pthread_mutex_recursive" >&5
-echo "${ECHO_T}$cs_cv_sys_pthread_mutex_recursive" >&6; }
-else
- cs_cv_sys_pthread_mutex_recursive=no
-fi
-
-
- { echo "$as_me:$LINENO: checking how to suppress C++ \`long double' warnings" >&5
-echo $ECHO_N "checking how to suppress C++ \`long double' warnings... $ECHO_C" >&6; }
-if test "${cs_cv_prog_cxx_ignore_long_double_ok+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- cs_cflags_save="$CXXFLAGS"
- cs_lflags_save="$LDFLAGS"
- cs_libs_save="$LIBS"
- cs_build_ok=no
-
-
- for cs_build_item in `echo @-Wno-long-double@@ | sed 'y% %#%'`
- do
-
- set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
- { for (i=1; i <= NF; ++i)
- { if ($i == "") print "filler"; else print $i } }'`
- shift
- if test $# -eq 0; then
- cs_dummy=''
-else
- if test "$1" = filler; then
- cs_dummy=''
-else
- cs_dummy=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_cflags_test=''
-else
- if test "$1" = filler; then
- cs_cflags_test=''
-else
- cs_cflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_lflags_test=''
-else
- if test "$1" = filler; then
- cs_lflags_test=''
-else
- cs_lflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_libs_test=''
-else
- if test "$1" = filler; then
- cs_libs_test=''
-else
- cs_libs_test=$1
-fi
-
- shift
-fi
-
- cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
- cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
- cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
-
- CXXFLAGS="$cs_cflags_test $cs_cflags_save"
- LDFLAGS="$cs_lflags_test $cs_lflags_save"
- LIBS="$cs_libs_test $cs_libs_save"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- cs_build_ok=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test $cs_build_ok = yes; then
- break
-fi
-
- done
-
-
- CXXFLAGS=$cs_cflags_save
- LDFLAGS=$cs_lflags_save
- LIBS=$cs_libs_save
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- if test $cs_build_ok = yes; then
- cs_build_cflags=`echo x$cs_cflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_lflags=`echo x$cs_lflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_libs=`echo x$cs_libs_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_prog_cxx_ignore_long_double=`echo x$cs_build_cflags $cs_build_lflags $cs_build_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_prog_cxx_ignore_long_double_ok="$cs_cv_prog_cxx_ignore_long_double"
-else
- cs_cv_prog_cxx_ignore_long_double=''
- cs_cv_prog_cxx_ignore_long_double_ok=no
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_ignore_long_double_ok" >&5
-echo "${ECHO_T}$cs_cv_prog_cxx_ignore_long_double_ok" >&6; }
-
-
-
-# Check whether --with-python was given.
-if test "${with_python+set}" = set; then
- withval=$with_python;
-fi
-
- if test -z "$with_python"; then
- with_python=yes
-fi
-
-
-
- if test "$cs_prog_path_prepared" != yes; then
- cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
- export PATH
-fi
-
- for ac_prog in python
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_PYTHON+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$PYTHON"; then
- ac_cv_prog_PYTHON="$PYTHON" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_PYTHON="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-PYTHON=$ac_cv_prog_PYTHON
-if test -n "$PYTHON"; then
- { echo "$as_me:$LINENO: result: $PYTHON" >&5
-echo "${ECHO_T}$PYTHON" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
- test -n "$PYTHON" && break
-done
-
-
- cs_build_prop_val="$PYTHON"
- cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- if test -n "$cs_build_prop_val"; then
- cs_jamconfig_text="${cs_jamconfig_text}PYTHON ?= \"$cs_build_prop_val\" ;
-"
-fi
-
-
- if test -n "$PYTHON" && test "$with_python" != no; then
- { echo "$as_me:$LINENO: checking for python SDK" >&5
-echo $ECHO_N "checking for python SDK... $ECHO_C" >&6; }
-if test "${cs_cv_python_sdk+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cs_pyver=`{ (echo "$as_me:$LINENO: \$PYTHON -c 'import sys, string; \\
- print string.join(map(str,sys.version_info[:2]),\".\")'") >&5
- ($PYTHON -c 'import sys, string; \
- print string.join(map(str,sys.version_info[:2]),".")') 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }`
- cs_cv_pybase="python${cs_pyver}"
-
- cs_cv_pybase_cflags=`{ (echo "$as_me:$LINENO: \$PYTHON -c \\
- 'import distutils.sysconfig; \\
- print \"-I\" + distutils.sysconfig.get_python_inc()'") >&5
- ($PYTHON -c \
- 'import distutils.sysconfig; \
- print "-I" + distutils.sysconfig.get_python_inc()') 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_pybase_cflags="$cs_cv_pybase_cflags \
- $cs_cv_prog_cxx_ignore_long_double"
-
- # Depending upon platform and installation, link library might
- # reside in "get_python_lib()", "get_python_lib()/config",
- # "${prefix}/lib" (Unix), or "${prefix}/libs" (Windows).
- cs_cv_pybase_syslib=`{ (echo "$as_me:$LINENO: \$PYTHON -c \\
- 'import distutils.sysconfig; \\
- print distutils.sysconfig.get_python_lib(0,1)'") >&5
- ($PYTHON -c \
- 'import distutils.sysconfig; \
- print distutils.sysconfig.get_python_lib(0,1)') 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_pybase_sysprefix=`{ (echo "$as_me:$LINENO: \$PYTHON -c \\
- 'import sys; print sys.prefix'") >&5
- ($PYTHON -c \
- 'import sys; print sys.prefix') 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_pybase_lflags_base=''
- if test -d "$cs_cv_pybase_syslib"; then
- cs_cv_pybase_lflags_base="$cs_cv_pybase_lflags_base -L$cs_cv_pybase_syslib"
-fi
-
- cs_cv_pybase_lflags_ext='$cs_cv_pybase_lflags_base'
- if test -d "$cs_cv_pybase_syslib/config"; then
- cs_cv_pybase_lflags_ext="$cs_cv_pybase_lflags_ext -L$cs_cv_pybase_syslib/config"
-fi
-
- if test -d "$cs_cv_pybase_sysprefix/lib"; then
- cs_cv_pybase_sysprefix_lflags="$cs_cv_pybase_sysprefix_lflags -L$cs_cv_pybase_sysprefix/lib"
-fi
-
- if test -d "$cs_cv_pybase_sysprefix/libs"; then
- cs_cv_pybase_sysprefix_lflags="$cs_cv_pybase_sysprefix_lflags -L$cs_cv_pybase_sysprefix/libs"
-fi
-
-
- cs_cv_pybase_libs=`{ (echo "$as_me:$LINENO: \$PYTHON -c \\
- 'import distutils.sysconfig; \\
- print (distutils.sysconfig.get_config_var(\"LIBS\") or \"\")+\" \"+ \\
- (distutils.sysconfig.get_config_var(\"SYSLIBS\") or \"\")'") >&5
- ($PYTHON -c \
- 'import distutils.sysconfig; \
- print (distutils.sysconfig.get_config_var("LIBS") or "")+" "+ \
- (distutils.sysconfig.get_config_var("SYSLIBS") or "")') 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
-
- cs_cv_python_ext=`{ (echo "$as_me:$LINENO: \$PYTHON -c \\
- 'import distutils.sysconfig; \\
- print (distutils.sysconfig.get_config_var(\"SO\") or \"\")'") >&5
- ($PYTHON -c \
- 'import distutils.sysconfig; \
- print (distutils.sysconfig.get_config_var("SO") or "")') 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }`
-
- if test -n "$cs_pyver" &&
- test -n "$cs_cv_pybase_cflags" &&
- test -n "$cs_cv_pybase_lflags$cs_cv_pybase_sysprefix_lflags"; then
- cs_cv_python_sdk=yes
-else
- cs_cv_python_sdk=no
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $cs_cv_python_sdk" >&5
-echo "${ECHO_T}$cs_cv_python_sdk" >&6; }
-
- # Check if Python SDK is usable. The most common library name is the
- # basename with a few decorations (for example, libpython2.2.a),
- # however some Windows libraries lack the decimal point (for example,
- # libpython22.a or python22.lib), so we must check for both variations.
- # Furthermore, MacOS/X 10.3 supplies a Python.framework, however,
- # earlier releases did not. Instead, Python on MacOS/X pre-10.3 uses a
- # one-level linker namespace, which means that loadable Python modules
- # do not link against the Python library; instead, unresolved symbols
- # in the modules are satisfied automatically by the Python executable
- # when the module is loaded into the executable. For this reason,
- # Python on MacOS/X does not even provide a Python link library. We
- # account for this by trying -bundle, rather than linking against the
- # library.
- if test $cs_cv_python_sdk = yes; then
- cs_build_prop_val="$cs_cv_python_ext"
- cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- if test -n "$cs_build_prop_val"; then
- cs_jamconfig_text="${cs_jamconfig_text}PYTHON.MODULE_EXT ?= \"$cs_build_prop_val\" ;
-"
-fi
-
- cs_pywinlib=`echo "$cs_cv_pybase" | sed 's/\.//g'`
- cs_pyflags="$cs_pyflags `echo @@@$cs_cv_pybase_lflags_base -framework Python | sed 'y% %#%'`"
- cs_pyflags="$cs_pyflags `echo @@@$cs_cv_pybase_sysprefix_lflags -framework Python | sed 'y% %#%'`"
- cs_pyflags="$cs_pyflags `echo @@@$cs_cv_pybase_lflags_ext -framework Python | sed 'y% %#%'`"
-
- cs_pyflags="$cs_pyflags `echo @@@$cs_cv_pybase_lflags_base -l$cs_cv_pybase | sed 'y% %#%'`"
- cs_pyflags="$cs_pyflags `echo @@@$cs_cv_pybase_sysprefix_lflags -l$cs_cv_pybase | sed 'y% %#%'`"
- cs_pyflags="$cs_pyflags `echo @@@$cs_cv_pybase_lflags_ext -l$cs_cv_pybase | sed 'y% %#%'`"
-
- cs_pyflags="$cs_pyflags `echo @@@$cs_cv_pybase_lflags_base -l$cs_pywinlib | sed 'y% %#%'`"
- cs_pyflags="$cs_pyflags `echo @@@$cs_cv_pybase_sysprefix_lflags -l$cs_pywinlib | sed 'y% %#%'`"
- cs_pyflags="$cs_pyflags `echo @@@$cs_cv_pybase_lflags_ext -l$cs_pywinlib | sed 'y% %#%'`"
-
- cs_pyflags="$cs_pyflags `echo @@-bundle -flat_namespace -undefined suppress@$cs_cv_pybase_lflags_base | sed 'y% %#%'`"
- cs_pyflags="$cs_pyflags `echo @@-bundle -flat_namespace -undefined suppress@$cs_cv_pybase_sysprefix_lflags | sed 'y% %#%'`"
- cs_pyflags="$cs_pyflags `echo @@-bundle -flat_namespace -undefined suppress@$cs_cv_pybase_lflags_ext | sed 'y% %#%'`"
-
- if test "" != yes; then
- { echo "$as_me:$LINENO: checking if python SDK is usable" >&5
-echo $ECHO_N "checking if python SDK is usable... $ECHO_C" >&6; }
-if test "${cs_cv_python+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- cs_cflags_save="$CFLAGS"
- cs_lflags_save="$LDFLAGS"
- cs_libs_save="$LIBS"
- cs_build_ok=no
-
-
- for cs_build_item in $cs_pyflags
- do
-
- set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
- { for (i=1; i <= NF; ++i)
- { if ($i == "") print "filler"; else print $i } }'`
- shift
- if test $# -eq 0; then
- cs_dummy=''
-else
- if test "$1" = filler; then
- cs_dummy=''
-else
- cs_dummy=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_cflags_test=''
-else
- if test "$1" = filler; then
- cs_cflags_test=''
-else
- cs_cflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_lflags_test=''
-else
- if test "$1" = filler; then
- cs_lflags_test=''
-else
- cs_lflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_libs_test=''
-else
- if test "$1" = filler; then
- cs_libs_test=''
-else
- cs_libs_test=$1
-fi
-
- shift
-fi
-
- cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
- cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
- cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
-
- CFLAGS="$cs_cflags_test $cs_cv_pybase_cflags $cs_cv_sys_pthread_cflags $cs_cflags_save"
- LDFLAGS="$cs_lflags_test $cs_cv_sys_pthread_lflags $cs_lflags_save"
- LIBS="$cs_libs_test $cs_cv_pybase_libs $cs_cv_sys_pthread_libs $cs_libs_save"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <Python.h>
-int
-main ()
-{
-Py_Initialize(); Py_Finalize();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- cs_build_ok=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test $cs_build_ok = yes; then
- break
-fi
-
- done
-
-
- CFLAGS=$cs_cflags_save
- LDFLAGS=$cs_lflags_save
- LIBS=$cs_libs_save
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- if test $cs_build_ok = yes; then
- cs_build_cflags=`echo x$cs_cflags_test $cs_cv_pybase_cflags $cs_cv_sys_pthread_cflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_lflags=`echo x$cs_lflags_test $cs_cv_sys_pthread_lflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_libs=`echo x$cs_libs_test $cs_cv_pybase_libs $cs_cv_sys_pthread_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_python=yes
- cs_cv_python_cflags=$cs_build_cflags
- cs_cv_python_lflags=$cs_build_lflags
- cs_cv_python_libs=$cs_build_libs
-else
- cs_cv_python=no
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $cs_cv_python" >&5
-echo "${ECHO_T}$cs_cv_python" >&6; }
-else
- { echo "$as_me:$LINENO: checking if python SDK is usable" >&5
-echo $ECHO_N "checking if python SDK is usable... $ECHO_C" >&6; }
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- cs_cflags_save="$CFLAGS"
- cs_lflags_save="$LDFLAGS"
- cs_libs_save="$LIBS"
- cs_build_ok=no
-
-
- for cs_build_item in $cs_pyflags
- do
-
- set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
- { for (i=1; i <= NF; ++i)
- { if ($i == "") print "filler"; else print $i } }'`
- shift
- if test $# -eq 0; then
- cs_dummy=''
-else
- if test "$1" = filler; then
- cs_dummy=''
-else
- cs_dummy=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_cflags_test=''
-else
- if test "$1" = filler; then
- cs_cflags_test=''
-else
- cs_cflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_lflags_test=''
-else
- if test "$1" = filler; then
- cs_lflags_test=''
-else
- cs_lflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_libs_test=''
-else
- if test "$1" = filler; then
- cs_libs_test=''
-else
- cs_libs_test=$1
-fi
-
- shift
-fi
-
- cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
- cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
- cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
-
- CFLAGS="$cs_cflags_test $cs_cv_pybase_cflags $cs_cv_sys_pthread_cflags $cs_cflags_save"
- LDFLAGS="$cs_lflags_test $cs_cv_sys_pthread_lflags $cs_lflags_save"
- LIBS="$cs_libs_test $cs_cv_pybase_libs $cs_cv_sys_pthread_libs $cs_libs_save"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <Python.h>
-int
-main ()
-{
-Py_Initialize(); Py_Finalize();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- cs_build_ok=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test $cs_build_ok = yes; then
- break
-fi
-
- done
-
-
- CFLAGS=$cs_cflags_save
- LDFLAGS=$cs_lflags_save
- LIBS=$cs_libs_save
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- if test $cs_build_ok = yes; then
- cs_build_cflags=`echo x$cs_cflags_test $cs_cv_pybase_cflags $cs_cv_sys_pthread_cflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_lflags=`echo x$cs_lflags_test $cs_cv_sys_pthread_lflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_libs=`echo x$cs_libs_test $cs_cv_pybase_libs $cs_cv_sys_pthread_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_python=yes
- cs_cv_python_cflags=$cs_build_cflags
- cs_cv_python_lflags=$cs_build_lflags
- cs_cv_python_libs=$cs_build_libs
-else
- cs_cv_python=no
-fi
-
- { echo "$as_me:$LINENO: result: $cs_cv_python" >&5
-echo "${ECHO_T}$cs_cv_python" >&6; }
-fi
-
- if test $cs_cv_python = yes; then
- if test "$cs_cv_python" = yes; then
- cs_build_prop_val="yes"
- cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- if test -n "$cs_build_prop_val"; then
- cs_jamconfig_text="${cs_jamconfig_text}PYTHON.AVAILABLE ?= \"$cs_build_prop_val\" ;
-"
-fi
-
- cs_build_prop_val="$cs_cv_python_cflags"
- cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- if test -n "$cs_build_prop_val"; then
- cs_jamconfig_text="${cs_jamconfig_text}PYTHON.CFLAGS ?= \"$cs_build_prop_val\" ;
-"
-fi
-
- cs_build_prop_val="$cs_cv_python_lflags $cs_cv_python_libs"
- cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- if test -n "$cs_build_prop_val"; then
- cs_jamconfig_text="${cs_jamconfig_text}PYTHON.LFLAGS ?= \"$cs_build_prop_val\" ;
-"
-fi
-
-fi
-
-else
- cs_cv_python_cflags=''
- cs_cv_python_lflags=''
- cs_cv_python_libs=''
-
-fi
-
-else
- cs_cv_python=no
-fi
-
-else
- cs_cv_python=no
-fi
-
-
#------------------------------------------------------------------------------
# Check for BSD-style socket support. Also test for presence of type
# socklen_t. Note that we must not include both <winsock.h> and the Unix
@@ -10019,9 +8807,9 @@
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to jor...@gm... ##
-## ------------------------------------------ ##
+## ------------------------------------- ##
+## Report this to obr...@gm... ##
+## ------------------------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
@@ -10500,1615 +9288,6 @@
fi
-# Check Verse
-
-# Check whether --with-verse was given.
-if test "${with_verse+set}" = set; then
- withval=$with_verse;
-fi
-
-
- # Backward compatibility: Recognize --with-libverse as alias for --with-verse.
- if test -n "$with_libverse" &&
- test -z "$with_verse"; then
- with_verse="$with_libverse"
-fi
-
-
- if test -z "$with_verse"; then
- with_verse=yes
-fi
-
- if test "$with_verse" != no; then
- # If --with-verse value is same as cached value, then assume other
- # cached values are also valid; otherwise, ignore all cached values.
- if test "$with_verse" != "$cs_cv_with_verse"; then
- cs_ignore_cache=yes
-else
- cs_ignore_cache=no
-fi
-
-
- cs_check_lib_flags=''
- if test $with_verse = yes; then
- if test "$cs_prog_pkg_config_checked" != yes; then
-
- if test "$cs_prog_path_prepared" != yes; then
- cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
- export PATH
-fi
-
- if test -n "$ac_tool_prefix"; then
- for ac_prog in pkg-config
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$PKG_CONFIG"; then
- ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_PKG_CONFIG="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
- { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
- test -n "$PKG_CONFIG" && break
- done
-fi
-if test -z "$PKG_CONFIG"; then
- ac_ct_PKG_CONFIG=$PKG_CONFIG
- for ac_prog in pkg-config
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_PKG_CONFIG"; then
- ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_PKG_CONFIG="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
-if test -n "$ac_ct_PKG_CONFIG"; then
- { echo "$as_me:$LINENO: result: $ac_ct_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_ct_PKG_CONFIG" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
- test -n "$ac_ct_PKG_CONFIG" && break
-done
-
- if test "x$ac_ct_PKG_CONFIG" = x; then
- PKG_CONFIG=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to aut...@gn...." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to aut...@gn...." >&2;}
-ac_tool_warned=yes ;;
-esac
- PKG_CONFIG=$ac_ct_PKG_CONFIG
- fi
-fi
-
- PKG_CONFIG_PATH="/usr/local/lib/pkgconfig$PATH_SEPARATOR/sw/lib/pkgconfig$PATH_SEPARATOR/opt/local/lib/pkgconfig$PATH_SEPARATOR/opt/lib/pkgconfig$PATH_SEPARATOR$PKG_CONFIG_PATH"
- export PKG_CONFIG_PATH
- cs_prog_pkg_config_checked=yes
-fi
-
- if test -z "$cs_cv_prog_pkg_config_ok"; then
- if test -n "$PKG_CONFIG"; then
- if $PKG_CONFIG --atleast-pkgconfig-version=0.9.0; then
- cs_cv_prog_pkg_config_ok=yes
-else
- cs_cv_prog_pkg_config_ok=no
-fi
-
-else
- cs_cv_prog_pkg_config_ok=no
-fi
-
-fi
-
- if test $cs_cv_prog_pkg_config_ok = yes; then
- { echo "$as_me:$LINENO: checking if $PKG_CONFIG recognizes verse" >&5
-echo $ECHO_N "checking if $PKG_CONFIG recognizes verse... $ECHO_C" >&6; }
-if test "${cs_cv_prog_pkg_config_verse+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if $PKG_CONFIG --exists verse; then
- cs_cv_prog_pkg_config_verse=yes
-else
- cs_cv_prog_pkg_config_verse=no
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_pkg_config_verse" >&5
-echo "${ECHO_T}$cs_cv_prog_pkg_config_verse" >&6; }
- if test $cs_cv_prog_pkg_config_verse = yes; then
- if test -z "$cs_cv_prog_pkg_config_verse_flags"; then
- cs_check_lib_cflag=`{ (echo "$as_me:$LINENO: \$PKG_CONFIG --cflags verse") >&5
- ($PKG_CONFIG --cflags verse) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_check_lib_lflag=''
- cs_check_lib_libs=`{ (echo "$as_me:$LINENO: \$PKG_CONFIG --libs verse") >&5
- ($PKG_CONFIG --libs verse) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_prog_pkg_config_verse_flags=`echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_libs | sed 'y% %#%'`
-fi
-
- cs_check_lib_flags="$cs_check_lib_flags $cs_cv_prog_pkg_config_verse_flags"
-fi
-
-fi
-
-
- if test "$cs_prog_path_prepared" != yes; then
- cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
- export PATH
-fi
-
- if test -n "$ac_tool_prefix"; then
- for ac_prog in verse-config
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CONFIG_VERSE+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CONFIG_VERSE"; then
- ac_cv_prog_CONFIG_VERSE="$CONFIG_VERSE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CONFIG_VERSE="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CONFIG_VERSE=$ac_cv_prog_CONFIG_VERSE
-if test -n "$CONFIG_VERSE"; then
- { echo "$as_me:$LINENO: result: $CONFIG_VERSE" >&5
-echo "${ECHO_T}$CONFIG_VERSE" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
- test -n "$CONFIG_VERSE" && break
- done
-fi
-if test -z "$CONFIG_VERSE"; then
- ac_ct_CONFIG_VERSE=$CONFIG_VERSE
- for ac_prog in verse-config
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CONFIG_VERSE+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_CONFIG_VERSE"; then
- ac_cv_prog_ac_ct_CONFIG_VERSE="$ac_ct_CONFIG_VERSE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CONFIG_VERSE="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CONFIG_VERSE=$ac_cv_prog_ac_ct_CONFIG_VERSE
-if test -n "$ac_ct_CONFIG_VERSE"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CONFIG_VERSE" >&5
-echo "${ECHO_T}$ac_ct_CONFIG_VERSE" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
- test -n "$ac_ct_CONFIG_VERSE" && break
-done
-
- if test "x$ac_ct_CONFIG_VERSE" = x; then
- CONFIG_VERSE=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to aut...@gn...." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to aut...@gn...." >&2;}
-ac_tool_warned=yes ;;
-esac
- CONFIG_VERSE=$ac_ct_CONFIG_VERSE
- fi
-fi
-
- if test -n "$CONFIG_VERSE"; then
- if test -z "$cs_cv_prog_config_verse_ok"; then
- if $CONFIG_VERSE --cflags --libs >/dev/null 2>&1; then
- cs_cv_prog_config_verse_ok=yes
-else
- cs_cv_prog_config_verse_ok=no
-fi
-
-fi
-
- if test $cs_cv_prog_config_verse_ok = yes; then
- if test -z "$cs_cv_prog_config_verse_flags"; then
- cs_check_lib_cflag=`{ (echo "$as_me:$LINENO: \$CONFIG_VERSE --cflags ") >&5
- ($CONFIG_VERSE --cflags ) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_check_lib_lflag=''
- cs_check_lib_libs=`{ (echo "$as_me:$LINENO: \$CONFIG_VERSE --libs ") >&5
- ($CONFIG_VERSE --libs ) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_prog_config_verse_flags=`echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_libs | sed 'y% %#%'`
-fi
-
- cs_check_lib_flags="$cs_check_lib_flags $cs_cv_prog_config_verse_flags"
-fi
-
-fi
-
-
-fi
-
-
- if test $with_verse != yes; then
- cs_check_lib_paths=$with_verse
-else
- cs_check_lib_paths="| /usr/local/include|/usr/local/lib \
- /sw/include|/sw/lib \
- /opt/local/include|/opt/local/lib \
- /opt/include|/opt/lib "
-fi
-
- for cs_lib_item in $cs_check_lib_paths
- do
- case $cs_lib_item in
- *\|*)
- set filler `echo "$cs_lib_item" | awk 'BEGIN { FS="|" }
- { for (i=1; i <= NF; ++i)
- { if ($i == "") print "filler"; else print $i } }'`
- shift
- if test $# -eq 0; then
- cs_check_incdir=''
-else
- if test "$1" = filler; then
- cs_check_incdir=''
-else
- cs_check_incdir=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_check_libdir=''
-else
- if test "$1" = filler; then
- cs_check_libdir=''
-else
- cs_check_libdir=$1
-fi
-
- shift
-fi
-
- if test -n "$cs_check_incdir"; then
- cs_check_lib_cflag="-I$cs_check_incdir"
-else
- cs_check_lib_cflag=''
-fi
-
- if test -n "$cs_check_libdir"; then
- cs_check_lib_lflag="-L$cs_check_libdir"
-else
- cs_check_lib_lflag=''
-fi
-
- if test -n "verse"; then
- cs_check_lib_libs="-lverse"
- cs_check_lib_framework="-framework verse"
-else
- cs_check_lib_libs=''
- cs_check_lib_framework=''
-fi
-
- cs_check_lib_flags="$cs_check_lib_flags
- `echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_framework | sed 'y% %#%'`
- `echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_libs | sed 'y% %#%'`"
- ;;
- *) if test -n "$cs_lib_item/include"; then
- cs_check_lib_cflag="-I$cs_lib_item/include"
-else
- cs_check_lib_cflag=''
-fi
-
- if test -n "$cs_lib_item/lib"; then
- cs_check_lib_lflag="-L$cs_lib_item/lib"
-else
- cs_check_lib_lflag=''
-fi
-
- if test -n "verse"; then
- cs_check_lib_libs="-lverse"
- cs_check_lib_framework="-framework verse"
-else
- cs_check_lib_libs=''
- cs_check_lib_framework=''
-fi
-
- cs_check_lib_flags="$cs_check_lib_flags
- `echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_framework | sed 'y% %#%'`
- `echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_libs | sed 'y% %#%'`"
- if test -n "$cs_lib_item"; then
- cs_check_lib_cflag="-I$cs_lib_item"
-else
- cs_check_lib_cflag=''
-fi
-
- if test -n "$cs_lib_item"; then
- cs_check_lib_lflag="-L$cs_lib_item"
-else
- cs_check_lib_lflag=''
-fi
-
- if test -n "verse"; then
- cs_check_lib_libs="-lverse"
- cs_check_lib_framework="-framework verse"
-else
- cs_check_lib_libs=''
- cs_check_lib_framework=''
-fi
-
- cs_check_lib_flags="$cs_check_lib_flags
- `echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_framework | sed 'y% %#%'`
- `echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_libs | sed 'y% %#%'`"
- ;;
- esac
- done
-
-
- if test "$cs_ignore_cache" != yes; then
- { echo "$as_me:$LINENO: checking for libverse" >&5
-echo $ECHO_N "checking for libverse... $ECHO_C" >&6; }
-if test "${cs_cv_libverse+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- cs_cflags_save="$CFLAGS"
- cs_lflags_save="$LDFLAGS"
- cs_libs_save="$LIBS"
- cs_build_ok=no
-
-
- for cs_build_item in $cs_check_lib_flags
- do
-
- set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
- { for (i=1; i <= NF; ++i)
- { if ($i == "") print "filler"; else print $i } }'`
- shift
- if test $# -eq 0; then
- cs_dummy=''
-else
- if test "$1" = filler; then
- cs_dummy=''
-else
- cs_dummy=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_cflags_test=''
-else
- if test "$1" = filler; then
- cs_cflags_test=''
-else
- cs_cflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_lflags_test=''
-else
- if test "$1" = filler; then
- cs_lflags_test=''
-else
- cs_lflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_libs_test=''
-else
- if test "$1" = filler; then
- cs_libs_test=''
-else
- cs_libs_test=$1
-fi
-
- shift
-fi
-
- cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
- cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
- cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
-
- CFLAGS="$cs_cflags_test $cs_cflags_save"
- LDFLAGS="$cs_lflags_test $cs_lflags_save"
- LIBS="$cs_libs_test $cs_cv_sys_socket_libs $cs_libs_save"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include "verse.h"
-int
-main ()
-{
-verse_send_connect("","","",0)
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- cs_build_ok=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test $cs_build_ok = yes; then
- break
-fi
-
- done
-
-
- CFLAGS=$cs_cflags_save
- LDFLAGS=$cs_lflags_save
- LIBS=$cs_libs_save
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- if test $cs_build_ok = yes; then
- cs_build_cflags=`echo x$cs_cflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_lflags=`echo x$cs_lflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_libs=`echo x$cs_libs_test $cs_cv_sys_socket_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_libverse=yes
- cs_cv_libverse_cflags=$cs_build_cflags
- cs_cv_libverse_lflags=$cs_build_lflags
- cs_cv_libverse_libs=$cs_build_libs
-else
- cs_cv_libverse=no
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $cs_cv_libverse" >&5
-echo "${ECHO_T}$cs_cv_libverse" >&6; }
-else
- { echo "$as_me:$LINENO: checking for libverse" >&5
-echo $ECHO_N "checking for libverse... $ECHO_C" >&6; }
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- cs_cflags_save="$CFLAGS"
- cs_lflags_save="$LDFLAGS"
- cs_libs_save="$LIBS"
- cs_build_ok=no
-
-
- for cs_build_item in $cs_check_lib_flags
- do
-
- set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
- { for (i=1; i <= NF; ++i)
- { if ($i == "") print "filler"; else print $i } }'`
- shift
- if test $# -eq 0; then
- cs_dummy=''
-else
- if test "$1" = filler; then
- cs_dummy=''
-else
- cs_dummy=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_cflags_test=''
-else
- if test "$1" = filler; then
- cs_cflags_test=''
-else
- cs_cflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_lflags_test=''
-else
- if test "$1" = filler; then
- cs_lflags_test=''
-else
- cs_lflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_libs_test=''
-else
- if test "$1" = filler; then
- cs_libs_test=''
-else
- cs_libs_test=$1
-fi
-
- shift
-fi
-
- cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
- cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
- cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
-
- CFLAGS="$cs_cflags_test $cs_cflags_save"
- LDFLAGS="$cs_lflags_test $cs_lflags_save"
- LIBS="$cs_libs_test $cs_cv_sys_socket_libs $cs_libs_save"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include "verse.h"
-int
-main ()
-{
-verse_send_connect("","","",0)
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- cs_build_ok=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test $cs_build_ok = yes; then
- break
-fi
-
- done
-
-
- CFLAGS=$cs_cflags_save
- LDFLAGS=$cs_lflags_save
- LIBS=$cs_libs_save
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- if test $cs_build_ok = yes; then
- cs_build_cflags=`echo x$cs_cflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_lflags=`echo x$cs_lflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_libs=`echo x$cs_libs_test $cs_cv_sys_socket_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_libverse=yes
- cs_cv_libverse_cflags=$cs_build_cflags
- cs_cv_libverse_lflags=$cs_build_lflags
- cs_cv_libverse_libs=$cs_build_libs
-else
- cs_cv_libverse=no
-fi
-
- { echo "$as_me:$LINENO: result: $cs_cv_libverse" >&5
-echo "${ECHO_T}$cs_cv_libverse" >&6; }
-fi
-
- if test $cs_cv_libverse = yes; then
- :
-else
- cs_cv_libverse_cflags=''
- cs_cv_libverse_lflags=''
- cs_cv_libverse_libs=''
-
-fi
-
-else
- cs_cv_libverse=no
-fi
-
-
- cs_cv_with_verse="$with_verse"
- if test "$cs_cv_libverse" = yes; then
- if test "$cs_cv_libverse" = yes; then
- cs_build_prop_val="yes"
- cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- if test -n "$cs_build_prop_val"; then
- cs_jamconfig_text="${cs_jamconfig_text}VERSE.AVAILABLE ?= \"$cs_build_prop_val\" ;
-"
-fi
-
- cs_build_prop_val="$cs_cv_libverse_cflags"
- cs_build_prop_val=`ec...
[truncated message content] |
|
From: <ob...@us...> - 2007-11-28 18:01:46
|
Revision: 349
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=349&view=rev
Author: obi666
Date: 2007-11-28 10:01:46 -0800 (Wed, 28 Nov 2007)
Log Message:
-----------
Configure script tweaks.
Modified Paths:
--------------
trunk/configure
trunk/configure.ac
Modified: trunk/configure
===================================================================
--- trunk/configure 2007-10-10 10:11:48 UTC (rev 348)
+++ trunk/configure 2007-11-28 18:01:46 UTC (rev 349)
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for csextra 0.0.
+# Generated by GNU Autoconf 2.61 for iaeditor 0.0.
#
-# Report bugs to <jor...@gm...>.
+# Report bugs to <obr...@gm...>.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -574,11 +574,11 @@
SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
-PACKAGE_NAME='csextra'
-PACKAGE_TARNAME='csextra'
+PACKAGE_NAME='iaeditor'
+PACKAGE_TARNAME='iaeditor'
PACKAGE_VERSION='0.0'
-PACKAGE_STRING='csextra 0.0'
-PACKAGE_BUGREPORT='jor...@gm...'
+PACKAGE_STRING='iaeditor 0.0'
+PACKAGE_BUGREPORT='obr...@gm...'
ac_unique_file="mk/jam/build.jam"
# Factoring default headers for most tests.
@@ -702,16 +702,9 @@
ac_ct_PKG_CONFIG
CONFIG_CPPUNIT
ac_ct_CONFIG_CPPUNIT
-PYTHON
CPP
GREP
EGREP
-CONFIG_VERSE
-ac_ct_CONFIG_VERSE
-CONFIG_QT_MT
-ac_ct_CONFIG_QT_MT
-CONFIG_JS
-ac_ct_CONFIG_JS
CONFIG_WX
ac_ct_CONFIG_WX
CRYSTAL
@@ -1241,7 +1234,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures csextra 0.0 to adapt to many kinds of systems.
+\`configure' configures iaeditor 0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1289,7 +1282,7 @@
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/csextra]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/iaeditor]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
@@ -1306,7 +1299,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of csextra 0.0:";;
+ short | recursive ) echo "Configuration of iaeditor 0.0:";;
esac
cat <<\_ACEOF
@@ -1320,6 +1313,10 @@
(default YES)
--enable-celtest verify that the CEL SDK is actually usable (default
YES)
+ --enable-shared enable creation of shared libraries (default YES on
+ Win32 and Linux, NO otherwise)
+ --enable-make-emulation enable emulation layer allowing project to be built
+ with `make', in addition to `jam' (default YES)
--enable-meta-info-embedding
store plugin meta-information directly inside plugin
modules if supported by platform; if disabled,
@@ -1342,16 +1339,6 @@
--with-cppunit=dir specify location of libcppunit if not detected
automatically; searches dir/include, dir/lib, and
dir
- --without-python do not use Python
- --with-verse=dir specify location of libverse if not detected
- automatically; searches dir/include, dir/lib, and
- dir
- --with-qt-mt=dir specify location of libqt-mt if not detected
- automatically; searches dir/include, dir/lib, and
- dir
- --with-js=dir specify location of libjs if not detected
- automatically; searches dir/include, dir/lib, and
- dir
--with-wx=dir specify location of libwx if not detected
automatically; searches dir/include, dir/lib, and
dir
@@ -1392,7 +1379,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to <jor...@gm...>.
+Report bugs to <obr...@gm...>.
_ACEOF
ac_status=$?
fi
@@ -1453,7 +1440,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-csextra configure 0.0
+iaeditor configure 0.0
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1467,7 +1454,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by csextra $as_me 0.0, which was
+It was created by iaeditor $as_me 0.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -1820,9 +1807,9 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-PACKAGE_LONGNAME="Crystal Space Extra Stuff"
- PACKAGE_COPYRIGHT="Jorrit Tyberghein"
- PACKAGE_HOMEPAGE="http://www.crystalspace3d.org"
+PACKAGE_LONGNAME="IAEditor"
+ PACKAGE_COPYRIGHT="Piotr Obrzut"
+ PACKAGE_HOMEPAGE="http://www.sourceforge.net/projects/iaeditor/"
ac_aux_dir=
@@ -7985,1201 +7972,6 @@
fi
- case $host_os in
-
- *)
- if test "" != yes; then
- { echo "$as_me:$LINENO: checking for pthread" >&5
-echo $ECHO_N "checking for pthread... $ECHO_C" >&6; }
-if test "${cs_cv_sys_pthread+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- cs_cflags_save="$CFLAGS"
- cs_lflags_save="$LDFLAGS"
- cs_libs_save="$LIBS"
- cs_build_ok=no
-
-
- for cs_build_item in `echo @@@ | sed 'y% %#%'` \
- `echo @@@-lpthread | sed 'y% %#%'` \
- `echo @@@-lpthread -lrt | sed 'y% %#%'` \
- `echo @-pthread@-pthread@ | sed 'y% %#%'` \
- `echo @-pthread@-pthread@-lpthread | sed 'y% %#%'` \
- `echo @-pthread@-pthread@-lc_r | sed 'y% %#%'`
- do
-
- set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
- { for (i=1; i <= NF; ++i)
- { if ($i == "") print "filler"; else print $i } }'`
- shift
- if test $# -eq 0; then
- cs_dummy=''
-else
- if test "$1" = filler; then
- cs_dummy=''
-else
- cs_dummy=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_cflags_test=''
-else
- if test "$1" = filler; then
- cs_cflags_test=''
-else
- cs_cflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_lflags_test=''
-else
- if test "$1" = filler; then
- cs_lflags_test=''
-else
- cs_lflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_libs_test=''
-else
- if test "$1" = filler; then
- cs_libs_test=''
-else
- cs_libs_test=$1
-fi
-
- shift
-fi
-
- cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
- cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
- cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
-
- CFLAGS="$cs_cflags_test $cs_cflags_save"
- LDFLAGS="$cs_lflags_test $cs_lflags_save"
- LIBS="$cs_libs_test $cs_libs_save"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <pthread.h>
- #include <semaphore.h>
- void* worker(void* p) { (void)p; return p; }
-int
-main ()
-{
-pthread_t tid;
- sem_t sem;
- pthread_create(&tid, 0, worker, 0);
- sem_init(&sem, 0, 0);
- sem_destroy(&sem);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- cs_build_ok=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test $cs_build_ok = yes; then
- break
-fi
-
- done
-
-
- CFLAGS=$cs_cflags_save
- LDFLAGS=$cs_lflags_save
- LIBS=$cs_libs_save
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- if test $cs_build_ok = yes; then
- cs_build_cflags=`echo x$cs_cflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_lflags=`echo x$cs_lflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_libs=`echo x$cs_libs_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_sys_pthread=yes
- cs_cv_sys_pthread_cflags=$cs_build_cflags
- cs_cv_sys_pthread_lflags=$cs_build_lflags
- cs_cv_sys_pthread_libs=$cs_build_libs
-else
- cs_cv_sys_pthread=no
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $cs_cv_sys_pthread" >&5
-echo "${ECHO_T}$cs_cv_sys_pthread" >&6; }
-else
- { echo "$as_me:$LINENO: checking for pthread" >&5
-echo $ECHO_N "checking for pthread... $ECHO_C" >&6; }
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- cs_cflags_save="$CFLAGS"
- cs_lflags_save="$LDFLAGS"
- cs_libs_save="$LIBS"
- cs_build_ok=no
-
-
- for cs_build_item in `echo @@@ | sed 'y% %#%'` \
- `echo @@@-lpthread | sed 'y% %#%'` \
- `echo @@@-lpthread -lrt | sed 'y% %#%'` \
- `echo @-pthread@-pthread@ | sed 'y% %#%'` \
- `echo @-pthread@-pthread@-lpthread | sed 'y% %#%'` \
- `echo @-pthread@-pthread@-lc_r | sed 'y% %#%'`
- do
-
- set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
- { for (i=1; i <= NF; ++i)
- { if ($i == "") print "filler"; else print $i } }'`
- shift
- if test $# -eq 0; then
- cs_dummy=''
-else
- if test "$1" = filler; then
- cs_dummy=''
-else
- cs_dummy=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_cflags_test=''
-else
- if test "$1" = filler; then
- cs_cflags_test=''
-else
- cs_cflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_lflags_test=''
-else
- if test "$1" = filler; then
- cs_lflags_test=''
-else
- cs_lflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_libs_test=''
-else
- if test "$1" = filler; then
- cs_libs_test=''
-else
- cs_libs_test=$1
-fi
-
- shift
-fi
-
- cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
- cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
- cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
-
- CFLAGS="$cs_cflags_test $cs_cflags_save"
- LDFLAGS="$cs_lflags_test $cs_lflags_save"
- LIBS="$cs_libs_test $cs_libs_save"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <pthread.h>
- #include <semaphore.h>
- void* worker(void* p) { (void)p; return p; }
-int
-main ()
-{
-pthread_t tid;
- sem_t sem;
- pthread_create(&tid, 0, worker, 0);
- sem_init(&sem, 0, 0);
- sem_destroy(&sem);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- cs_build_ok=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test $cs_build_ok = yes; then
- break
-fi
-
- done
-
-
- CFLAGS=$cs_cflags_save
- LDFLAGS=$cs_lflags_save
- LIBS=$cs_libs_save
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- if test $cs_build_ok = yes; then
- cs_build_cflags=`echo x$cs_cflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_lflags=`echo x$cs_lflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_libs=`echo x$cs_libs_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_sys_pthread=yes
- cs_cv_sys_pthread_cflags=$cs_build_cflags
- cs_cv_sys_pthread_lflags=$cs_build_lflags
- cs_cv_sys_pthread_libs=$cs_build_libs
-else
- cs_cv_sys_pthread=no
-fi
-
- { echo "$as_me:$LINENO: result: $cs_cv_sys_pthread" >&5
-echo "${ECHO_T}$cs_cv_sys_pthread" >&6; }
-fi
-
- if test $cs_cv_sys_pthread = yes; then
- :
-else
- cs_cv_sys_pthread_cflags=''
- cs_cv_sys_pthread_lflags=''
- cs_cv_sys_pthread_libs=''
-
-fi
-
- ;;
- esac
- if test $cs_cv_sys_pthread = yes; then
- { echo "$as_me:$LINENO: checking for pthread recursive mutexes" >&5
-echo $ECHO_N "checking for pthread recursive mutexes... $ECHO_C" >&6; }
-if test "${cs_cv_sys_pthread_mutex_recursive+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- cs_cflags_save="$CFLAGS"
- cs_lflags_save="$LDFLAGS"
- cs_libs_save="$LIBS"
- cs_build_ok=no
-
-
- for cs_build_item in `echo @-DCS_MUTEX_FEATURE=PTHREAD_MUTEX_RECURSIVE@@ | sed 'y% %#%'` \
- `echo @-DCS_MUTEX_FEATURE=PTHREAD_MUTEX_RECURSIVE_NP@@ | sed 'y% %#%'`
- do
-
- set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
- { for (i=1; i <= NF; ++i)
- { if ($i == "") print "filler"; else print $i } }'`
- shift
- if test $# -eq 0; then
- cs_dummy=''
-else
- if test "$1" = filler; then
- cs_dummy=''
-else
- cs_dummy=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_cflags_test=''
-else
- if test "$1" = filler; then
- cs_cflags_test=''
-else
- cs_cflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_lflags_test=''
-else
- if test "$1" = filler; then
- cs_lflags_test=''
-else
- cs_lflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_libs_test=''
-else
- if test "$1" = filler; then
- cs_libs_test=''
-else
- cs_libs_test=$1
-fi
-
- shift
-fi
-
- cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
- cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
- cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
-
- CFLAGS="$cs_cflags_test $cs_cv_sys_pthread_cflags -D_GNU_SOURCE $cs_cflags_save"
- LDFLAGS="$cs_lflags_test $cs_cv_sys_pthread_lflags $cs_lflags_save"
- LIBS="$cs_libs_test $cs_cv_sys_pthread_libs $cs_libs_save"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <pthread.h>
-int
-main ()
-{
-pthread_mutexattr_t attr;
- pthread_mutexattr_settype(&attr, CS_MUTEX_FEATURE);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- cs_build_ok=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test $cs_build_ok = yes; then
- break
-fi
-
- done
-
-
- CFLAGS=$cs_cflags_save
- LDFLAGS=$cs_lflags_save
- LIBS=$cs_libs_save
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- if test $cs_build_ok = yes; then
- cs_build_cflags=`echo x$cs_cflags_test $cs_cv_sys_pthread_cflags -D_GNU_SOURCE | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_lflags=`echo x$cs_lflags_test $cs_cv_sys_pthread_lflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_libs=`echo x$cs_libs_test $cs_cv_sys_pthread_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_sys_pthread_mutex_recursive=`echo $cs_build_cflags | sed 's/.*\(PTHREAD_MUTEX_RECURSIVE_*N*P*\).*/\1/'`
-else
- cs_cv_sys_pthread_mutex_recursive=no
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $cs_cv_sys_pthread_mutex_recursive" >&5
-echo "${ECHO_T}$cs_cv_sys_pthread_mutex_recursive" >&6; }
-else
- cs_cv_sys_pthread_mutex_recursive=no
-fi
-
-
- { echo "$as_me:$LINENO: checking how to suppress C++ \`long double' warnings" >&5
-echo $ECHO_N "checking how to suppress C++ \`long double' warnings... $ECHO_C" >&6; }
-if test "${cs_cv_prog_cxx_ignore_long_double_ok+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- cs_cflags_save="$CXXFLAGS"
- cs_lflags_save="$LDFLAGS"
- cs_libs_save="$LIBS"
- cs_build_ok=no
-
-
- for cs_build_item in `echo @-Wno-long-double@@ | sed 'y% %#%'`
- do
-
- set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
- { for (i=1; i <= NF; ++i)
- { if ($i == "") print "filler"; else print $i } }'`
- shift
- if test $# -eq 0; then
- cs_dummy=''
-else
- if test "$1" = filler; then
- cs_dummy=''
-else
- cs_dummy=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_cflags_test=''
-else
- if test "$1" = filler; then
- cs_cflags_test=''
-else
- cs_cflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_lflags_test=''
-else
- if test "$1" = filler; then
- cs_lflags_test=''
-else
- cs_lflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_libs_test=''
-else
- if test "$1" = filler; then
- cs_libs_test=''
-else
- cs_libs_test=$1
-fi
-
- shift
-fi
-
- cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
- cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
- cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
-
- CXXFLAGS="$cs_cflags_test $cs_cflags_save"
- LDFLAGS="$cs_lflags_test $cs_lflags_save"
- LIBS="$cs_libs_test $cs_libs_save"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- cs_build_ok=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test $cs_build_ok = yes; then
- break
-fi
-
- done
-
-
- CXXFLAGS=$cs_cflags_save
- LDFLAGS=$cs_lflags_save
- LIBS=$cs_libs_save
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- if test $cs_build_ok = yes; then
- cs_build_cflags=`echo x$cs_cflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_lflags=`echo x$cs_lflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_libs=`echo x$cs_libs_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_prog_cxx_ignore_long_double=`echo x$cs_build_cflags $cs_build_lflags $cs_build_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_prog_cxx_ignore_long_double_ok="$cs_cv_prog_cxx_ignore_long_double"
-else
- cs_cv_prog_cxx_ignore_long_double=''
- cs_cv_prog_cxx_ignore_long_double_ok=no
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_ignore_long_double_ok" >&5
-echo "${ECHO_T}$cs_cv_prog_cxx_ignore_long_double_ok" >&6; }
-
-
-
-# Check whether --with-python was given.
-if test "${with_python+set}" = set; then
- withval=$with_python;
-fi
-
- if test -z "$with_python"; then
- with_python=yes
-fi
-
-
-
- if test "$cs_prog_path_prepared" != yes; then
- cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
- export PATH
-fi
-
- for ac_prog in python
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_PYTHON+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$PYTHON"; then
- ac_cv_prog_PYTHON="$PYTHON" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_PYTHON="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-PYTHON=$ac_cv_prog_PYTHON
-if test -n "$PYTHON"; then
- { echo "$as_me:$LINENO: result: $PYTHON" >&5
-echo "${ECHO_T}$PYTHON" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
- test -n "$PYTHON" && break
-done
-
-
- cs_build_prop_val="$PYTHON"
- cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- if test -n "$cs_build_prop_val"; then
- cs_jamconfig_text="${cs_jamconfig_text}PYTHON ?= \"$cs_build_prop_val\" ;
-"
-fi
-
-
- if test -n "$PYTHON" && test "$with_python" != no; then
- { echo "$as_me:$LINENO: checking for python SDK" >&5
-echo $ECHO_N "checking for python SDK... $ECHO_C" >&6; }
-if test "${cs_cv_python_sdk+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cs_pyver=`{ (echo "$as_me:$LINENO: \$PYTHON -c 'import sys, string; \\
- print string.join(map(str,sys.version_info[:2]),\".\")'") >&5
- ($PYTHON -c 'import sys, string; \
- print string.join(map(str,sys.version_info[:2]),".")') 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }`
- cs_cv_pybase="python${cs_pyver}"
-
- cs_cv_pybase_cflags=`{ (echo "$as_me:$LINENO: \$PYTHON -c \\
- 'import distutils.sysconfig; \\
- print \"-I\" + distutils.sysconfig.get_python_inc()'") >&5
- ($PYTHON -c \
- 'import distutils.sysconfig; \
- print "-I" + distutils.sysconfig.get_python_inc()') 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_pybase_cflags="$cs_cv_pybase_cflags \
- $cs_cv_prog_cxx_ignore_long_double"
-
- # Depending upon platform and installation, link library might
- # reside in "get_python_lib()", "get_python_lib()/config",
- # "${prefix}/lib" (Unix), or "${prefix}/libs" (Windows).
- cs_cv_pybase_syslib=`{ (echo "$as_me:$LINENO: \$PYTHON -c \\
- 'import distutils.sysconfig; \\
- print distutils.sysconfig.get_python_lib(0,1)'") >&5
- ($PYTHON -c \
- 'import distutils.sysconfig; \
- print distutils.sysconfig.get_python_lib(0,1)') 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_pybase_sysprefix=`{ (echo "$as_me:$LINENO: \$PYTHON -c \\
- 'import sys; print sys.prefix'") >&5
- ($PYTHON -c \
- 'import sys; print sys.prefix') 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_pybase_lflags_base=''
- if test -d "$cs_cv_pybase_syslib"; then
- cs_cv_pybase_lflags_base="$cs_cv_pybase_lflags_base -L$cs_cv_pybase_syslib"
-fi
-
- cs_cv_pybase_lflags_ext='$cs_cv_pybase_lflags_base'
- if test -d "$cs_cv_pybase_syslib/config"; then
- cs_cv_pybase_lflags_ext="$cs_cv_pybase_lflags_ext -L$cs_cv_pybase_syslib/config"
-fi
-
- if test -d "$cs_cv_pybase_sysprefix/lib"; then
- cs_cv_pybase_sysprefix_lflags="$cs_cv_pybase_sysprefix_lflags -L$cs_cv_pybase_sysprefix/lib"
-fi
-
- if test -d "$cs_cv_pybase_sysprefix/libs"; then
- cs_cv_pybase_sysprefix_lflags="$cs_cv_pybase_sysprefix_lflags -L$cs_cv_pybase_sysprefix/libs"
-fi
-
-
- cs_cv_pybase_libs=`{ (echo "$as_me:$LINENO: \$PYTHON -c \\
- 'import distutils.sysconfig; \\
- print (distutils.sysconfig.get_config_var(\"LIBS\") or \"\")+\" \"+ \\
- (distutils.sysconfig.get_config_var(\"SYSLIBS\") or \"\")'") >&5
- ($PYTHON -c \
- 'import distutils.sysconfig; \
- print (distutils.sysconfig.get_config_var("LIBS") or "")+" "+ \
- (distutils.sysconfig.get_config_var("SYSLIBS") or "")') 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
-
- cs_cv_python_ext=`{ (echo "$as_me:$LINENO: \$PYTHON -c \\
- 'import distutils.sysconfig; \\
- print (distutils.sysconfig.get_config_var(\"SO\") or \"\")'") >&5
- ($PYTHON -c \
- 'import distutils.sysconfig; \
- print (distutils.sysconfig.get_config_var("SO") or "")') 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }`
-
- if test -n "$cs_pyver" &&
- test -n "$cs_cv_pybase_cflags" &&
- test -n "$cs_cv_pybase_lflags$cs_cv_pybase_sysprefix_lflags"; then
- cs_cv_python_sdk=yes
-else
- cs_cv_python_sdk=no
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $cs_cv_python_sdk" >&5
-echo "${ECHO_T}$cs_cv_python_sdk" >&6; }
-
- # Check if Python SDK is usable. The most common library name is the
- # basename with a few decorations (for example, libpython2.2.a),
- # however some Windows libraries lack the decimal point (for example,
- # libpython22.a or python22.lib), so we must check for both variations.
- # Furthermore, MacOS/X 10.3 supplies a Python.framework, however,
- # earlier releases did not. Instead, Python on MacOS/X pre-10.3 uses a
- # one-level linker namespace, which means that loadable Python modules
- # do not link against the Python library; instead, unresolved symbols
- # in the modules are satisfied automatically by the Python executable
- # when the module is loaded into the executable. For this reason,
- # Python on MacOS/X does not even provide a Python link library. We
- # account for this by trying -bundle, rather than linking against the
- # library.
- if test $cs_cv_python_sdk = yes; then
- cs_build_prop_val="$cs_cv_python_ext"
- cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- if test -n "$cs_build_prop_val"; then
- cs_jamconfig_text="${cs_jamconfig_text}PYTHON.MODULE_EXT ?= \"$cs_build_prop_val\" ;
-"
-fi
-
- cs_pywinlib=`echo "$cs_cv_pybase" | sed 's/\.//g'`
- cs_pyflags="$cs_pyflags `echo @@@$cs_cv_pybase_lflags_base -framework Python | sed 'y% %#%'`"
- cs_pyflags="$cs_pyflags `echo @@@$cs_cv_pybase_sysprefix_lflags -framework Python | sed 'y% %#%'`"
- cs_pyflags="$cs_pyflags `echo @@@$cs_cv_pybase_lflags_ext -framework Python | sed 'y% %#%'`"
-
- cs_pyflags="$cs_pyflags `echo @@@$cs_cv_pybase_lflags_base -l$cs_cv_pybase | sed 'y% %#%'`"
- cs_pyflags="$cs_pyflags `echo @@@$cs_cv_pybase_sysprefix_lflags -l$cs_cv_pybase | sed 'y% %#%'`"
- cs_pyflags="$cs_pyflags `echo @@@$cs_cv_pybase_lflags_ext -l$cs_cv_pybase | sed 'y% %#%'`"
-
- cs_pyflags="$cs_pyflags `echo @@@$cs_cv_pybase_lflags_base -l$cs_pywinlib | sed 'y% %#%'`"
- cs_pyflags="$cs_pyflags `echo @@@$cs_cv_pybase_sysprefix_lflags -l$cs_pywinlib | sed 'y% %#%'`"
- cs_pyflags="$cs_pyflags `echo @@@$cs_cv_pybase_lflags_ext -l$cs_pywinlib | sed 'y% %#%'`"
-
- cs_pyflags="$cs_pyflags `echo @@-bundle -flat_namespace -undefined suppress@$cs_cv_pybase_lflags_base | sed 'y% %#%'`"
- cs_pyflags="$cs_pyflags `echo @@-bundle -flat_namespace -undefined suppress@$cs_cv_pybase_sysprefix_lflags | sed 'y% %#%'`"
- cs_pyflags="$cs_pyflags `echo @@-bundle -flat_namespace -undefined suppress@$cs_cv_pybase_lflags_ext | sed 'y% %#%'`"
-
- if test "" != yes; then
- { echo "$as_me:$LINENO: checking if python SDK is usable" >&5
-echo $ECHO_N "checking if python SDK is usable... $ECHO_C" >&6; }
-if test "${cs_cv_python+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- cs_cflags_save="$CFLAGS"
- cs_lflags_save="$LDFLAGS"
- cs_libs_save="$LIBS"
- cs_build_ok=no
-
-
- for cs_build_item in $cs_pyflags
- do
-
- set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
- { for (i=1; i <= NF; ++i)
- { if ($i == "") print "filler"; else print $i } }'`
- shift
- if test $# -eq 0; then
- cs_dummy=''
-else
- if test "$1" = filler; then
- cs_dummy=''
-else
- cs_dummy=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_cflags_test=''
-else
- if test "$1" = filler; then
- cs_cflags_test=''
-else
- cs_cflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_lflags_test=''
-else
- if test "$1" = filler; then
- cs_lflags_test=''
-else
- cs_lflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_libs_test=''
-else
- if test "$1" = filler; then
- cs_libs_test=''
-else
- cs_libs_test=$1
-fi
-
- shift
-fi
-
- cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
- cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
- cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
-
- CFLAGS="$cs_cflags_test $cs_cv_pybase_cflags $cs_cv_sys_pthread_cflags $cs_cflags_save"
- LDFLAGS="$cs_lflags_test $cs_cv_sys_pthread_lflags $cs_lflags_save"
- LIBS="$cs_libs_test $cs_cv_pybase_libs $cs_cv_sys_pthread_libs $cs_libs_save"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <Python.h>
-int
-main ()
-{
-Py_Initialize(); Py_Finalize();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- cs_build_ok=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test $cs_build_ok = yes; then
- break
-fi
-
- done
-
-
- CFLAGS=$cs_cflags_save
- LDFLAGS=$cs_lflags_save
- LIBS=$cs_libs_save
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- if test $cs_build_ok = yes; then
- cs_build_cflags=`echo x$cs_cflags_test $cs_cv_pybase_cflags $cs_cv_sys_pthread_cflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_lflags=`echo x$cs_lflags_test $cs_cv_sys_pthread_lflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_libs=`echo x$cs_libs_test $cs_cv_pybase_libs $cs_cv_sys_pthread_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_python=yes
- cs_cv_python_cflags=$cs_build_cflags
- cs_cv_python_lflags=$cs_build_lflags
- cs_cv_python_libs=$cs_build_libs
-else
- cs_cv_python=no
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $cs_cv_python" >&5
-echo "${ECHO_T}$cs_cv_python" >&6; }
-else
- { echo "$as_me:$LINENO: checking if python SDK is usable" >&5
-echo $ECHO_N "checking if python SDK is usable... $ECHO_C" >&6; }
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- cs_cflags_save="$CFLAGS"
- cs_lflags_save="$LDFLAGS"
- cs_libs_save="$LIBS"
- cs_build_ok=no
-
-
- for cs_build_item in $cs_pyflags
- do
-
- set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
- { for (i=1; i <= NF; ++i)
- { if ($i == "") print "filler"; else print $i } }'`
- shift
- if test $# -eq 0; then
- cs_dummy=''
-else
- if test "$1" = filler; then
- cs_dummy=''
-else
- cs_dummy=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_cflags_test=''
-else
- if test "$1" = filler; then
- cs_cflags_test=''
-else
- cs_cflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_lflags_test=''
-else
- if test "$1" = filler; then
- cs_lflags_test=''
-else
- cs_lflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_libs_test=''
-else
- if test "$1" = filler; then
- cs_libs_test=''
-else
- cs_libs_test=$1
-fi
-
- shift
-fi
-
- cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
- cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
- cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
-
- CFLAGS="$cs_cflags_test $cs_cv_pybase_cflags $cs_cv_sys_pthread_cflags $cs_cflags_save"
- LDFLAGS="$cs_lflags_test $cs_cv_sys_pthread_lflags $cs_lflags_save"
- LIBS="$cs_libs_test $cs_cv_pybase_libs $cs_cv_sys_pthread_libs $cs_libs_save"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <Python.h>
-int
-main ()
-{
-Py_Initialize(); Py_Finalize();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- cs_build_ok=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test $cs_build_ok = yes; then
- break
-fi
-
- done
-
-
- CFLAGS=$cs_cflags_save
- LDFLAGS=$cs_lflags_save
- LIBS=$cs_libs_save
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- if test $cs_build_ok = yes; then
- cs_build_cflags=`echo x$cs_cflags_test $cs_cv_pybase_cflags $cs_cv_sys_pthread_cflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_lflags=`echo x$cs_lflags_test $cs_cv_sys_pthread_lflags | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_libs=`echo x$cs_libs_test $cs_cv_pybase_libs $cs_cv_sys_pthread_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_python=yes
- cs_cv_python_cflags=$cs_build_cflags
- cs_cv_python_lflags=$cs_build_lflags
- cs_cv_python_libs=$cs_build_libs
-else
- cs_cv_python=no
-fi
-
- { echo "$as_me:$LINENO: result: $cs_cv_python" >&5
-echo "${ECHO_T}$cs_cv_python" >&6; }
-fi
-
- if test $cs_cv_python = yes; then
- if test "$cs_cv_python" = yes; then
- cs_build_prop_val="yes"
- cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- if test -n "$cs_build_prop_val"; then
- cs_jamconfig_text="${cs_jamconfig_text}PYTHON.AVAILABLE ?= \"$cs_build_prop_val\" ;
-"
-fi
-
- cs_build_prop_val="$cs_cv_python_cflags"
- cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- if test -n "$cs_build_prop_val"; then
- cs_jamconfig_text="${cs_jamconfig_text}PYTHON.CFLAGS ?= \"$cs_build_prop_val\" ;
-"
-fi
-
- cs_build_prop_val="$cs_cv_python_lflags $cs_cv_python_libs"
- cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- if test -n "$cs_build_prop_val"; then
- cs_jamconfig_text="${cs_jamconfig_text}PYTHON.LFLAGS ?= \"$cs_build_prop_val\" ;
-"
-fi
-
-fi
-
-else
- cs_cv_python_cflags=''
- cs_cv_python_lflags=''
- cs_cv_python_libs=''
-
-fi
-
-else
- cs_cv_python=no
-fi
-
-else
- cs_cv_python=no
-fi
-
-
#------------------------------------------------------------------------------
# Check for BSD-style socket support. Also test for presence of type
# socklen_t. Note that we must not include both <winsock.h> and the Unix
@@ -10019,9 +8811,9 @@
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to jor...@gm... ##
-## ------------------------------------------ ##
+## ------------------------------------- ##
+## Report this to obr...@gm... ##
+## ------------------------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
@@ -10500,1615 +9292,6 @@
fi
-# Check Verse
-
-# Check whether --with-verse was given.
-if test "${with_verse+set}" = set; then
- withval=$with_verse;
-fi
-
-
- # Backward compatibility: Recognize --with-libverse as alias for --with-verse.
- if test -n "$with_libverse" &&
- test -z "$with_verse"; then
- with_verse="$with_libverse"
-fi
-
-
- if test -z "$with_verse"; then
- with_verse=yes
-fi
-
- if test "$with_verse" != no; then
- # If --with-verse value is same as cached value, then assume other
- # cached values are also valid; otherwise, ignore all cached values.
- if test "$with_verse" != "$cs_cv_with_verse"; then
- cs_ignore_cache=yes
-else
- cs_ignore_cache=no
-fi
-
-
- cs_check_lib_flags=''
- if test $with_verse = yes; then
- if test "$cs_prog_pkg_config_checked" != yes; then
-
- if test "$cs_prog_path_prepared" != yes; then
- cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
- export PATH
-fi
-
- if test -n "$ac_tool_prefix"; then
- for ac_prog in pkg-config
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$PKG_CONFIG"; then
- ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_PKG_CONFIG="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
- { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
- test -n "$PKG_CONFIG" && break
- done
-fi
-if test -z "$PKG_CONFIG"; then
- ac_ct_PKG_CONFIG=$PKG_CONFIG
- for ac_prog in pkg-config
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_PKG_CONFIG"; then
- ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_PKG_CONFIG="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
-if test -n "$ac_ct_PKG_CONFIG"; then
- { echo "$as_me:$LINENO: result: $ac_ct_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_ct_PKG_CONFIG" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
- test -n "$ac_ct_PKG_CONFIG" && break
-done
-
- if test "x$ac_ct_PKG_CONFIG" = x; then
- PKG_CONFIG=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to aut...@gn...." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to aut...@gn...." >&2;}
-ac_tool_warned=yes ;;
-esac
- PKG_CONFIG=$ac_ct_PKG_CONFIG
- fi
-fi
-
- PKG_CONFIG_PATH="/usr/local/lib/pkgconfig$PATH_SEPARATOR/sw/lib/pkgconfig$PATH_SEPARATOR/opt/local/lib/pkgconfig$PATH_SEPARATOR/opt/lib/pkgconfig$PATH_SEPARATOR$PKG_CONFIG_PATH"
- export PKG_CONFIG_PATH
- cs_prog_pkg_config_checked=yes
-fi
-
- if test -z "$cs_cv_prog_pkg_config_ok"; then
- if test -n "$PKG_CONFIG"; then
- if $PKG_CONFIG --atleast-pkgconfig-version=0.9.0; then
- cs_cv_prog_pkg_config_ok=yes
-else
- cs_cv_prog_pkg_config_ok=no
-fi
-
-else
- cs_cv_prog_pkg_config_ok=no
-fi
-
-fi
-
- if test $cs_cv_prog_pkg_config_ok = yes; then
- { echo "$as_me:$LINENO: checking if $PKG_CONFIG recognizes verse" >&5
-echo $ECHO_N "checking if $PKG_CONFIG recognizes verse... $ECHO_C" >&6; }
-if test "${cs_cv_prog_pkg_config_verse+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if $PKG_CONFIG --exists verse; then
- cs_cv_prog_pkg_config_verse=yes
-else
- cs_cv_prog_pkg_config_verse=no
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_pkg_config_verse" >&5
-echo "${ECHO_T}$cs_cv_prog_pkg_config_verse" >&6; }
- if test $cs_cv_prog_pkg_config_verse = yes; then
- if test -z "$cs_cv_prog_pkg_config_verse_flags"; then
- cs_check_lib_cflag=`{ (echo "$as_me:$LINENO: \$PKG_CONFIG --cflags verse") >&5
- ($PKG_CONFIG --cflags verse) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_check_lib_lflag=''
- cs_check_lib_libs=`{ (echo "$as_me:$LINENO: \$PKG_CONFIG --libs verse") >&5
- ($PKG_CONFIG --libs verse) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_prog_pkg_config_verse_flags=`echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_libs | sed 'y% %#%'`
-fi
-
- cs_check_lib_flags="$cs_check_lib_flags $cs_cv_prog_pkg_config_verse_flags"
-fi
-
-fi
-
-
- if test "$cs_prog_path_prepared" != yes; then
- cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
- export PATH
-fi
-
- if test -n "$ac_tool_prefix"; then
- for ac_prog in verse-config
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CONFIG_VERSE+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CONFIG_VERSE"; then
- ac_cv_prog_CONFIG_VERSE="$CONFIG_VERSE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CONFIG_VERSE="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CONFIG_VERSE=$ac_cv_prog_CONFIG_VERSE
-if test -n "$CONFIG_VERSE"; then
- { echo "$as_me:$LINENO: result: $CONFIG_VERSE" >&5
-echo "${ECHO_T}$CONFIG_VERSE" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
- test -n "$CONFIG_VERSE" && break
- done
-fi
-if test -z "$CONFIG_VERSE"; then
- ac_ct_CONFIG_VERSE=$CONFIG_VERSE
- for ac_prog in verse-config
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CONFIG_VERSE+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_CONFIG_VERSE"; then
- ac_cv_prog_ac_ct_CONFIG_VERSE="$ac_ct_CONFIG_VERSE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CONFIG_VERSE="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CONFIG_VERSE=$ac_cv_prog_ac_ct_CONFIG_VERSE
-if test -n "$ac_ct_CONFIG_VERSE"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CONFIG_VERSE" >&5
-echo "${ECHO_T}$ac_ct_CONFIG_VERSE" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
- test -n "$ac_ct_CONFIG_VERSE" && break
-done
-
- if test "x$ac_ct_CONFIG_VERSE" = x; then
- CONFIG_VERSE=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to aut...@gn...." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to aut...@gn...." >&2;}
-ac_tool_warned=yes ;;
-esac
- CONFIG_VERSE=$ac_ct_CONFIG_VERSE
- fi
-fi
-
- if test -n "$CONFIG_VERSE"; then
- if test -z "$cs_cv_prog_config_verse_ok"; then
- if $CONFIG_VERSE --cflags --libs >/dev/null 2>&1; then
- cs_cv_prog_config_verse_ok=yes
-else
- cs_cv_prog_config_verse_ok=no
-fi
-
-fi
-
- if test $cs_cv_prog_config_verse_ok = yes; then
- if test -z "$cs_cv_prog_config_verse_flags"; then
- cs_check_lib_cflag=`{ (echo "$as_me:$LINENO: \$CONFIG_VERSE --cflags ") >&5
- ($CONFIG_VERSE --cflags ) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_check_lib_lflag=''
- cs_check_lib_libs=`{ (echo "$as_me:$LINENO: \$CONFIG_VERSE --libs ") >&5
- ($CONFIG_VERSE --libs ) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_prog_config_verse_flags=`echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_libs | sed 'y% %#%'`
-fi
-
- cs_check_lib_flags="$cs_check_lib_flags $cs_cv_prog_config_verse_flags"
-fi
-
-fi
-
-
-fi
-
-
- if test $with_verse != yes; then
- cs_check_lib_paths=$with_verse
-else
- cs_check_lib_paths="| /usr/local/include|/usr/local/lib \
- /sw/include|/sw/lib \
- /opt/local/include|/opt/local/lib \
- /opt/include|/opt/lib "
-fi
-
- for cs_lib_item in $cs_check_lib_paths
- do
- case $cs_lib_item in
- *\|*)
- set filler `echo "$cs_lib_item" | awk 'BEGIN { FS="|" }
- { for (i=1; i <= NF; ++i)
- { if ($i == "") print "filler"; else print $i } }'`
- shift
- if test $# -eq 0; then
- cs_check_incdir=''
-else
- if test "$1" = filler; then
- cs_check_incdir=''
-else
- cs_check_incdir=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_check_libdir=''
-else
- if test "$1" = filler; then
- cs_check_libdir=''
-else
- cs_check_libdir=$1
-fi
-
- shift
-fi
-
- if test -n "$cs_check_incdir"; then
- cs_check_lib_cflag="-I$cs_check_incdir"
-else
- cs_check_lib_cflag=''
-fi
-
- if test -n "$cs_check_libdir"; then
- cs_check_lib_lflag="-L$cs_check_libdir"
-else
- cs_check_lib_lflag=''
-fi
-
- if test -n "verse"; then
- cs_check_lib_libs="-lverse"
- cs_check_lib_framework="-framework verse"
-else
- cs_check_lib_libs=''
- cs_check_lib_framework=''
-fi
-
- cs_check_lib_flags="$cs_check_lib_flags
- `echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_framework | sed 'y% %#%'`
- `echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_libs | sed 'y% %#%'`"
- ;;
- *) if test -n "$cs_lib_item/include"; then
- cs_check_lib_cflag="-I$cs_lib_item/include"
-else
- cs_check_lib_cflag=''
-fi
-
- if test -n "$cs_lib_item/lib"; then
- cs_check_lib_lflag="-L$cs_lib_item/lib"
-else
- cs_check_lib_lflag=''
-fi
-
- if test -n "verse"; then
- cs_check_lib_libs="-lverse"
- cs_check_lib_framework="-framework verse"
-else
- cs_check_lib_libs=''
- cs_check_lib_framework=''
-fi
-
- cs_check_lib_flags="$cs_check_lib_flags
- `echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_framework | sed 'y% %#%'`
- `echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_libs | sed 'y% %#%'`"
- if test -n "$cs_lib_item"; then
- cs_check_lib_cflag="-I$cs_lib_item"
-else
- cs_check_lib_cflag=''
-fi
-
- if test -n "$cs_lib_item"; then
- cs_check_lib_lflag="-L$cs_lib_item"
-else
- cs_check_lib_lflag=''
-fi
-
- if test -n "verse"; then
- cs_check_lib_libs="-lverse"
- cs_check_lib_framework="-framework verse"
-else
- cs_check_lib_libs=''
- cs_check_lib_framework=''
-fi
-
- cs_check_lib_flags="$cs_check_lib_flags
- `echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_framework | sed 'y% %#%'`
- `echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_libs | sed 'y% %#%'`"
- ;;
- esac
- done
-
-
- if test "$cs_ignore_cache" != yes; then
- { echo "$as_me:$LINENO: checking for libverse" >&5
-echo $ECHO_N "checking for libverse... $ECHO_C" >&6; }
-if test "${cs_cv_libverse+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- cs_cflags_save="$CFLAGS"
- cs_lflags_save="$LDFLAGS"
- cs_libs_save="$LIBS"
- cs_build_ok=no
-
-
- for cs_build_item in $cs_check_lib_flags
- do
-
- set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
- { for (i=1; i <= NF; ++i)
- { if ($i == "") print "filler"; else print $i } }'`
- shift
- if test $# -eq 0; then
- cs_dummy=''
-else
- if test "$1" = filler; then
- cs_dummy=''
-else
- cs_dummy=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_cflags_test=''
-else
- if test "$1" = filler; then
- cs_cflags_test=''
-else
- cs_cflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_lflags_test=''
-else
- if test "$1" = filler; then
- cs_lflags_test=''
-else
- cs_lflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_libs_test=''
-else
- if test "$1" = filler; then
- cs_libs_test=''
-else
- cs_libs_test=$1
-fi
-
- shift
-fi
-
- cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
- cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
- cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
-
- CFLAGS="$cs_cflags_test $cs_cflags_save"
- LDFLAGS="$cs_lflags_test $cs_lflags_save"
- LIBS="$cs_libs_test $cs_cv_sys_socket_libs $cs_libs_save"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include "verse.h"
-int
-main ()
-{
-verse_send_connect("","","",0)
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- cs_build_ok=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test $cs_build_ok = yes; then
- break
-fi
-
- done
-
-
- CFLAGS=$cs_cflags_save
- LDFLAGS=$cs_lflags_save
- LIBS=$cs_libs_save
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- if test $cs_build_ok = yes; then
- cs_build_cflags=`echo x$cs_cflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_lflags=`echo x$cs_lflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_libs=`echo x$cs_libs_test $cs_cv_sys_socket_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_libverse=yes
- cs_cv_libverse_cflags=$cs_build_cflags
- cs_cv_libverse_lflags=$cs_build_lflags
- cs_cv_libverse_libs=$cs_build_libs
-else
- cs_cv_libverse=no
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $cs_cv_libverse" >&5
-echo "${ECHO_T}$cs_cv_libverse" >&6; }
-else
- { echo "$as_me:$LINENO: checking for libverse" >&5
-echo $ECHO_N "checking for libverse... $ECHO_C" >&6; }
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- cs_cflags_save="$CFLAGS"
- cs_lflags_save="$LDFLAGS"
- cs_libs_save="$LIBS"
- cs_build_ok=no
-
-
- for cs_build_item in $cs_check_lib_flags
- do
-
- set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
- { for (i=1; i <= NF; ++i)
- { if ($i == "") print "filler"; else print $i } }'`
- shift
- if test $# -eq 0; then
- cs_dummy=''
-else
- if test "$1" = filler; then
- cs_dummy=''
-else
- cs_dummy=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_cflags_test=''
-else
- if test "$1" = filler; then
- cs_cflags_test=''
-else
- cs_cflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_lflags_test=''
-else
- if test "$1" = filler; then
- cs_lflags_test=''
-else
- cs_lflags_test=$1
-fi
-
- shift
-fi
-if test $# -eq 0; then
- cs_libs_test=''
-else
- if test "$1" = filler; then
- cs_libs_test=''
-else
- cs_libs_test=$1
-fi
-
- shift
-fi
-
- cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
- cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
- cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
-
- CFLAGS="$cs_cflags_test $cs_cflags_save"
- LDFLAGS="$cs_lflags_test $cs_lflags_save"
- LIBS="$cs_libs_test $cs_cv_sys_socket_libs $cs_libs_save"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include "verse.h"
-int
-main ()
-{
-verse_send_connect("","","",0)
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- cs_build_ok=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test $cs_build_ok = yes; then
- break
-fi
-
- done
-
-
- CFLAGS=$cs_cflags_save
- LDFLAGS=$cs_lflags_save
- LIBS=$cs_libs_save
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
- if test $cs_build_ok = yes; then
- cs_build_cflags=`echo x$cs_cflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_lflags=`echo x$cs_lflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_build_libs=`echo x$cs_libs_test $cs_cv_sys_socket_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_libverse=yes
- cs_cv_libverse_cflags=$cs_build_cflags
- cs_cv_libverse_lflags=$cs_build_lflags
- cs_cv_libverse_libs=$cs_build_libs
-else
- cs_cv_libverse=no
-fi
-
- { echo "$as_me:$LINENO: result: $cs_cv_libverse" >&5
-echo "${ECHO_T}$cs_cv_libverse" >&6; }
-fi
-
- if test $cs_cv_libverse = yes; then
- :
-el...
[truncated message content] |
|
From: <ob...@us...> - 2007-10-10 10:11:46
|
Revision: 348
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=348&view=rev
Author: obi666
Date: 2007-10-10 03:11:48 -0700 (Wed, 10 Oct 2007)
Log Message:
-----------
Regenerated msvc project files.
Modified Paths:
--------------
branches/release/V0.2/msvc/7/wksiaeditor.sln
branches/release/V0.2/msvc/71/wksiaeditor.sln
branches/release/V0.2/msvc/8/wksiaeditor.sln
branches/release/V0.2/msvc/libbehaviourlayer_staticreg.cpp
branches/release/V0.2/msvc/libcsobjects_staticreg.cpp
branches/release/V0.2/msvc/libforce_script_staticreg.cpp
branches/release/V0.2/msvc/libpfcharacter_staticreg.cpp
branches/release/V0.2/msvc/libpfguiactor_staticreg.cpp
branches/release/V0.2/msvc/libpfobj_properties_staticreg.cpp
branches/release/V0.2/msvc/libpfodedynamics_staticreg.cpp
branches/release/V0.2/msvc/plgbehaviourlayer.rc
branches/release/V0.2/msvc/plgcsobjects.rc
branches/release/V0.2/msvc/plgforce_script.rc
branches/release/V0.2/msvc/plgpfcharacter.rc
branches/release/V0.2/msvc/plgpfguiactor.rc
branches/release/V0.2/msvc/plgpfobj_properties.rc
branches/release/V0.2/msvc/plgpfodedynamics.rc
Modified: branches/release/V0.2/msvc/7/wksiaeditor.sln
===================================================================
--- branches/release/V0.2/msvc/7/wksiaeditor.sln 2007-10-10 10:09:48 UTC (rev 347)
+++ branches/release/V0.2/msvc/7/wksiaeditor.sln 2007-10-10 10:11:48 UTC (rev 348)
@@ -1,19 +1,11 @@
Microsoft Visual Studio Solution File, Format Version 7.00
# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appiaeditor", "appiaeditor.vcproj", "{133F3D88-940F-DE6D-3661-AD25DF8A3C9A}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpall_iaeditor", "grpall_iaeditor.vcproj", "{D1D7ECA1-1553-368F-9A83-24C347043389}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpapps_iaeditor", "grpapps_iaeditor.vcproj", "{0C486056-C033-073A-1D07-17098688877C}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpiaeditorall_iaeditor", "grpiaeditorall_iaeditor.vcproj", "{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grplibs_iaeditor", "grplibs_iaeditor.vcproj", "{C4CEA535-48F5-C518-8A72-73A9854CCB60}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpplugins_iaeditor", "grpplugins_iaeditor.vcproj", "{D23A398F-9918-ED87-924E-880E7E75BD53}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpropgrid", "libpropgrid.vcproj", "{D8C59DB7-C610-DEB9-C81D-6E14959A2251}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgbehaviourlayer", "plgbehaviourlayer.vcproj", "{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgcsobjects", "plgcsobjects.vcproj", "{50EFF507-6FE4-9526-36E0-E0DED21E1BBC}"
@@ -34,19 +26,13 @@
ConfigName.1 = Debug
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.0 = {D8C59DB7-C610-DEB9-C81D-6E14959A2251}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.0 = {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.1 = {D8C59DB7-C610-DEB9-C81D-6E14959A2251}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.2 = {B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.3 = {50EFF507-6FE4-9526-36E0-E0DED21E1BBC}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.4 = {7EA547E0-DD90-151E-6662-2B9FE705C20B}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.5 = {F8896403-AB60-724A-87CD-F37AB1EC9273}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.6 = {746404B0-722D-8038-F10C-3AAFCB45781B}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.7 = {9D180099-DE41-3EDD-341A-3B3D802181A7}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.8 = {79060465-7CA0-C9D6-62E8-25001BA9FF08}
- {0C486056-C033-073A-1D07-17098688877C}.0 = {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}
- {B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.0 = {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.0 = {D8C59DB7-C610-DEB9-C81D-6E14959A2251}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.0 = {B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.1 = {50EFF507-6FE4-9526-36E0-E0DED21E1BBC}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.2 = {7EA547E0-DD90-151E-6662-2B9FE705C20B}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.3 = {F8896403-AB60-724A-87CD-F37AB1EC9273}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.4 = {746404B0-722D-8038-F10C-3AAFCB45781B}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.5 = {9D180099-DE41-3EDD-341A-3B3D802181A7}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.6 = {79060465-7CA0-C9D6-62E8-25001BA9FF08}
{D23A398F-9918-ED87-924E-880E7E75BD53}.0 = {B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}
{D23A398F-9918-ED87-924E-880E7E75BD53}.1 = {50EFF507-6FE4-9526-36E0-E0DED21E1BBC}
{D23A398F-9918-ED87-924E-880E7E75BD53}.2 = {7EA547E0-DD90-151E-6662-2B9FE705C20B}
@@ -56,34 +42,18 @@
{D23A398F-9918-ED87-924E-880E7E75BD53}.6 = {79060465-7CA0-C9D6-62E8-25001BA9FF08}
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Release.ActiveCfg = Release|Win32
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Release.Build.0 = Release|Win32
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Debug.ActiveCfg = Debug|Win32
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Debug.Build.0 = Debug|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Release.ActiveCfg = Release|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Release.Build.0 = Release|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Debug.ActiveCfg = Debug|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Debug.Build.0 = Debug|Win32
- {0C486056-C033-073A-1D07-17098688877C}.Release.ActiveCfg = Release|Win32
- {0C486056-C033-073A-1D07-17098688877C}.Release.Build.0 = Release|Win32
- {0C486056-C033-073A-1D07-17098688877C}.Debug.ActiveCfg = Debug|Win32
- {0C486056-C033-073A-1D07-17098688877C}.Debug.Build.0 = Debug|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Release.ActiveCfg = Release|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Release.Build.0 = Release|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Debug.ActiveCfg = Debug|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Debug.Build.0 = Debug|Win32
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Release.ActiveCfg = Release|Win32
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Release.Build.0 = Release|Win32
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Debug.ActiveCfg = Debug|Win32
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Debug.Build.0 = Debug|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Release.ActiveCfg = Release|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Release.Build.0 = Release|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Debug.ActiveCfg = Debug|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Debug.Build.0 = Debug|Win32
- {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Release.ActiveCfg = Release|Win32
- {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Release.Build.0 = Release|Win32
- {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Debug.ActiveCfg = Debug|Win32
- {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Debug.Build.0 = Debug|Win32
{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}.Release.ActiveCfg = Release|Win32
{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}.Release.Build.0 = Release|Win32
{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}.Debug.ActiveCfg = Debug|Win32
Modified: branches/release/V0.2/msvc/71/wksiaeditor.sln
===================================================================
--- branches/release/V0.2/msvc/71/wksiaeditor.sln 2007-10-10 10:09:48 UTC (rev 347)
+++ branches/release/V0.2/msvc/71/wksiaeditor.sln 2007-10-10 10:11:48 UTC (rev 348)
@@ -1,19 +1,11 @@
Microsoft Visual Studio Solution File, Format Version 8.00
# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appiaeditor", "appiaeditor.vcproj", "{133F3D88-940F-DE6D-3661-AD25DF8A3C9A}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpall_iaeditor", "grpall_iaeditor.vcproj", "{D1D7ECA1-1553-368F-9A83-24C347043389}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpapps_iaeditor", "grpapps_iaeditor.vcproj", "{0C486056-C033-073A-1D07-17098688877C}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpiaeditorall_iaeditor", "grpiaeditorall_iaeditor.vcproj", "{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grplibs_iaeditor", "grplibs_iaeditor.vcproj", "{C4CEA535-48F5-C518-8A72-73A9854CCB60}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpplugins_iaeditor", "grpplugins_iaeditor.vcproj", "{D23A398F-9918-ED87-924E-880E7E75BD53}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpropgrid", "libpropgrid.vcproj", "{D8C59DB7-C610-DEB9-C81D-6E14959A2251}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgbehaviourlayer", "plgbehaviourlayer.vcproj", "{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgcsobjects", "plgcsobjects.vcproj", "{50EFF507-6FE4-9526-36E0-E0DED21E1BBC}"
@@ -34,19 +26,13 @@
ConfigName.1 = Debug
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.0 = {D8C59DB7-C610-DEB9-C81D-6E14959A2251}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.0 = {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.1 = {D8C59DB7-C610-DEB9-C81D-6E14959A2251}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.2 = {B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.3 = {50EFF507-6FE4-9526-36E0-E0DED21E1BBC}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.4 = {7EA547E0-DD90-151E-6662-2B9FE705C20B}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.5 = {F8896403-AB60-724A-87CD-F37AB1EC9273}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.6 = {746404B0-722D-8038-F10C-3AAFCB45781B}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.7 = {9D180099-DE41-3EDD-341A-3B3D802181A7}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.8 = {79060465-7CA0-C9D6-62E8-25001BA9FF08}
- {0C486056-C033-073A-1D07-17098688877C}.0 = {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}
- {B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.0 = {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.0 = {D8C59DB7-C610-DEB9-C81D-6E14959A2251}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.0 = {B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.1 = {50EFF507-6FE4-9526-36E0-E0DED21E1BBC}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.2 = {7EA547E0-DD90-151E-6662-2B9FE705C20B}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.3 = {F8896403-AB60-724A-87CD-F37AB1EC9273}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.4 = {746404B0-722D-8038-F10C-3AAFCB45781B}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.5 = {9D180099-DE41-3EDD-341A-3B3D802181A7}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.6 = {79060465-7CA0-C9D6-62E8-25001BA9FF08}
{D23A398F-9918-ED87-924E-880E7E75BD53}.0 = {B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}
{D23A398F-9918-ED87-924E-880E7E75BD53}.1 = {50EFF507-6FE4-9526-36E0-E0DED21E1BBC}
{D23A398F-9918-ED87-924E-880E7E75BD53}.2 = {7EA547E0-DD90-151E-6662-2B9FE705C20B}
@@ -56,34 +42,18 @@
{D23A398F-9918-ED87-924E-880E7E75BD53}.6 = {79060465-7CA0-C9D6-62E8-25001BA9FF08}
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Release.ActiveCfg = Release|Win32
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Release.Build.0 = Release|Win32
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Debug.ActiveCfg = Debug|Win32
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Debug.Build.0 = Debug|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Release.ActiveCfg = Release|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Release.Build.0 = Release|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Debug.ActiveCfg = Debug|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Debug.Build.0 = Debug|Win32
- {0C486056-C033-073A-1D07-17098688877C}.Release.ActiveCfg = Release|Win32
- {0C486056-C033-073A-1D07-17098688877C}.Release.Build.0 = Release|Win32
- {0C486056-C033-073A-1D07-17098688877C}.Debug.ActiveCfg = Debug|Win32
- {0C486056-C033-073A-1D07-17098688877C}.Debug.Build.0 = Debug|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Release.ActiveCfg = Release|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Release.Build.0 = Release|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Debug.ActiveCfg = Debug|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Debug.Build.0 = Debug|Win32
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Release.ActiveCfg = Release|Win32
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Release.Build.0 = Release|Win32
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Debug.ActiveCfg = Debug|Win32
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Debug.Build.0 = Debug|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Release.ActiveCfg = Release|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Release.Build.0 = Release|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Debug.ActiveCfg = Debug|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Debug.Build.0 = Debug|Win32
- {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Release.ActiveCfg = Release|Win32
- {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Release.Build.0 = Release|Win32
- {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Debug.ActiveCfg = Debug|Win32
- {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Debug.Build.0 = Debug|Win32
{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}.Release.ActiveCfg = Release|Win32
{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}.Release.Build.0 = Release|Win32
{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}.Debug.ActiveCfg = Debug|Win32
Modified: branches/release/V0.2/msvc/8/wksiaeditor.sln
===================================================================
--- branches/release/V0.2/msvc/8/wksiaeditor.sln 2007-10-10 10:09:48 UTC (rev 347)
+++ branches/release/V0.2/msvc/8/wksiaeditor.sln 2007-10-10 10:11:48 UTC (rev 348)
@@ -1,19 +1,11 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appiaeditor", "appiaeditor.vcproj", "{133F3D88-940F-DE6D-3661-AD25DF8A3C9A}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpall_iaeditor", "grpall_iaeditor.vcproj", "{D1D7ECA1-1553-368F-9A83-24C347043389}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpapps_iaeditor", "grpapps_iaeditor.vcproj", "{0C486056-C033-073A-1D07-17098688877C}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpiaeditorall_iaeditor", "grpiaeditorall_iaeditor.vcproj", "{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grplibs_iaeditor", "grplibs_iaeditor.vcproj", "{C4CEA535-48F5-C518-8A72-73A9854CCB60}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpplugins_iaeditor", "grpplugins_iaeditor.vcproj", "{D23A398F-9918-ED87-924E-880E7E75BD53}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpropgrid", "libpropgrid.vcproj", "{D8C59DB7-C610-DEB9-C81D-6E14959A2251}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgbehaviourlayer", "plgbehaviourlayer.vcproj", "{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgcsobjects", "plgcsobjects.vcproj", "{50EFF507-6FE4-9526-36E0-E0DED21E1BBC}"
@@ -34,19 +26,13 @@
ConfigName.1 = Debug
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.0 = {D8C59DB7-C610-DEB9-C81D-6E14959A2251}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.0 = {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.1 = {D8C59DB7-C610-DEB9-C81D-6E14959A2251}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.2 = {B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.3 = {50EFF507-6FE4-9526-36E0-E0DED21E1BBC}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.4 = {7EA547E0-DD90-151E-6662-2B9FE705C20B}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.5 = {F8896403-AB60-724A-87CD-F37AB1EC9273}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.6 = {746404B0-722D-8038-F10C-3AAFCB45781B}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.7 = {9D180099-DE41-3EDD-341A-3B3D802181A7}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.8 = {79060465-7CA0-C9D6-62E8-25001BA9FF08}
- {0C486056-C033-073A-1D07-17098688877C}.0 = {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}
- {B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.0 = {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.0 = {D8C59DB7-C610-DEB9-C81D-6E14959A2251}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.0 = {B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.1 = {50EFF507-6FE4-9526-36E0-E0DED21E1BBC}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.2 = {7EA547E0-DD90-151E-6662-2B9FE705C20B}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.3 = {F8896403-AB60-724A-87CD-F37AB1EC9273}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.4 = {746404B0-722D-8038-F10C-3AAFCB45781B}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.5 = {9D180099-DE41-3EDD-341A-3B3D802181A7}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.6 = {79060465-7CA0-C9D6-62E8-25001BA9FF08}
{D23A398F-9918-ED87-924E-880E7E75BD53}.0 = {B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}
{D23A398F-9918-ED87-924E-880E7E75BD53}.1 = {50EFF507-6FE4-9526-36E0-E0DED21E1BBC}
{D23A398F-9918-ED87-924E-880E7E75BD53}.2 = {7EA547E0-DD90-151E-6662-2B9FE705C20B}
@@ -56,34 +42,18 @@
{D23A398F-9918-ED87-924E-880E7E75BD53}.6 = {79060465-7CA0-C9D6-62E8-25001BA9FF08}
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Release.ActiveCfg = Release|Win32
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Release.Build.0 = Release|Win32
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Debug.ActiveCfg = Debug|Win32
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Debug.Build.0 = Debug|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Release.ActiveCfg = Release|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Release.Build.0 = Release|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Debug.ActiveCfg = Debug|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Debug.Build.0 = Debug|Win32
- {0C486056-C033-073A-1D07-17098688877C}.Release.ActiveCfg = Release|Win32
- {0C486056-C033-073A-1D07-17098688877C}.Release.Build.0 = Release|Win32
- {0C486056-C033-073A-1D07-17098688877C}.Debug.ActiveCfg = Debug|Win32
- {0C486056-C033-073A-1D07-17098688877C}.Debug.Build.0 = Debug|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Release.ActiveCfg = Release|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Release.Build.0 = Release|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Debug.ActiveCfg = Debug|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Debug.Build.0 = Debug|Win32
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Release.ActiveCfg = Release|Win32
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Release.Build.0 = Release|Win32
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Debug.ActiveCfg = Debug|Win32
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Debug.Build.0 = Debug|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Release.ActiveCfg = Release|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Release.Build.0 = Release|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Debug.ActiveCfg = Debug|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Debug.Build.0 = Debug|Win32
- {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Release.ActiveCfg = Release|Win32
- {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Release.Build.0 = Release|Win32
- {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Debug.ActiveCfg = Debug|Win32
- {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Debug.Build.0 = Debug|Win32
{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}.Release.ActiveCfg = Release|Win32
{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}.Release.Build.0 = Release|Win32
{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}.Debug.ActiveCfg = Debug|Win32
Modified: branches/release/V0.2/msvc/libbehaviourlayer_staticreg.cpp
===================================================================
--- branches/release/V0.2/msvc/libbehaviourlayer_staticreg.cpp 2007-10-10 10:09:48 UTC (rev 347)
+++ branches/release/V0.2/msvc/libbehaviourlayer_staticreg.cpp 2007-10-10 10:11:48 UTC (rev 348)
@@ -16,35 +16,23 @@
namespace csStaticPluginInit
{
static char const metainfo_behaviourlayer[] =
-"<?xml version=\"1.0\"?>
-"
-"<plugin>
-"
-" <scf>
-"
-" <classes>
-"
-" <class>
-"
-" <name>cel.behaviourlayer.ia</name>
-"
-" <implementation>cel_iaBl</implementation>
-"
-" <description>IA Behaviour Layer</description>
-"
-" </class>
-"
-" </classes>
-"
-" </scf>
-"
-"</plugin>
-"
+"<?xml version=\"1.0\"?>"
+"<plugin>"
+" <scf>"
+" <classes>"
+" <class>"
+" <name>cel.behaviourlayer.ia</name>"
+" <implementation>cel_iaBl</implementation>"
+" <description>IA Behaviour Layer</description>"
+" </class>"
+" </classes>"
+" </scf>"
+"</plugin>"
;
#ifndef cel_iaBl_FACTORY_REGISTER_DEFINED
#define cel_iaBl_FACTORY_REGISTER_DEFINED
SCF_DEFINE_FACTORY_FUNC_REGISTRATION(cel_iaBl)
- #endif
+ #endif
class behaviourlayer
{
@@ -52,7 +40,7 @@
#ifndef cel_iaBl_FACTORY_REGISTERED
#define cel_iaBl_FACTORY_REGISTERED
cel_iaBl_StaticInit cel_iaBl_static_init__;
- #endif
+ #endif
public:
behaviourlayer();
};
Modified: branches/release/V0.2/msvc/libcsobjects_staticreg.cpp
===================================================================
--- branches/release/V0.2/msvc/libcsobjects_staticreg.cpp 2007-10-10 10:09:48 UTC (rev 347)
+++ branches/release/V0.2/msvc/libcsobjects_staticreg.cpp 2007-10-10 10:11:48 UTC (rev 348)
@@ -16,43 +16,27 @@
namespace csStaticPluginInit
{
static char const metainfo_csobjects[] =
-"<?xml version=\"1.0\"?>
-"
-"<!-- pfcal3dragdoll.csplugin -->
-"
-"<plugin>
-"
-" <scf>
-"
-" <classes>
-"
-" <class>
-"
-" <name>ia.pcfactory.mesh</name>
-"
-" <implementation>celPf_iaCSMeshObject</implementation>
-"
-" <description>IA cs objects property class</description>
-"
-" <requires>
-"
-" <class>cel.physicallayer</class>
-"
-" </requires>
-"
-" </class>
-"
-" </classes>
-"
-" </scf>
-"
-"</plugin>
-"
+"<?xml version=\"1.0\"?>"
+"<!-- pfcal3dragdoll.csplugin -->"
+"<plugin>"
+" <scf>"
+" <classes>"
+" <class>"
+" <name>ia.pcfactory.mesh</name>"
+" <implementation>celPf_iaCSMeshObject</implementation>"
+" <description>IA cs objects property class</description>"
+" <requires>"
+" <class>cel.physicallayer</class>"
+" </requires>"
+" </class>"
+" </classes>"
+" </scf>"
+"</plugin>"
;
#ifndef celPf_iaCSMeshObject_FACTORY_REGISTER_DEFINED
#define celPf_iaCSMeshObject_FACTORY_REGISTER_DEFINED
SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPf_iaCSMeshObject)
- #endif
+ #endif
class csobjects
{
@@ -60,7 +44,7 @@
#ifndef celPf_iaCSMeshObject_FACTORY_REGISTERED
#define celPf_iaCSMeshObject_FACTORY_REGISTERED
celPf_iaCSMeshObject_StaticInit celPf_iaCSMeshObject_static_init__;
- #endif
+ #endif
public:
csobjects();
};
Modified: branches/release/V0.2/msvc/libforce_script_staticreg.cpp
===================================================================
--- branches/release/V0.2/msvc/libforce_script_staticreg.cpp 2007-10-10 10:09:48 UTC (rev 347)
+++ branches/release/V0.2/msvc/libforce_script_staticreg.cpp 2007-10-10 10:11:48 UTC (rev 348)
@@ -16,43 +16,27 @@
namespace csStaticPluginInit
{
static char const metainfo_force_script[] =
-"<?xml version=\"1.0\"?>
-"
-"<!-- force_script.csplugin -->
-"
-"<plugin>
-"
-" <scf>
-"
-" <classes>
-"
-" <class>
-"
-" <name>ia.pcfactory.scriptcontroller</name>
-"
-" <implementation>celPf_iaScriptController</implementation>
-"
-" <description>IA Script Controller Property Class</description>
-"
-" <requires>
-"
-" <class>cel.physicallayer</class>
-"
-" </requires>
-"
-" </class>
-"
-" </classes>
-"
-" </scf>
-"
-"</plugin>
-"
+"<?xml version=\"1.0\"?>"
+"<!-- force_script.csplugin -->"
+"<plugin>"
+" <scf>"
+" <classes>"
+" <class>"
+" <name>ia.pcfactory.scriptcontroller</name>"
+" <implementation>celPf_iaScriptController</implementation>"
+" <description>IA Script Controller Property Class</description>"
+" <requires>"
+" <class>cel.physicallayer</class>"
+" </requires>"
+" </class>"
+" </classes>"
+" </scf>"
+"</plugin>"
;
#ifndef celPf_iaScriptController_FACTORY_REGISTER_DEFINED
#define celPf_iaScriptController_FACTORY_REGISTER_DEFINED
SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPf_iaScriptController)
- #endif
+ #endif
class force_script
{
@@ -60,7 +44,7 @@
#ifndef celPf_iaScriptController_FACTORY_REGISTERED
#define celPf_iaScriptController_FACTORY_REGISTERED
celPf_iaScriptController_StaticInit celPf_iaScriptController_static_init__;
- #endif
+ #endif
public:
force_script();
};
Modified: branches/release/V0.2/msvc/libpfcharacter_staticreg.cpp
===================================================================
--- branches/release/V0.2/msvc/libpfcharacter_staticreg.cpp 2007-10-10 10:09:48 UTC (rev 347)
+++ branches/release/V0.2/msvc/libpfcharacter_staticreg.cpp 2007-10-10 10:11:48 UTC (rev 348)
@@ -16,65 +16,42 @@
namespace csStaticPluginInit
{
static char const metainfo_pfcharacter[] =
-"<?xml version=\"1.0\"?>
-"
-"<!-- pfcharacter.csplugin -->
-"
-"<plugin>
-"
-" <scf>
-"
-" <classes>
-"
-" <class>
-"
-" <name>ia.pcfactory.character</name>
-"
-" <implementation>celPf_iaCharacter</implementation>
-"
-" <description>IA skeletal animated model Class Factory</description>
-"
-" </class>
-"
-" <class>
-"
-" <name>ia.pcfactory.bone</name>
-"
-" <implementation>celPf_iaBone</implementation>
-"
-" <description>IA bone Class Factory</description>
-"
-" </class>
-"
-" <class>
-"
-" <name>ia.pcfactory.animation</name>
-"
-" <implementation>celPf_iaAnimation</implementation>
-"
-" <description>IA animation Class Factory</description>
-"
-" </class>
-"
-" </classes>
-"
-" </scf>
-"
-"</plugin>
-"
+"<?xml version=\"1.0\"?>"
+"<!-- pfcharacter.csplugin -->"
+"<plugin>"
+" <scf>"
+" <classes>"
+" <class>"
+" <name>ia.pcfactory.character</name>"
+" <implementation>celPf_iaCharacter</implementation>"
+" <description>IA skeletal animated model Class Factory</description>"
+" </class>"
+" <class>"
+" <name>ia.pcfactory.bone</name>"
+" <implementation>celPf_iaBone</implementation>"
+" <description>IA bone Class Factory</description>"
+" </class>"
+" <class>"
+" <name>ia.pcfactory.animation</name>"
+" <implementation>celPf_iaAnimation</implementation>"
+" <description>IA animation Class Factory</description>"
+" </class>"
+" </classes>"
+" </scf>"
+"</plugin>"
;
#ifndef celPf_iaCharacter_FACTORY_REGISTER_DEFINED
#define celPf_iaCharacter_FACTORY_REGISTER_DEFINED
SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPf_iaCharacter)
- #endif
+ #endif
#ifndef celPf_iaBone_FACTORY_REGISTER_DEFINED
#define celPf_iaBone_FACTORY_REGISTER_DEFINED
SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPf_iaBone)
- #endif
+ #endif
#ifndef celPf_iaAnimation_FACTORY_REGISTER_DEFINED
#define celPf_iaAnimation_FACTORY_REGISTER_DEFINED
SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPf_iaAnimation)
- #endif
+ #endif
class pfcharacter
{
@@ -82,15 +59,15 @@
#ifndef celPf_iaCharacter_FACTORY_REGISTERED
#define celPf_iaCharacter_FACTORY_REGISTERED
celPf_iaCharacter_StaticInit celPf_iaCharacter_static_init__;
- #endif
+ #endif
#ifndef celPf_iaBone_FACTORY_REGISTERED
#define celPf_iaBone_FACTORY_REGISTERED
celPf_iaBone_StaticInit celPf_iaBone_static_init__;
- #endif
+ #endif
#ifndef celPf_iaAnimation_FACTORY_REGISTERED
#define celPf_iaAnimation_FACTORY_REGISTERED
celPf_iaAnimation_StaticInit celPf_iaAnimation_static_init__;
- #endif
+ #endif
public:
pfcharacter();
};
Modified: branches/release/V0.2/msvc/libpfguiactor_staticreg.cpp
===================================================================
--- branches/release/V0.2/msvc/libpfguiactor_staticreg.cpp 2007-10-10 10:09:48 UTC (rev 347)
+++ branches/release/V0.2/msvc/libpfguiactor_staticreg.cpp 2007-10-10 10:11:48 UTC (rev 348)
@@ -16,61 +16,38 @@
namespace csStaticPluginInit
{
static char const metainfo_pfguiactor[] =
-"<?xml version=\"1.0\"?>
-"
-"<plugin>
-"
-" <scf>
-"
-" <classes>
-"
-" <class>
-"
-" <name>cel.pcfactory.cammove</name>
-"
-" <implementation>celPf_iaCamMove</implementation>
-"
-" <description>IA CEL camera handling Class Factory</description>
-"
-" <requires>
-"
-" <class>cel.physicallayer</class>
-"
-" </requires>
-"
-" </class>
-"
-" <class>
-"
-" <name>cel.pcfactory.selector</name>
-"
-" <implementation>celPf_iaSelector</implementation>
-"
-" <description>IA CEL mouse selection Class Factory</description>
-"
-" <requires>
-"
-" <class>cel.physicallayer</class>
-"
-" </requires>
-"
-" </class>
-"
-" </classes>
-"
-" </scf>
-"
-"</plugin>
-"
+"<?xml version=\"1.0\"?>"
+"<plugin>"
+" <scf>"
+" <classes>"
+" <class>"
+" <name>cel.pcfactory.cammove</name>"
+" <implementation>celPf_iaCamMove</implementation>"
+" <description>IA CEL camera handling Class Factory</description>"
+" <requires>"
+" <class>cel.physicallayer</class>"
+" </requires>"
+" </class>"
+" <class>"
+" <name>cel.pcfactory.selector</name>"
+" <implementation>celPf_iaSelector</implementation>"
+" <description>IA CEL mouse selection Class Factory</description>"
+" <requires>"
+" <class>cel.physicallayer</class>"
+" </requires>"
+" </class>"
+" </classes>"
+" </scf>"
+"</plugin>"
;
#ifndef celPf_iaCamMove_FACTORY_REGISTER_DEFINED
#define celPf_iaCamMove_FACTORY_REGISTER_DEFINED
SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPf_iaCamMove)
- #endif
+ #endif
#ifndef celPf_iaSelector_FACTORY_REGISTER_DEFINED
#define celPf_iaSelector_FACTORY_REGISTER_DEFINED
SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPf_iaSelector)
- #endif
+ #endif
class pfguiactor
{
@@ -78,11 +55,11 @@
#ifndef celPf_iaCamMove_FACTORY_REGISTERED
#define celPf_iaCamMove_FACTORY_REGISTERED
celPf_iaCamMove_StaticInit celPf_iaCamMove_static_init__;
- #endif
+ #endif
#ifndef celPf_iaSelector_FACTORY_REGISTERED
#define celPf_iaSelector_FACTORY_REGISTERED
celPf_iaSelector_StaticInit celPf_iaSelector_static_init__;
- #endif
+ #endif
public:
pfguiactor();
};
Modified: branches/release/V0.2/msvc/libpfobj_properties_staticreg.cpp
===================================================================
--- branches/release/V0.2/msvc/libpfobj_properties_staticreg.cpp 2007-10-10 10:09:48 UTC (rev 347)
+++ branches/release/V0.2/msvc/libpfobj_properties_staticreg.cpp 2007-10-10 10:11:48 UTC (rev 348)
@@ -16,41 +16,26 @@
namespace csStaticPluginInit
{
static char const metainfo_pfobj_properties[] =
-"<?xml version=\"1.0\"?>
-"
-"<plugin>
-"
-" <scf>
-"
-" <classes>
-"
-" <class>
-"
-" <name>ia.propclass.objectproperties</name>
-"
-" <implementation>celPf_iaObjectProperties</implementation>
-"
-" <description></description>
-"
-" <requires>
-"
-" <class>cel.physicallayer</class>
-"
-" </requires>
-"
-" </class>
-"
-" </classes>
-"
-" </scf>
-"
-"</plugin>
-"
+"<?xml version=\"1.0\"?>"
+"<plugin>"
+" <scf>"
+" <classes>"
+" <class>"
+" <name>ia.propclass.objectproperties</name>"
+" <implementation>celPf_iaObjectProperties</implementation>"
+" <description></description>"
+" <requires>"
+" <class>cel.physicallayer</class>"
+" </requires>"
+" </class>"
+" </classes>"
+" </scf>"
+"</plugin>"
;
#ifndef celPf_iaObjectProperties_FACTORY_REGISTER_DEFINED
#define celPf_iaObjectProperties_FACTORY_REGISTER_DEFINED
SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPf_iaObjectProperties)
- #endif
+ #endif
class pfobj_properties
{
@@ -58,7 +43,7 @@
#ifndef celPf_iaObjectProperties_FACTORY_REGISTERED
#define celPf_iaObjectProperties_FACTORY_REGISTERED
celPf_iaObjectProperties_StaticInit celPf_iaObjectProperties_static_init__;
- #endif
+ #endif
public:
pfobj_properties();
};
Modified: branches/release/V0.2/msvc/libpfodedynamics_staticreg.cpp
===================================================================
--- branches/release/V0.2/msvc/libpfodedynamics_staticreg.cpp 2007-10-10 10:09:48 UTC (rev 347)
+++ branches/release/V0.2/msvc/libpfodedynamics_staticreg.cpp 2007-10-10 10:11:48 UTC (rev 348)
@@ -16,85 +16,54 @@
namespace csStaticPluginInit
{
static char const metainfo_pfodedynamics[] =
-"<?xml version=\"1.0\"?>
-"
-"<!-- pfodedynamics.csplugin -->
-"
-"<plugin>
-"
-" <scf>
-"
-" <classes>
-"
-" <class>
-"
-" <name>ia.pcfactory.odedynamicsystem</name>
-"
-" <implementation>celPf_iaODEDynamicsSystem</implementation>
-"
-" <description>IA CEL ODE Dynamic System Class Factory</description>
-"
-" </class>
-"
-" <class>
-"
-" <name>ia.pcfactory.odejoint</name>
-"
-" <implementation>celPf_iaODEJoint</implementation>
-"
-" <description>IA CEL ODE Joint Class Factory</description>
-"
-" </class>
-"
-" <class>
-"
-" <name>ia.pcfactory.collider</name>
-"
-" <implementation>celPf_iaCollider</implementation>
-"
-" <description>IA Collider Class Factory</description>
-"
-" </class>
-"
-" <class>
-"
-" <name>cel.pcfactory.rigidbody</name>
-"
-" <implementation>celPf_iaRigidBody</implementation>
-"
-" <description>IA CEL Rigidbody Class Factory</description>
-"
-" <requires>
-"
-" <class>cel.physicallayer</class>
-"
-" </requires>
-"
-" </class>
-"
-" </classes>
-"
-" </scf>
-"
-"</plugin>
-"
+"<?xml version=\"1.0\"?>"
+"<!-- pfodedynamics.csplugin -->"
+"<plugin>"
+" <scf>"
+" <classes>"
+" <class>"
+" <name>ia.pcfactory.odedynamicsystem</name>"
+" <implementation>celPf_iaODEDynamicsSystem</implementation>"
+" <description>IA CEL ODE Dynamic System Class Factory</description>"
+" </class>"
+" <class>"
+" <name>ia.pcfactory.odejoint</name>"
+" <implementation>celPf_iaODEJoint</implementation>"
+" <description>IA CEL ODE Joint Class Factory</description>"
+" </class>"
+" <class>"
+" <name>ia.pcfactory.collider</name>"
+" <implementation>celPf_iaCollider</implementation>"
+" <description>IA Collider Class Factory</description>"
+" </class>"
+" <class>"
+" <name>cel.pcfactory.rigidbody</name>"
+" <implementation>celPf_iaRigidBody</implementation>"
+" <description>IA CEL Rigidbody Class Factory</description>"
+" <requires>"
+" <class>cel.physicallayer</class>"
+" </requires>"
+" </class>"
+" </classes>"
+" </scf>"
+"</plugin>"
;
#ifndef celPf_iaODEDynamicsSystem_FACTORY_REGISTER_DEFINED
#define celPf_iaODEDynamicsSystem_FACTORY_REGISTER_DEFINED
SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPf_iaODEDynamicsSystem)
- #endif
+ #endif
#ifndef celPf_iaODEJoint_FACTORY_REGISTER_DEFINED
#define celPf_iaODEJoint_FACTORY_REGISTER_DEFINED
SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPf_iaODEJoint)
- #endif
+ #endif
#ifndef celPf_iaCollider_FACTORY_REGISTER_DEFINED
#define celPf_iaCollider_FACTORY_REGISTER_DEFINED
SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPf_iaCollider)
- #endif
+ #endif
#ifndef celPf_iaRigidBody_FACTORY_REGISTER_DEFINED
#define celPf_iaRigidBody_FACTORY_REGISTER_DEFINED
SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPf_iaRigidBody)
- #endif
+ #endif
class pfodedynamics
{
@@ -102,19 +71,19 @@
#ifndef celPf_iaODEDynamicsSystem_FACTORY_REGISTERED
#define celPf_iaODEDynamicsSystem_FACTORY_REGISTERED
celPf_iaODEDynamicsSystem_StaticInit celPf_iaODEDynamicsSystem_static_init__;
- #endif
+ #endif
#ifndef celPf_iaODEJoint_FACTORY_REGISTERED
#define celPf_iaODEJoint_FACTORY_REGISTERED
celPf_iaODEJoint_StaticInit celPf_iaODEJoint_static_init__;
- #endif
+ #endif
#ifndef celPf_iaCollider_FACTORY_REGISTERED
#define celPf_iaCollider_FACTORY_REGISTERED
celPf_iaCollider_StaticInit celPf_iaCollider_static_init__;
- #endif
+ #endif
#ifndef celPf_iaRigidBody_FACTORY_REGISTERED
#define celPf_iaRigidBody_FACTORY_REGISTERED
celPf_iaRigidBody_StaticInit celPf_iaRigidBody_static_init__;
- #endif
+ #endif
public:
pfodedynamics();
};
Modified: branches/release/V0.2/msvc/plgbehaviourlayer.rc
===================================================================
--- branches/release/V0.2/msvc/plgbehaviourlayer.rc 2007-10-10 10:09:48 UTC (rev 347)
+++ branches/release/V0.2/msvc/plgbehaviourlayer.rc 2007-10-10 10:11:48 UTC (rev 348)
@@ -33,29 +33,17 @@
17485 RCDATA
{
- "<?xml version=""1.0""?>
-",
- "<plugin>
-",
- " <scf>
-",
- " <classes>
-",
- " <class>
-",
- " <name>cel.behaviourlayer.ia</name>
-",
- " <implementation>cel_iaBl</implementation>
-",
- " <description>IA Behaviour Layer</description>
-",
- " </class>
-",
- " </classes>
-",
- " </scf>
-",
- "</plugin>
-",
+ "<?xml version=""1.0""?>",
+ "<plugin>",
+ " <scf>",
+ " <classes>",
+ " <class>",
+ " <name>cel.behaviourlayer.ia</name>",
+ " <implementation>cel_iaBl</implementation>",
+ " <description>IA Behaviour Layer</description>",
+ " </class>",
+ " </classes>",
+ " </scf>",
+ "</plugin>",
"\0"
}
Modified: branches/release/V0.2/msvc/plgcsobjects.rc
===================================================================
--- branches/release/V0.2/msvc/plgcsobjects.rc 2007-10-10 10:09:48 UTC (rev 347)
+++ branches/release/V0.2/msvc/plgcsobjects.rc 2007-10-10 10:11:48 UTC (rev 348)
@@ -33,37 +33,21 @@
17485 RCDATA
{
- "<?xml version=""1.0""?>
-",
- "<!-- pfcal3dragdoll.csplugin -->
-",
- "<plugin>
-",
- " <scf>
-",
- " <classes>
-",
- " <class>
-",
- " <name>ia.pcfactory.mesh</name>
-",
- " <implementation>celPf_iaCSMeshObject</implementation>
-",
- " <description>IA cs objects property class</description>
-",
- " <requires>
-",
- " <class>cel.physicallayer</class>
-",
- " </requires>
-",
- " </class>
-",
- " </classes>
-",
- " </scf>
-",
- "</plugin>
-",
+ "<?xml version=""1.0""?>",
+ "<!-- pfcal3dragdoll.csplugin -->",
+ "<plugin>",
+ " <scf>",
+ " <classes>",
+ " <class>",
+ " <name>ia.pcfactory.mesh</name>",
+ " <implementation>celPf_iaCSMeshObject</implementation>",
+ " <description>IA cs objects property class</description>",
+ " <requires>",
+ " <class>cel.physicallayer</class>",
+ " </requires>",
+ " </class>",
+ " </classes>",
+ " </scf>",
+ "</plugin>",
"\0"
}
Modified: branches/release/V0.2/msvc/plgforce_script.rc
===================================================================
--- branches/release/V0.2/msvc/plgforce_script.rc 2007-10-10 10:09:48 UTC (rev 347)
+++ branches/release/V0.2/msvc/plgforce_script.rc 2007-10-10 10:11:48 UTC (rev 348)
@@ -33,37 +33,21 @@
17485 RCDATA
{
- "<?xml version=""1.0""?>
-",
- "<!-- force_script.csplugin -->
-",
- "<plugin>
-",
- " <scf>
-",
- " <classes>
-",
- " <class>
-",
- " <name>ia.pcfactory.scriptcontroller</name>
-",
- " <implementation>celPf_iaScriptController</implementation>
-",
- " <description>IA Script Controller Property Class</description>
-",
- " <requires>
-",
- " <class>cel.physicallayer</class>
-",
- " </requires>
-",
- " </class>
-",
- " </classes>
-",
- " </scf>
-",
- "</plugin>
-",
+ "<?xml version=""1.0""?>",
+ "<!-- force_script.csplugin -->",
+ "<plugin>",
+ " <scf>",
+ " <classes>",
+ " <class>",
+ " <name>ia.pcfactory.scriptcontroller</name>",
+ " <implementation>celPf_iaScriptController</implementation>",
+ " <description>IA Script Controller Property Class</description>",
+ " <requires>",
+ " <class>cel.physicallayer</class>",
+ " </requires>",
+ " </class>",
+ " </classes>",
+ " </scf>",
+ "</plugin>",
"\0"
}
Modified: branches/release/V0.2/msvc/plgpfcharacter.rc
===================================================================
--- branches/release/V0.2/msvc/plgpfcharacter.rc 2007-10-10 10:09:48 UTC (rev 347)
+++ branches/release/V0.2/msvc/plgpfcharacter.rc 2007-10-10 10:11:48 UTC (rev 348)
@@ -33,51 +33,28 @@
17485 RCDATA
{
- "<?xml version=""1.0""?>
-",
- "<!-- pfcharacter.csplugin -->
-",
- "<plugin>
-",
- " <scf>
-",
- " <classes>
-",
- " <class>
-",
- " <name>ia.pcfactory.character</name>
-",
- " <implementation>celPf_iaCharacter</implementation>
-",
- " <description>IA skeletal animated model Class Factory</description>
-",
- " </class>
-",
- " <class>
-",
- " <name>ia.pcfactory.bone</name>
-",
- " <implementation>celPf_iaBone</implementation>
-",
- " <description>IA bone Class Factory</description>
-",
- " </class>
-",
- " <class>
-",
- " <name>ia.pcfactory.animation</name>
-",
- " <implementation>celPf_iaAnimation</implementation>
-",
- " <description>IA animation Class Factory</description>
-",
- " </class>
-",
- " </classes>
-",
- " </scf>
-",
- "</plugin>
-",
+ "<?xml version=""1.0""?>",
+ "<!-- pfcharacter.csplugin -->",
+ "<plugin>",
+ " <scf>",
+ " <classes>",
+ " <class>",
+ " <name>ia.pcfactory.character</name>",
+ " <implementation>celPf_iaCharacter</implementation>",
+ " <description>IA skeletal animated model Class Factory</description>",
+ " </class>",
+ " <class>",
+ " <name>ia.pcfactory.bone</name>",
+ " <implementation>celPf_iaBone</implementation>",
+ " <description>IA bone Class Factory</description>",
+ " </class>",
+ " <class>",
+ " <name>ia.pcfactory.animation</name>",
+ " <implementation>celPf_iaAnimation</implementation>",
+ " <description>IA animation Class Factory</description>",
+ " </class>",
+ " </classes>",
+ " </scf>",
+ "</plugin>",
"\0"
}
Modified: branches/release/V0.2/msvc/plgpfguiactor.rc
===================================================================
--- branches/release/V0.2/msvc/plgpfguiactor.rc 2007-10-10 10:09:48 UTC (rev 347)
+++ branches/release/V0.2/msvc/plgpfguiactor.rc 2007-10-10 10:11:48 UTC (rev 348)
@@ -33,51 +33,28 @@
17485 RCDATA
{
- "<?xml version=""1.0""?>
-",
- "<plugin>
-",
- " <scf>
-",
- " <classes>
-",
- " <class>
-",
- " <name>cel.pcfactory.cammove</name>
-",
- " <implementation>celPf_iaCamMove</implementation>
-",
- " <description>IA CEL camera handling Class Factory</description>
-",
- " <requires>
-",
- " <class>cel.physicallayer</class>
-",
- " </requires>
-",
- " </class>
-",
- " <class>
-",
- " <name>cel.pcfactory.selector</name>
-",
- " <implementation>celPf_iaSelector</implementation>
-",
- " <description>IA CEL mouse selection Class Factory</description>
-",
- " <requires>
-",
- " <class>cel.physicallayer</class>
-",
- " </requires>
-",
- " </class>
-",
- " </classes>
-",
- " </scf>
-",
- "</plugin>
-",
+ "<?xml version=""1.0""?>",
+ "<plugin>",
+ " <scf>",
+ " <classes>",
+ " <class>",
+ " <name>cel.pcfactory.cammove</name>",
+ " <implementation>celPf_iaCamMove</implementation>",
+ " <description>IA CEL camera handling Class Factory</description>",
+ " <requires>",
+ " <class>cel.physicallayer</class>",
+ " </requires>",
+ " </class>",
+ " <class>",
+ " <name>cel.pcfactory.selector</name>",
+ " <implementation>celPf_iaSelector</implementation>",
+ " <description>IA CEL mouse selection Class Factory</description>",
+ " <requires>",
+ " <class>cel.physicallayer</class>",
+ " </requires>",
+ " </class>",
+ " </classes>",
+ " </scf>",
+ "</plugin>",
"\0"
}
Modified: branches/release/V0.2/msvc/plgpfobj_properties.rc
===================================================================
--- branches/release/V0.2/msvc/plgpfobj_properties.rc 2007-10-10 10:09:48 UTC (rev 347)
+++ branches/release/V0.2/msvc/plgpfobj_properties.rc 2007-10-10 10:11:48 UTC (rev 348)
@@ -33,35 +33,20 @@
17485 RCDATA
{
- "<?xml version=""1.0""?>
-",
- "<plugin>
-",
- " <scf>
-",
- " <classes>
-",
- " <class>
-",
- " <name>ia.propclass.objectproperties</name>
-",
- " <implementation>celPf_iaObjectProperties</implementation>
-",
- " <description></description>
-",
- " <requires>
-",
- " <class>cel.physicallayer</class>
-",
- " </requires>
-",
- " </class>
-",
- " </classes>
-",
- " </scf>
-",
- "</plugin>
-",
+ "<?xml version=""1.0""?>",
+ "<plugin>",
+ " <scf>",
+ " <classes>",
+ " <class>",
+ " <name>ia.propclass.objectproperties</name>",
+ " <implementation>celPf_iaObjectProperties</implementation>",
+ " <description></description>",
+ " <requires>",
+ " <class>cel.physicallayer</class>",
+ " </requires>",
+ " </class>",
+ " </classes>",
+ " </scf>",
+ "</plugin>",
"\0"
}
Modified: branches/release/V0.2/msvc/plgpfodedynamics.rc
===================================================================
--- branches/release/V0.2/msvc/plgpfodedynamics.rc 2007-10-10 10:09:48 UTC (rev 347)
+++ branches/release/V0.2/msvc/plgpfodedynamics.rc 2007-10-10 10:11:48 UTC (rev 348)
@@ -33,67 +33,36 @@
17485 RCDATA
{
- "<?xml version=""1.0""?>
-",
- "<!-- pfodedynamics.csplugin -->
-",
- "<plugin>
-",
- " <scf>
-",
- " <classes>
-",
- " <class>
-",
- " <name>ia.pcfactory.odedynamicsystem</name>
-",
- " <implementation>celPf_iaODEDynamicsSystem</implementation>
-",
- " <description>IA CEL ODE Dynamic System Class Factory</description>
-",
- " </class>
-",
- " <class>
-",
- " <name>ia.pcfactory.odejoint</name>
-",
- " <implementation>celPf_iaODEJoint</implementation>
-",
- " <description>IA CEL ODE Joint Class Factory</description>
-",
- " </class>
-",
- " <class>
-",
- " <name>ia.pcfactory.collider</name>
-",
- " <implementation>celPf_iaCollider</implementation>
-",
- " <description>IA Collider Class Factory</description>
-",
- " </class>
-",
- " <class>
-",
- " <name>cel.pcfactory.rigidbody</name>
-",
- " <implementation>celPf_iaRigidBody</implementation>
-",
- " <description>IA CEL Rigidbody Class Factory</description>
-",
- " <requires>
-",
- " <class>cel.physicallayer</class>
-",
- " </requires>
-",
- " </class>
-",
- " </classes>
-",
- " </scf>
-",
- "</plugin>
-",
+ "<?xml version=""1.0""?>",
+ "<!-- pfodedynamics.csplugin -->",
+ "<plugin>",
+ " <scf>",
+ " <classes>",
+ " <class>",
+ " <name>ia.pcfactory.odedynamicsystem</name>",
+ " <implementation>celPf_iaODEDynamicsSystem</implementation>",
+ " <description>IA CEL ODE Dynamic System Class Factory</description>",
+ " </class>",
+ " <class>",
+ " <name>ia.pcfactory.odejoint</name>",
+ " <implementation>celPf_iaODEJoint</implementation>",
+ " <description>IA CEL ODE Joint Class Factory</description>",
+ " </class>",
+ " <class>",
+ " <name>ia.pcfactory.collider</name>",
+ " <implementation>celPf_iaCollider</implementation>",
+ " <description>IA Collider Class Factory</description>",
+ " </class>",
+ " <class>",
+ " <name>cel.pcfactory.rigidbody</name>",
+ " <implementation>celPf_iaRigidBody</implementation>",
+ " <description>IA CEL Rigidbody Class Factory</description>",
+ " <requires>",
+ " <class>cel.physicallayer</class>",
+ " </requires>",
+ " </class>",
+ " </classes>",
+ " </scf>",
+ "</plugin>",
"\0"
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ob...@us...> - 2007-10-10 10:09:44
|
Revision: 347
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=347&view=rev
Author: obi666
Date: 2007-10-10 03:09:48 -0700 (Wed, 10 Oct 2007)
Log Message:
-----------
Regenerated msvc project files.
Modified Paths:
--------------
trunk/Jamfile.in
trunk/msvc/7/wksiaeditor.sln
trunk/msvc/71/wksiaeditor.sln
trunk/msvc/8/wksiaeditor.sln
trunk/msvc/libbehaviourlayer_staticreg.cpp
trunk/msvc/libcsobjects_staticreg.cpp
trunk/msvc/libforce_script_staticreg.cpp
trunk/msvc/libpfcharacter_staticreg.cpp
trunk/msvc/libpfguiactor_staticreg.cpp
trunk/msvc/libpfobj_properties_staticreg.cpp
trunk/msvc/libpfodedynamics_staticreg.cpp
trunk/msvc/plgbehaviourlayer.rc
trunk/msvc/plgcsobjects.rc
trunk/msvc/plgforce_script.rc
trunk/msvc/plgpfcharacter.rc
trunk/msvc/plgpfguiactor.rc
trunk/msvc/plgpfobj_properties.rc
trunk/msvc/plgpfodedynamics.rc
trunk/vfs.cfg
Modified: trunk/Jamfile.in
===================================================================
--- trunk/Jamfile.in 2007-10-08 12:38:05 UTC (rev 346)
+++ trunk/Jamfile.in 2007-10-10 10:09:48 UTC (rev 347)
@@ -1,122 +1,122 @@
-TOP ?= "@top_srcdir@" ;
-BUILDTOP ?= "@top_builddir@" ;
-
-SubDir TOP ;
-
-IncludeDir ;
-IncludeDir src ;
-IncludeDir src include ;
-IncludeDir $(BUILDTOP) : : literal transient ;
-
-CleanDir clean :
- out ;
-Clean distclean :
- aclocal.m4
- config.h
- config.h.in~
- config.log
- config.status
- config.status.lineno
- config.cache
- configure.lineno
- Jamconfig
- Jamfile ;
-CleanDir distclean :
- autom4te.cache ;
-Depends distclean : clean ;
-
-Clean maintainerclean :
- config.h.in
- configure ;
-Depends maintainerclean : distclean ;
-
-Help distclean : "Remove built targets and configuration" ;
-Help maintainerclean :
- "Remove built targets, configuration, and generated files." ;
-
-# Set up subdirectories into which the different generated project for
-# different go.
-MsvcGenSubDir TOP msvc : common ;
-MsvcGenSubDir TOP msvc 7 : 7 ;
-MsvcGenSubDir TOP msvc 71 : 71 ;
-MsvcGenSubDir TOP msvc 8 : 8 ;
-MsvcGenTemplateDir TOP mk msvcgen ;
-
-# Customize the build configurations to contain some defines required by
-# CrystalSpace. NOTE: The file with the customization options is assumed
-# to reside in mk/msvcgen/.
-MsvcGenVariable customize : custom.cslib ;
-
-# Set up the workspace we want msvcgen to synthesize.
-MsvcGenWorkspace iaeditor ;
-
-local hash = "\$" ;
-MsvcGenConfig CRYSTAL.AVAILABLE : yes ;
-MsvcGenConfig CRYSTAL.DEFINES ;
-MsvcGenConfig CRYSTAL.CFLAGS ;
-MsvcGenConfig CRYSTAL.LFLAGS ;
-MsvcGenConfig CRYSTAL.LIBS : "libcrystalspace.lib" ;
-MsvcGenConfig CRYSTAL.LIBS.DEBUG : "libcrystalspace_d.lib" ;
-MsvcGenConfig CRYSTAL.INCDIRS :
- [ ConcatDirs .. .. .. CS include ]
- [ ConcatDirs .. .. .. CS include csutil win32 ]
- [ ConcatDirs "$(hash)(CRYSTAL)" include ]
- [ ConcatDirs "$(hash)(CRYSTAL)" include csutil win32 ] ;
-MsvcGenConfig CRYSTAL.LIBDIRS :
- [ ConcatDirs .. .. .. CS out release$(MSVC_VERSION) libs ]
- [ ConcatDirs .. .. .. CS libs csutil win32 libs ]
- [ ConcatDirs "$(hash)(CRYSTAL)" out release$(MSVC_VERSION) libs ]
- [ ConcatDirs "$(hash)(CRYSTAL)" libs csutil win32 libs ] ;
-MsvcGenConfig CRYSTAL.LIBDIRS.DEBUG :
- [ ConcatDirs .. .. .. CS out debug$(MSVC_VERSION) libs ]
- [ ConcatDirs .. .. .. CS libs csutil win32 libs ]
- [ ConcatDirs "$(hash)(CRYSTAL)" out debug$(MSVC_VERSION) libs ]
- [ ConcatDirs "$(hash)(CRYSTAL)" libs csutil win32 libs ] ;
-
-
-if $(CEL.DESIRED) = yes
-{
- MsvcGenConfig CEL.AVAILABLE : yes ;
- MsvcGenConfig CEL.DEFINES : USE_CEL ;
- MsvcGenConfig CEL.CFLAGS ;
- MsvcGenConfig CEL.LFLAGS ;
- MsvcGenConfig CEL.LIBS : "libceltool.lib" ;
- MsvcGenConfig CEL.LIBS.DEBUG : "libceltool_d.lib" ;
- MsvcGenConfig CEL.INCDIRS :
- [ ConcatDirs .. .. .. cel include ]
- [ ConcatDirs "$(hash)(CEL)" include ]
- [ ConcatDirs "$(hash)(CEL)" include cel ] ;
- MsvcGenConfig CEL.LIBDIRS :
- [ ConcatDirs .. .. .. cel out release libs ]
- [ ConcatDirs "$(hash)(CEL)" out release libs ]
- [ ConcatDirs "$(hash)(CEL)" libs ] ;
- MsvcGenConfig CEL.LIBDIRS.DEBUG :
- [ ConcatDirs .. .. .. cel out debug libs ]
- [ ConcatDirs "$(hash)(CEL)" out debug libs ]
- [ ConcatDirs "$(hash)(CEL)" libs ] ;
-}
-
-MsvcGenConfig WX.AVAILABLE : yes ;
-MsvcGenConfig WX.DEFINES : "wxUSE_GUI=1 WXUSINGDLL=1" ;
-MsvcGenConfig WX.LIBS : "wxbase28.lib wxmsw28_core.lib wxmsw28_gl.lib opengl32.lib wxmsw28_aui.lib" ;
-MsvcGenConfig WX.DEFINES.DEBUG : "wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;" ;
-MsvcGenConfig WX.CFLAGS : "" ;
-MsvcGenConfig WX.LFLAGS : "" ;
-MsvcGenConfig WX.LIBS.DEBUG : "wxbase28d.lib wxmsw28d_core.lib wxmsw28d_gl.lib opengl32.lib wxmsw28d_aui.lib" ;
-
-# Set project-specific compiler and linker options for msvcgen.
-#MsvcDefine MY_DEFINE : "my value" ;
-#MsvcDefine MY_RELEASE_DEFINE : "my release value" : release ;
-#MsvcDefine MY_DEBUG_DEFINE : "my debug value" : debug ;
-#MsvcCFlags : "/I \"my\\inc\\path\"" : release ;
-#MsvcCFlags : "/I \"my\\debuginc\\path\"" : debug ;
-#MsvcLFlags : "/libpath:\"my\\lib\\path\"" : release ;
-#MsvcLFlags : "/libpath:\"my\\debuglib\\path\"" : debug ;
-#MsvcGenConfig SUPERCOOL.AVAILABLE : yes ;
-#MsvcGenConfig SUPERCOOL.LIBS : supercool.lib ;
-#MsvcGenConfig SUPERCOOL.LIBS.DEBUG : supercooldebug.lib ;
-
-Description iaeditorall : "IAEditor and related plugins" ;
-RegisterCompileGroups iaeditorall ;
-
-SubInclude TOP src ;
+TOP ?= "@top_srcdir@" ;
+BUILDTOP ?= "@top_builddir@" ;
+
+SubDir TOP ;
+
+IncludeDir ;
+IncludeDir src ;
+IncludeDir src include ;
+IncludeDir $(BUILDTOP) : : literal transient ;
+
+CleanDir clean :
+ out ;
+Clean distclean :
+ aclocal.m4
+ config.h
+ config.h.in~
+ config.log
+ config.status
+ config.status.lineno
+ config.cache
+ configure.lineno
+ Jamconfig
+ Jamfile ;
+CleanDir distclean :
+ autom4te.cache ;
+Depends distclean : clean ;
+
+Clean maintainerclean :
+ config.h.in
+ configure ;
+Depends maintainerclean : distclean ;
+
+Help distclean : "Remove built targets and configuration" ;
+Help maintainerclean :
+ "Remove built targets, configuration, and generated files." ;
+
+# Set up subdirectories into which the different generated project for
+# different go.
+MsvcGenSubDir TOP msvc : common ;
+MsvcGenSubDir TOP msvc 7 : 7 ;
+MsvcGenSubDir TOP msvc 71 : 71 ;
+MsvcGenSubDir TOP msvc 8 : 8 ;
+MsvcGenTemplateDir TOP mk msvcgen ;
+
+# Customize the build configurations to contain some defines required by
+# CrystalSpace. NOTE: The file with the customization options is assumed
+# to reside in mk/msvcgen/.
+MsvcGenVariable customize : custom.cslib ;
+
+# Set up the workspace we want msvcgen to synthesize.
+MsvcGenWorkspace iaeditor ;
+
+local hash = "\$" ;
+MsvcGenConfig CRYSTAL.AVAILABLE : yes ;
+MsvcGenConfig CRYSTAL.DEFINES ;
+MsvcGenConfig CRYSTAL.CFLAGS ;
+MsvcGenConfig CRYSTAL.LFLAGS ;
+MsvcGenConfig CRYSTAL.LIBS : "libcrystalspace.lib" ;
+MsvcGenConfig CRYSTAL.LIBS.DEBUG : "libcrystalspace_d.lib" ;
+MsvcGenConfig CRYSTAL.INCDIRS :
+ [ ConcatDirs .. .. .. CS include ]
+ [ ConcatDirs .. .. .. CS include csutil win32 ]
+ [ ConcatDirs "$(hash)(CRYSTAL)" include ]
+ [ ConcatDirs "$(hash)(CRYSTAL)" include csutil win32 ] ;
+MsvcGenConfig CRYSTAL.LIBDIRS :
+ [ ConcatDirs .. .. .. CS out release$(MSVC_VERSION) libs ]
+ [ ConcatDirs .. .. .. CS libs csutil win32 libs ]
+ [ ConcatDirs "$(hash)(CRYSTAL)" out release$(MSVC_VERSION) libs ]
+ [ ConcatDirs "$(hash)(CRYSTAL)" libs csutil win32 libs ] ;
+MsvcGenConfig CRYSTAL.LIBDIRS.DEBUG :
+ [ ConcatDirs .. .. .. CS out debug$(MSVC_VERSION) libs ]
+ [ ConcatDirs .. .. .. CS libs csutil win32 libs ]
+ [ ConcatDirs "$(hash)(CRYSTAL)" out debug$(MSVC_VERSION) libs ]
+ [ ConcatDirs "$(hash)(CRYSTAL)" libs csutil win32 libs ] ;
+
+
+if $(CEL.DESIRED) = yes
+{
+ MsvcGenConfig CEL.AVAILABLE : yes ;
+ MsvcGenConfig CEL.DEFINES : USE_CEL ;
+ MsvcGenConfig CEL.CFLAGS ;
+ MsvcGenConfig CEL.LFLAGS ;
+ MsvcGenConfig CEL.LIBS : "libceltool.lib" ;
+ MsvcGenConfig CEL.LIBS.DEBUG : "libceltool_d.lib" ;
+ MsvcGenConfig CEL.INCDIRS :
+ [ ConcatDirs .. .. .. cel include ]
+ [ ConcatDirs "$(hash)(CEL)" include ]
+ [ ConcatDirs "$(hash)(CEL)" include cel ] ;
+ MsvcGenConfig CEL.LIBDIRS :
+ [ ConcatDirs .. .. .. cel out release libs ]
+ [ ConcatDirs "$(hash)(CEL)" out release libs ]
+ [ ConcatDirs "$(hash)(CEL)" libs ] ;
+ MsvcGenConfig CEL.LIBDIRS.DEBUG :
+ [ ConcatDirs .. .. .. cel out debug libs ]
+ [ ConcatDirs "$(hash)(CEL)" out debug libs ]
+ [ ConcatDirs "$(hash)(CEL)" libs ] ;
+}
+
+MsvcGenConfig WX.AVAILABLE : yes ;
+MsvcGenConfig WX.DEFINES : "wxUSE_GUI=1 WXUSINGDLL=1" ;
+MsvcGenConfig WX.LIBS : "wxbase28.lib wxmsw28_core.lib wxmsw28_gl.lib opengl32.lib wxmsw28_aui.lib" ;
+MsvcGenConfig WX.DEFINES.DEBUG : "wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;" ;
+MsvcGenConfig WX.CFLAGS : "" ;
+MsvcGenConfig WX.LFLAGS : "" ;
+MsvcGenConfig WX.LIBS.DEBUG : "wxbase28d.lib wxmsw28d_core.lib wxmsw28d_gl.lib opengl32.lib wxmsw28d_aui.lib" ;
+
+# Set project-specific compiler and linker options for msvcgen.
+#MsvcDefine MY_DEFINE : "my value" ;
+#MsvcDefine MY_RELEASE_DEFINE : "my release value" : release ;
+#MsvcDefine MY_DEBUG_DEFINE : "my debug value" : debug ;
+#MsvcCFlags : "/I \"my\\inc\\path\"" : release ;
+#MsvcCFlags : "/I \"my\\debuginc\\path\"" : debug ;
+#MsvcLFlags : "/libpath:\"my\\lib\\path\"" : release ;
+#MsvcLFlags : "/libpath:\"my\\debuglib\\path\"" : debug ;
+#MsvcGenConfig SUPERCOOL.AVAILABLE : yes ;
+#MsvcGenConfig SUPERCOOL.LIBS : supercool.lib ;
+#MsvcGenConfig SUPERCOOL.LIBS.DEBUG : supercooldebug.lib ;
+
+Description iaeditorall : "IAEditor and related plugins" ;
+RegisterCompileGroups iaeditorall ;
+
+SubInclude TOP src ;
Modified: trunk/msvc/7/wksiaeditor.sln
===================================================================
--- trunk/msvc/7/wksiaeditor.sln 2007-10-08 12:38:05 UTC (rev 346)
+++ trunk/msvc/7/wksiaeditor.sln 2007-10-10 10:09:48 UTC (rev 347)
@@ -1,19 +1,11 @@
Microsoft Visual Studio Solution File, Format Version 7.00
# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appiaeditor", "appiaeditor.vcproj", "{133F3D88-940F-DE6D-3661-AD25DF8A3C9A}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpall_iaeditor", "grpall_iaeditor.vcproj", "{D1D7ECA1-1553-368F-9A83-24C347043389}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpapps_iaeditor", "grpapps_iaeditor.vcproj", "{0C486056-C033-073A-1D07-17098688877C}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpiaeditorall_iaeditor", "grpiaeditorall_iaeditor.vcproj", "{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grplibs_iaeditor", "grplibs_iaeditor.vcproj", "{C4CEA535-48F5-C518-8A72-73A9854CCB60}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpplugins_iaeditor", "grpplugins_iaeditor.vcproj", "{D23A398F-9918-ED87-924E-880E7E75BD53}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpropgrid", "libpropgrid.vcproj", "{D8C59DB7-C610-DEB9-C81D-6E14959A2251}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgbehaviourlayer", "plgbehaviourlayer.vcproj", "{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgcsobjects", "plgcsobjects.vcproj", "{50EFF507-6FE4-9526-36E0-E0DED21E1BBC}"
@@ -34,19 +26,13 @@
ConfigName.1 = Debug
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.0 = {D8C59DB7-C610-DEB9-C81D-6E14959A2251}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.0 = {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.1 = {D8C59DB7-C610-DEB9-C81D-6E14959A2251}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.2 = {B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.3 = {50EFF507-6FE4-9526-36E0-E0DED21E1BBC}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.4 = {7EA547E0-DD90-151E-6662-2B9FE705C20B}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.5 = {F8896403-AB60-724A-87CD-F37AB1EC9273}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.6 = {746404B0-722D-8038-F10C-3AAFCB45781B}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.7 = {9D180099-DE41-3EDD-341A-3B3D802181A7}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.8 = {79060465-7CA0-C9D6-62E8-25001BA9FF08}
- {0C486056-C033-073A-1D07-17098688877C}.0 = {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}
- {B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.0 = {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.0 = {D8C59DB7-C610-DEB9-C81D-6E14959A2251}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.0 = {B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.1 = {50EFF507-6FE4-9526-36E0-E0DED21E1BBC}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.2 = {7EA547E0-DD90-151E-6662-2B9FE705C20B}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.3 = {F8896403-AB60-724A-87CD-F37AB1EC9273}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.4 = {746404B0-722D-8038-F10C-3AAFCB45781B}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.5 = {9D180099-DE41-3EDD-341A-3B3D802181A7}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.6 = {79060465-7CA0-C9D6-62E8-25001BA9FF08}
{D23A398F-9918-ED87-924E-880E7E75BD53}.0 = {B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}
{D23A398F-9918-ED87-924E-880E7E75BD53}.1 = {50EFF507-6FE4-9526-36E0-E0DED21E1BBC}
{D23A398F-9918-ED87-924E-880E7E75BD53}.2 = {7EA547E0-DD90-151E-6662-2B9FE705C20B}
@@ -56,34 +42,18 @@
{D23A398F-9918-ED87-924E-880E7E75BD53}.6 = {79060465-7CA0-C9D6-62E8-25001BA9FF08}
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Release.ActiveCfg = Release|Win32
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Release.Build.0 = Release|Win32
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Debug.ActiveCfg = Debug|Win32
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Debug.Build.0 = Debug|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Release.ActiveCfg = Release|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Release.Build.0 = Release|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Debug.ActiveCfg = Debug|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Debug.Build.0 = Debug|Win32
- {0C486056-C033-073A-1D07-17098688877C}.Release.ActiveCfg = Release|Win32
- {0C486056-C033-073A-1D07-17098688877C}.Release.Build.0 = Release|Win32
- {0C486056-C033-073A-1D07-17098688877C}.Debug.ActiveCfg = Debug|Win32
- {0C486056-C033-073A-1D07-17098688877C}.Debug.Build.0 = Debug|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Release.ActiveCfg = Release|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Release.Build.0 = Release|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Debug.ActiveCfg = Debug|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Debug.Build.0 = Debug|Win32
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Release.ActiveCfg = Release|Win32
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Release.Build.0 = Release|Win32
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Debug.ActiveCfg = Debug|Win32
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Debug.Build.0 = Debug|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Release.ActiveCfg = Release|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Release.Build.0 = Release|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Debug.ActiveCfg = Debug|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Debug.Build.0 = Debug|Win32
- {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Release.ActiveCfg = Release|Win32
- {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Release.Build.0 = Release|Win32
- {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Debug.ActiveCfg = Debug|Win32
- {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Debug.Build.0 = Debug|Win32
{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}.Release.ActiveCfg = Release|Win32
{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}.Release.Build.0 = Release|Win32
{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}.Debug.ActiveCfg = Debug|Win32
Modified: trunk/msvc/71/wksiaeditor.sln
===================================================================
--- trunk/msvc/71/wksiaeditor.sln 2007-10-08 12:38:05 UTC (rev 346)
+++ trunk/msvc/71/wksiaeditor.sln 2007-10-10 10:09:48 UTC (rev 347)
@@ -1,19 +1,11 @@
Microsoft Visual Studio Solution File, Format Version 8.00
# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appiaeditor", "appiaeditor.vcproj", "{133F3D88-940F-DE6D-3661-AD25DF8A3C9A}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpall_iaeditor", "grpall_iaeditor.vcproj", "{D1D7ECA1-1553-368F-9A83-24C347043389}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpapps_iaeditor", "grpapps_iaeditor.vcproj", "{0C486056-C033-073A-1D07-17098688877C}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpiaeditorall_iaeditor", "grpiaeditorall_iaeditor.vcproj", "{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grplibs_iaeditor", "grplibs_iaeditor.vcproj", "{C4CEA535-48F5-C518-8A72-73A9854CCB60}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpplugins_iaeditor", "grpplugins_iaeditor.vcproj", "{D23A398F-9918-ED87-924E-880E7E75BD53}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpropgrid", "libpropgrid.vcproj", "{D8C59DB7-C610-DEB9-C81D-6E14959A2251}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgbehaviourlayer", "plgbehaviourlayer.vcproj", "{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgcsobjects", "plgcsobjects.vcproj", "{50EFF507-6FE4-9526-36E0-E0DED21E1BBC}"
@@ -34,19 +26,13 @@
ConfigName.1 = Debug
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.0 = {D8C59DB7-C610-DEB9-C81D-6E14959A2251}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.0 = {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.1 = {D8C59DB7-C610-DEB9-C81D-6E14959A2251}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.2 = {B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.3 = {50EFF507-6FE4-9526-36E0-E0DED21E1BBC}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.4 = {7EA547E0-DD90-151E-6662-2B9FE705C20B}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.5 = {F8896403-AB60-724A-87CD-F37AB1EC9273}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.6 = {746404B0-722D-8038-F10C-3AAFCB45781B}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.7 = {9D180099-DE41-3EDD-341A-3B3D802181A7}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.8 = {79060465-7CA0-C9D6-62E8-25001BA9FF08}
- {0C486056-C033-073A-1D07-17098688877C}.0 = {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}
- {B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.0 = {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.0 = {D8C59DB7-C610-DEB9-C81D-6E14959A2251}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.0 = {B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.1 = {50EFF507-6FE4-9526-36E0-E0DED21E1BBC}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.2 = {7EA547E0-DD90-151E-6662-2B9FE705C20B}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.3 = {F8896403-AB60-724A-87CD-F37AB1EC9273}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.4 = {746404B0-722D-8038-F10C-3AAFCB45781B}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.5 = {9D180099-DE41-3EDD-341A-3B3D802181A7}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.6 = {79060465-7CA0-C9D6-62E8-25001BA9FF08}
{D23A398F-9918-ED87-924E-880E7E75BD53}.0 = {B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}
{D23A398F-9918-ED87-924E-880E7E75BD53}.1 = {50EFF507-6FE4-9526-36E0-E0DED21E1BBC}
{D23A398F-9918-ED87-924E-880E7E75BD53}.2 = {7EA547E0-DD90-151E-6662-2B9FE705C20B}
@@ -56,34 +42,18 @@
{D23A398F-9918-ED87-924E-880E7E75BD53}.6 = {79060465-7CA0-C9D6-62E8-25001BA9FF08}
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Release.ActiveCfg = Release|Win32
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Release.Build.0 = Release|Win32
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Debug.ActiveCfg = Debug|Win32
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Debug.Build.0 = Debug|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Release.ActiveCfg = Release|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Release.Build.0 = Release|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Debug.ActiveCfg = Debug|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Debug.Build.0 = Debug|Win32
- {0C486056-C033-073A-1D07-17098688877C}.Release.ActiveCfg = Release|Win32
- {0C486056-C033-073A-1D07-17098688877C}.Release.Build.0 = Release|Win32
- {0C486056-C033-073A-1D07-17098688877C}.Debug.ActiveCfg = Debug|Win32
- {0C486056-C033-073A-1D07-17098688877C}.Debug.Build.0 = Debug|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Release.ActiveCfg = Release|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Release.Build.0 = Release|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Debug.ActiveCfg = Debug|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Debug.Build.0 = Debug|Win32
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Release.ActiveCfg = Release|Win32
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Release.Build.0 = Release|Win32
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Debug.ActiveCfg = Debug|Win32
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Debug.Build.0 = Debug|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Release.ActiveCfg = Release|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Release.Build.0 = Release|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Debug.ActiveCfg = Debug|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Debug.Build.0 = Debug|Win32
- {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Release.ActiveCfg = Release|Win32
- {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Release.Build.0 = Release|Win32
- {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Debug.ActiveCfg = Debug|Win32
- {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Debug.Build.0 = Debug|Win32
{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}.Release.ActiveCfg = Release|Win32
{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}.Release.Build.0 = Release|Win32
{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}.Debug.ActiveCfg = Debug|Win32
Modified: trunk/msvc/8/wksiaeditor.sln
===================================================================
--- trunk/msvc/8/wksiaeditor.sln 2007-10-08 12:38:05 UTC (rev 346)
+++ trunk/msvc/8/wksiaeditor.sln 2007-10-10 10:09:48 UTC (rev 347)
@@ -1,19 +1,11 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appiaeditor", "appiaeditor.vcproj", "{133F3D88-940F-DE6D-3661-AD25DF8A3C9A}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpall_iaeditor", "grpall_iaeditor.vcproj", "{D1D7ECA1-1553-368F-9A83-24C347043389}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpapps_iaeditor", "grpapps_iaeditor.vcproj", "{0C486056-C033-073A-1D07-17098688877C}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpiaeditorall_iaeditor", "grpiaeditorall_iaeditor.vcproj", "{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grplibs_iaeditor", "grplibs_iaeditor.vcproj", "{C4CEA535-48F5-C518-8A72-73A9854CCB60}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpplugins_iaeditor", "grpplugins_iaeditor.vcproj", "{D23A398F-9918-ED87-924E-880E7E75BD53}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpropgrid", "libpropgrid.vcproj", "{D8C59DB7-C610-DEB9-C81D-6E14959A2251}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgbehaviourlayer", "plgbehaviourlayer.vcproj", "{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgcsobjects", "plgcsobjects.vcproj", "{50EFF507-6FE4-9526-36E0-E0DED21E1BBC}"
@@ -34,19 +26,13 @@
ConfigName.1 = Debug
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.0 = {D8C59DB7-C610-DEB9-C81D-6E14959A2251}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.0 = {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.1 = {D8C59DB7-C610-DEB9-C81D-6E14959A2251}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.2 = {B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.3 = {50EFF507-6FE4-9526-36E0-E0DED21E1BBC}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.4 = {7EA547E0-DD90-151E-6662-2B9FE705C20B}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.5 = {F8896403-AB60-724A-87CD-F37AB1EC9273}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.6 = {746404B0-722D-8038-F10C-3AAFCB45781B}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.7 = {9D180099-DE41-3EDD-341A-3B3D802181A7}
- {D1D7ECA1-1553-368F-9A83-24C347043389}.8 = {79060465-7CA0-C9D6-62E8-25001BA9FF08}
- {0C486056-C033-073A-1D07-17098688877C}.0 = {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}
- {B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.0 = {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.0 = {D8C59DB7-C610-DEB9-C81D-6E14959A2251}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.0 = {B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.1 = {50EFF507-6FE4-9526-36E0-E0DED21E1BBC}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.2 = {7EA547E0-DD90-151E-6662-2B9FE705C20B}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.3 = {F8896403-AB60-724A-87CD-F37AB1EC9273}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.4 = {746404B0-722D-8038-F10C-3AAFCB45781B}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.5 = {9D180099-DE41-3EDD-341A-3B3D802181A7}
+ {D1D7ECA1-1553-368F-9A83-24C347043389}.6 = {79060465-7CA0-C9D6-62E8-25001BA9FF08}
{D23A398F-9918-ED87-924E-880E7E75BD53}.0 = {B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}
{D23A398F-9918-ED87-924E-880E7E75BD53}.1 = {50EFF507-6FE4-9526-36E0-E0DED21E1BBC}
{D23A398F-9918-ED87-924E-880E7E75BD53}.2 = {7EA547E0-DD90-151E-6662-2B9FE705C20B}
@@ -56,34 +42,18 @@
{D23A398F-9918-ED87-924E-880E7E75BD53}.6 = {79060465-7CA0-C9D6-62E8-25001BA9FF08}
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Release.ActiveCfg = Release|Win32
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Release.Build.0 = Release|Win32
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Debug.ActiveCfg = Debug|Win32
- {133F3D88-940F-DE6D-3661-AD25DF8A3C9A}.Debug.Build.0 = Debug|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Release.ActiveCfg = Release|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Release.Build.0 = Release|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Debug.ActiveCfg = Debug|Win32
{D1D7ECA1-1553-368F-9A83-24C347043389}.Debug.Build.0 = Debug|Win32
- {0C486056-C033-073A-1D07-17098688877C}.Release.ActiveCfg = Release|Win32
- {0C486056-C033-073A-1D07-17098688877C}.Release.Build.0 = Release|Win32
- {0C486056-C033-073A-1D07-17098688877C}.Debug.ActiveCfg = Debug|Win32
- {0C486056-C033-073A-1D07-17098688877C}.Debug.Build.0 = Debug|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Release.ActiveCfg = Release|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Release.Build.0 = Release|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Debug.ActiveCfg = Debug|Win32
{B2AE9F56-1D6C-0E3E-7758-74109E84F0A5}.Debug.Build.0 = Debug|Win32
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Release.ActiveCfg = Release|Win32
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Release.Build.0 = Release|Win32
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Debug.ActiveCfg = Debug|Win32
- {C4CEA535-48F5-C518-8A72-73A9854CCB60}.Debug.Build.0 = Debug|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Release.ActiveCfg = Release|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Release.Build.0 = Release|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Debug.ActiveCfg = Debug|Win32
{D23A398F-9918-ED87-924E-880E7E75BD53}.Debug.Build.0 = Debug|Win32
- {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Release.ActiveCfg = Release|Win32
- {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Release.Build.0 = Release|Win32
- {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Debug.ActiveCfg = Debug|Win32
- {D8C59DB7-C610-DEB9-C81D-6E14959A2251}.Debug.Build.0 = Debug|Win32
{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}.Release.ActiveCfg = Release|Win32
{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}.Release.Build.0 = Release|Win32
{B8BB60EC-7DB6-A6EB-1069-36D4D0F61413}.Debug.ActiveCfg = Debug|Win32
Modified: trunk/msvc/libbehaviourlayer_staticreg.cpp
===================================================================
--- trunk/msvc/libbehaviourlayer_staticreg.cpp 2007-10-08 12:38:05 UTC (rev 346)
+++ trunk/msvc/libbehaviourlayer_staticreg.cpp 2007-10-10 10:09:48 UTC (rev 347)
@@ -16,35 +16,23 @@
namespace csStaticPluginInit
{
static char const metainfo_behaviourlayer[] =
-"<?xml version=\"1.0\"?>
-"
-"<plugin>
-"
-" <scf>
-"
-" <classes>
-"
-" <class>
-"
-" <name>cel.behaviourlayer.ia</name>
-"
-" <implementation>cel_iaBl</implementation>
-"
-" <description>IA Behaviour Layer</description>
-"
-" </class>
-"
-" </classes>
-"
-" </scf>
-"
-"</plugin>
-"
+"<?xml version=\"1.0\"?>"
+"<plugin>"
+" <scf>"
+" <classes>"
+" <class>"
+" <name>cel.behaviourlayer.ia</name>"
+" <implementation>cel_iaBl</implementation>"
+" <description>IA Behaviour Layer</description>"
+" </class>"
+" </classes>"
+" </scf>"
+"</plugin>"
;
#ifndef cel_iaBl_FACTORY_REGISTER_DEFINED
#define cel_iaBl_FACTORY_REGISTER_DEFINED
SCF_DEFINE_FACTORY_FUNC_REGISTRATION(cel_iaBl)
- #endif
+ #endif
class behaviourlayer
{
@@ -52,7 +40,7 @@
#ifndef cel_iaBl_FACTORY_REGISTERED
#define cel_iaBl_FACTORY_REGISTERED
cel_iaBl_StaticInit cel_iaBl_static_init__;
- #endif
+ #endif
public:
behaviourlayer();
};
Modified: trunk/msvc/libcsobjects_staticreg.cpp
===================================================================
--- trunk/msvc/libcsobjects_staticreg.cpp 2007-10-08 12:38:05 UTC (rev 346)
+++ trunk/msvc/libcsobjects_staticreg.cpp 2007-10-10 10:09:48 UTC (rev 347)
@@ -16,43 +16,27 @@
namespace csStaticPluginInit
{
static char const metainfo_csobjects[] =
-"<?xml version=\"1.0\"?>
-"
-"<!-- pfcal3dragdoll.csplugin -->
-"
-"<plugin>
-"
-" <scf>
-"
-" <classes>
-"
-" <class>
-"
-" <name>ia.pcfactory.mesh</name>
-"
-" <implementation>celPf_iaCSMeshObject</implementation>
-"
-" <description>IA cs objects property class</description>
-"
-" <requires>
-"
-" <class>cel.physicallayer</class>
-"
-" </requires>
-"
-" </class>
-"
-" </classes>
-"
-" </scf>
-"
-"</plugin>
-"
+"<?xml version=\"1.0\"?>"
+"<!-- pfcal3dragdoll.csplugin -->"
+"<plugin>"
+" <scf>"
+" <classes>"
+" <class>"
+" <name>ia.pcfactory.mesh</name>"
+" <implementation>celPf_iaCSMeshObject</implementation>"
+" <description>IA cs objects property class</description>"
+" <requires>"
+" <class>cel.physicallayer</class>"
+" </requires>"
+" </class>"
+" </classes>"
+" </scf>"
+"</plugin>"
;
#ifndef celPf_iaCSMeshObject_FACTORY_REGISTER_DEFINED
#define celPf_iaCSMeshObject_FACTORY_REGISTER_DEFINED
SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPf_iaCSMeshObject)
- #endif
+ #endif
class csobjects
{
@@ -60,7 +44,7 @@
#ifndef celPf_iaCSMeshObject_FACTORY_REGISTERED
#define celPf_iaCSMeshObject_FACTORY_REGISTERED
celPf_iaCSMeshObject_StaticInit celPf_iaCSMeshObject_static_init__;
- #endif
+ #endif
public:
csobjects();
};
Modified: trunk/msvc/libforce_script_staticreg.cpp
===================================================================
--- trunk/msvc/libforce_script_staticreg.cpp 2007-10-08 12:38:05 UTC (rev 346)
+++ trunk/msvc/libforce_script_staticreg.cpp 2007-10-10 10:09:48 UTC (rev 347)
@@ -16,43 +16,27 @@
namespace csStaticPluginInit
{
static char const metainfo_force_script[] =
-"<?xml version=\"1.0\"?>
-"
-"<!-- force_script.csplugin -->
-"
-"<plugin>
-"
-" <scf>
-"
-" <classes>
-"
-" <class>
-"
-" <name>ia.pcfactory.scriptcontroller</name>
-"
-" <implementation>celPf_iaScriptController</implementation>
-"
-" <description>IA Script Controller Property Class</description>
-"
-" <requires>
-"
-" <class>cel.physicallayer</class>
-"
-" </requires>
-"
-" </class>
-"
-" </classes>
-"
-" </scf>
-"
-"</plugin>
-"
+"<?xml version=\"1.0\"?>"
+"<!-- force_script.csplugin -->"
+"<plugin>"
+" <scf>"
+" <classes>"
+" <class>"
+" <name>ia.pcfactory.scriptcontroller</name>"
+" <implementation>celPf_iaScriptController</implementation>"
+" <description>IA Script Controller Property Class</description>"
+" <requires>"
+" <class>cel.physicallayer</class>"
+" </requires>"
+" </class>"
+" </classes>"
+" </scf>"
+"</plugin>"
;
#ifndef celPf_iaScriptController_FACTORY_REGISTER_DEFINED
#define celPf_iaScriptController_FACTORY_REGISTER_DEFINED
SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPf_iaScriptController)
- #endif
+ #endif
class force_script
{
@@ -60,7 +44,7 @@
#ifndef celPf_iaScriptController_FACTORY_REGISTERED
#define celPf_iaScriptController_FACTORY_REGISTERED
celPf_iaScriptController_StaticInit celPf_iaScriptController_static_init__;
- #endif
+ #endif
public:
force_script();
};
Modified: trunk/msvc/libpfcharacter_staticreg.cpp
===================================================================
--- trunk/msvc/libpfcharacter_staticreg.cpp 2007-10-08 12:38:05 UTC (rev 346)
+++ trunk/msvc/libpfcharacter_staticreg.cpp 2007-10-10 10:09:48 UTC (rev 347)
@@ -16,65 +16,42 @@
namespace csStaticPluginInit
{
static char const metainfo_pfcharacter[] =
-"<?xml version=\"1.0\"?>
-"
-"<!-- pfcharacter.csplugin -->
-"
-"<plugin>
-"
-" <scf>
-"
-" <classes>
-"
-" <class>
-"
-" <name>ia.pcfactory.character</name>
-"
-" <implementation>celPf_iaCharacter</implementation>
-"
-" <description>IA skeletal animated model Class Factory</description>
-"
-" </class>
-"
-" <class>
-"
-" <name>ia.pcfactory.bone</name>
-"
-" <implementation>celPf_iaBone</implementation>
-"
-" <description>IA bone Class Factory</description>
-"
-" </class>
-"
-" <class>
-"
-" <name>ia.pcfactory.animation</name>
-"
-" <implementation>celPf_iaAnimation</implementation>
-"
-" <description>IA animation Class Factory</description>
-"
-" </class>
-"
-" </classes>
-"
-" </scf>
-"
-"</plugin>
-"
+"<?xml version=\"1.0\"?>"
+"<!-- pfcharacter.csplugin -->"
+"<plugin>"
+" <scf>"
+" <classes>"
+" <class>"
+" <name>ia.pcfactory.character</name>"
+" <implementation>celPf_iaCharacter</implementation>"
+" <description>IA skeletal animated model Class Factory</description>"
+" </class>"
+" <class>"
+" <name>ia.pcfactory.bone</name>"
+" <implementation>celPf_iaBone</implementation>"
+" <description>IA bone Class Factory</description>"
+" </class>"
+" <class>"
+" <name>ia.pcfactory.animation</name>"
+" <implementation>celPf_iaAnimation</implementation>"
+" <description>IA animation Class Factory</description>"
+" </class>"
+" </classes>"
+" </scf>"
+"</plugin>"
;
#ifndef celPf_iaCharacter_FACTORY_REGISTER_DEFINED
#define celPf_iaCharacter_FACTORY_REGISTER_DEFINED
SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPf_iaCharacter)
- #endif
+ #endif
#ifndef celPf_iaBone_FACTORY_REGISTER_DEFINED
#define celPf_iaBone_FACTORY_REGISTER_DEFINED
SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPf_iaBone)
- #endif
+ #endif
#ifndef celPf_iaAnimation_FACTORY_REGISTER_DEFINED
#define celPf_iaAnimation_FACTORY_REGISTER_DEFINED
SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPf_iaAnimation)
- #endif
+ #endif
class pfcharacter
{
@@ -82,15 +59,15 @@
#ifndef celPf_iaCharacter_FACTORY_REGISTERED
#define celPf_iaCharacter_FACTORY_REGISTERED
celPf_iaCharacter_StaticInit celPf_iaCharacter_static_init__;
- #endif
+ #endif
#ifndef celPf_iaBone_FACTORY_REGISTERED
#define celPf_iaBone_FACTORY_REGISTERED
celPf_iaBone_StaticInit celPf_iaBone_static_init__;
- #endif
+ #endif
#ifndef celPf_iaAnimation_FACTORY_REGISTERED
#define celPf_iaAnimation_FACTORY_REGISTERED
celPf_iaAnimation_StaticInit celPf_iaAnimation_static_init__;
- #endif
+ #endif
public:
pfcharacter();
};
Modified: trunk/msvc/libpfguiactor_staticreg.cpp
===================================================================
--- trunk/msvc/libpfguiactor_staticreg.cpp 2007-10-08 12:38:05 UTC (rev 346)
+++ trunk/msvc/libpfguiactor_staticreg.cpp 2007-10-10 10:09:48 UTC (rev 347)
@@ -16,61 +16,38 @@
namespace csStaticPluginInit
{
static char const metainfo_pfguiactor[] =
-"<?xml version=\"1.0\"?>
-"
-"<plugin>
-"
-" <scf>
-"
-" <classes>
-"
-" <class>
-"
-" <name>cel.pcfactory.cammove</name>
-"
-" <implementation>celPf_iaCamMove</implementation>
-"
-" <description>IA CEL camera handling Class Factory</description>
-"
-" <requires>
-"
-" <class>cel.physicallayer</class>
-"
-" </requires>
-"
-" </class>
-"
-" <class>
-"
-" <name>cel.pcfactory.selector</name>
-"
-" <implementation>celPf_iaSelector</implementation>
-"
-" <description>IA CEL mouse selection Class Factory</description>
-"
-" <requires>
-"
-" <class>cel.physicallayer</class>
-"
-" </requires>
-"
-" </class>
-"
-" </classes>
-"
-" </scf>
-"
-"</plugin>
-"
+"<?xml version=\"1.0\"?>"
+"<plugin>"
+" <scf>"
+" <classes>"
+" <class>"
+" <name>cel.pcfactory.cammove</name>"
+" <implementation>celPf_iaCamMove</implementation>"
+" <description>IA CEL camera handling Class Factory</description>"
+" <requires>"
+" <class>cel.physicallayer</class>"
+" </requires>"
+" </class>"
+" <class>"
+" <name>cel.pcfactory.selector</name>"
+" <implementation>celPf_iaSelector</implementation>"
+" <description>IA CEL mouse selection Class Factory</description>"
+" <requires>"
+" <class>cel.physicallayer</class>"
+" </requires>"
+" </class>"
+" </classes>"
+" </scf>"
+"</plugin>"
;
#ifndef celPf_iaCamMove_FACTORY_REGISTER_DEFINED
#define celPf_iaCamMove_FACTORY_REGISTER_DEFINED
SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPf_iaCamMove)
- #endif
+ #endif
#ifndef celPf_iaSelector_FACTORY_REGISTER_DEFINED
#define celPf_iaSelector_FACTORY_REGISTER_DEFINED
SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPf_iaSelector)
- #endif
+ #endif
class pfguiactor
{
@@ -78,11 +55,11 @@
#ifndef celPf_iaCamMove_FACTORY_REGISTERED
#define celPf_iaCamMove_FACTORY_REGISTERED
celPf_iaCamMove_StaticInit celPf_iaCamMove_static_init__;
- #endif
+ #endif
#ifndef celPf_iaSelector_FACTORY_REGISTERED
#define celPf_iaSelector_FACTORY_REGISTERED
celPf_iaSelector_StaticInit celPf_iaSelector_static_init__;
- #endif
+ #endif
public:
pfguiactor();
};
Modified: trunk/msvc/libpfobj_properties_staticreg.cpp
===================================================================
--- trunk/msvc/libpfobj_properties_staticreg.cpp 2007-10-08 12:38:05 UTC (rev 346)
+++ trunk/msvc/libpfobj_properties_staticreg.cpp 2007-10-10 10:09:48 UTC (rev 347)
@@ -16,41 +16,26 @@
namespace csStaticPluginInit
{
static char const metainfo_pfobj_properties[] =
-"<?xml version=\"1.0\"?>
-"
-"<plugin>
-"
-" <scf>
-"
-" <classes>
-"
-" <class>
-"
-" <name>ia.propclass.objectproperties</name>
-"
-" <implementation>celPf_iaObjectProperties</implementation>
-"
-" <description></description>
-"
-" <requires>
-"
-" <class>cel.physicallayer</class>
-"
-" </requires>
-"
-" </class>
-"
-" </classes>
-"
-" </scf>
-"
-"</plugin>
-"
+"<?xml version=\"1.0\"?>"
+"<plugin>"
+" <scf>"
+" <classes>"
+" <class>"
+" <name>ia.propclass.objectproperties</name>"
+" <implementation>celPf_iaObjectProperties</implementation>"
+" <description></description>"
+" <requires>"
+" <class>cel.physicallayer</class>"
+" </requires>"
+" </class>"
+" </classes>"
+" </scf>"
+"</plugin>"
;
#ifndef celPf_iaObjectProperties_FACTORY_REGISTER_DEFINED
#define celPf_iaObjectProperties_FACTORY_REGISTER_DEFINED
SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPf_iaObjectProperties)
- #endif
+ #endif
class pfobj_properties
{
@@ -58,7 +43,7 @@
#ifndef celPf_iaObjectProperties_FACTORY_REGISTERED
#define celPf_iaObjectProperties_FACTORY_REGISTERED
celPf_iaObjectProperties_StaticInit celPf_iaObjectProperties_static_init__;
- #endif
+ #endif
public:
pfobj_properties();
};
Modified: trunk/msvc/libpfodedynamics_staticreg.cpp
===================================================================
--- trunk/msvc/libpfodedynamics_staticreg.cpp 2007-10-08 12:38:05 UTC (rev 346)
+++ trunk/msvc/libpfodedynamics_staticreg.cpp 2007-10-10 10:09:48 UTC (rev 347)
@@ -16,85 +16,54 @@
namespace csStaticPluginInit
{
static char const metainfo_pfodedynamics[] =
-"<?xml version=\"1.0\"?>
-"
-"<!-- pfodedynamics.csplugin -->
-"
-"<plugin>
-"
-" <scf>
-"
-" <classes>
-"
-" <class>
-"
-" <name>ia.pcfactory.odedynamicsystem</name>
-"
-" <implementation>celPf_iaODEDynamicsSystem</implementation>
-"
-" <description>IA CEL ODE Dynamic System Class Factory</description>
-"
-" </class>
-"
-" <class>
-"
-" <name>ia.pcfactory.odejoint</name>
-"
-" <implementation>celPf_iaODEJoint</implementation>
-"
-" <description>IA CEL ODE Joint Class Factory</description>
-"
-" </class>
-"
-" <class>
-"
-" <name>ia.pcfactory.collider</name>
-"
-" <implementation>celPf_iaCollider</implementation>
-"
-" <description>IA Collider Class Factory</description>
-"
-" </class>
-"
-" <class>
-"
-" <name>cel.pcfactory.rigidbody</name>
-"
-" <implementation>celPf_iaRigidBody</implementation>
-"
-" <description>IA CEL Rigidbody Class Factory</description>
-"
-" <requires>
-"
-" <class>cel.physicallayer</class>
-"
-" </requires>
-"
-" </class>
-"
-" </classes>
-"
-" </scf>
-"
-"</plugin>
-"
+"<?xml version=\"1.0\"?>"
+"<!-- pfodedynamics.csplugin -->"
+"<plugin>"
+" <scf>"
+" <classes>"
+" <class>"
+" <name>ia.pcfactory.odedynamicsystem</name>"
+" <implementation>celPf_iaODEDynamicsSystem</implementation>"
+" <description>IA CEL ODE Dynamic System Class Factory</description>"
+" </class>"
+" <class>"
+" <name>ia.pcfactory.odejoint</name>"
+" <implementation>celPf_iaODEJoint</implementation>"
+" <description>IA CEL ODE Joint Class Factory</description>"
+" </class>"
+" <class>"
+" <name>ia.pcfactory.collider</name>"
+" <implementation>celPf_iaCollider</implementation>"
+" <description>IA Collider Class Factory</description>"
+" </class>"
+" <class>"
+" <name>cel.pcfactory.rigidbody</name>"
+" <implementation>celPf_iaRigidBody</implementation>"
+" <description>IA CEL Rigidbody Class Factory</description>"
+" <requires>"
+" <class>cel.physicallayer</class>"
+" </requires>"
+" </class>"
+" </classes>"
+" </scf>"
+"</plugin>"
;
#ifndef celPf_iaODEDynamicsSystem_FACTORY_REGISTER_DEFINED
#define celPf_iaODEDynamicsSystem_FACTORY_REGISTER_DEFINED
SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPf_iaODEDynamicsSystem)
- #endif
+ #endif
#ifndef celPf_iaODEJoint_FACTORY_REGISTER_DEFINED
#define celPf_iaODEJoint_FACTORY_REGISTER_DEFINED
SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPf_iaODEJoint)
- #endif
+ #endif
#ifndef celPf_iaCollider_FACTORY_REGISTER_DEFINED
#define celPf_iaCollider_FACTORY_REGISTER_DEFINED
SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPf_iaCollider)
- #endif
+ #endif
#ifndef celPf_iaRigidBody_FACTORY_REGISTER_DEFINED
#define celPf_iaRigidBody_FACTORY_REGISTER_DEFINED
SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPf_iaRigidBody)
- #endif
+ #endif
class pfodedynamics
{
@@ -102,19 +71,19 @@
#ifndef celPf_iaODEDynamicsSystem_FACTORY_REGISTERED
#define celPf_iaODEDynamicsSystem_FACTORY_REGISTERED
celPf_iaODEDynamicsSystem_StaticInit celPf_iaODEDynamicsSystem_static_init__;
- #endif
+ #endif
#ifndef celPf_iaODEJoint_FACTORY_REGISTERED
#define celPf_iaODEJoint_FACTORY_REGISTERED
celPf_iaODEJoint_StaticInit celPf_iaODEJoint_static_init__;
- #endif
+ #endif
#ifndef celPf_iaCollider_FACTORY_REGISTERED
#define celPf_iaCollider_FACTORY_REGISTERED
celPf_iaCollider_StaticInit celPf_iaCollider_static_init__;
- #endif
+ #endif
#ifndef celPf_iaRigidBody_FACTORY_REGISTERED
#define celPf_iaRigidBody_FACTORY_REGISTERED
celPf_iaRigidBody_StaticInit celPf_iaRigidBody_static_init__;
- #endif
+ #endif
public:
pfodedynamics();
};
Modified: trunk/msvc/plgbehaviourlayer.rc
===================================================================
--- trunk/msvc/plgbehaviourlayer.rc 2007-10-08 12:38:05 UTC (rev 346)
+++ trunk/msvc/plgbehaviourlayer.rc 2007-10-10 10:09:48 UTC (rev 347)
@@ -33,29 +33,17 @@
17485 RCDATA
{
- "<?xml version=""1.0""?>
-",
- "<plugin>
-",
- " <scf>
-",
- " <classes>
-",
- " <class>
-",
- " <name>cel.behaviourlayer.ia</name>
-",
- " <implementation>cel_iaBl</implementation>
-",
- " <description>IA Behaviour Layer</description>
-",
- " </class>
-",
- " </classes>
-",
- " </scf>
-",
- "</plugin>
-",
+ "<?xml version=""1.0""?>",
+ "<plugin>",
+ " <scf>",
+ " <classes>",
+ " <class>",
+ " <name>cel.behaviourlayer.ia</name>",
+ " <implementation>cel_iaBl</implementation>",
+ " <description>IA Behaviour Layer</description>",
+ " </class>",
+ " </classes>",
+ " </scf>",
+ "</plugin>",
"\0"
}
Modified: trunk/msvc/plgcsobjects.rc
===================================================================
--- trunk/msvc/plgcsobjects.rc 2007-10-08 12:38:05 UTC (rev 346)
+++ trunk/msvc/plgcsobjects.rc 2007-10-10 10:09:48 UTC (rev 347)
@@ -33,37 +33,21 @@
17485 RCDATA
{
- "<?xml version=""1.0""?>
-",
- "<!-- pfcal3dragdoll.csplugin -->
-",
- "<plugin>
-",
- " <scf>
-",
- " <classes>
-",
- " <class>
-",
- " <name>ia.pcfactory.mesh</name>
-",
- " <implementation>celPf_iaCSMeshObject</implementation>
-",
- " <description>IA cs objects property class</description>
-",
- " <requires>
-",
- " <class>cel.physicallayer</class>
-",
- " </requires>
-",
- " </class>
-",
- " </classes>
-",
- " </scf>
-",
- "</plugin>
-",
+ "<?xml version=""1.0""?>",
+ "<!-- pfcal3dragdoll.csplugin -->",
+ "<plugin>",
+ " <scf>",
+ " <classes>",
+ " <class>",
+ " <name>ia.pcfactory.mesh</name>",
+ " <implementation>celPf_iaCSMeshObject</implementation>",
+ " <description>IA cs objects property class</description>",
+ " <requires>",
+ " <class>cel.physicallayer</class>",
+ " </requires>",
+ " </class>",
+ " </classes>",
+ " </scf>",
+ "</plugin>",
"\0"
}
Modified: trunk/msvc/plgforce_script.rc
===================================================================
--- trunk/msvc/plgforce_script.rc 2007-10-08 12:38:05 UTC (rev 346)
+++ trunk/msvc/plgforce_script.rc 2007-10-10 10:09:48 UTC (rev 347)
@@ -33,37 +33,21 @@
17485 RCDATA
{
- "<?xml version=""1.0""?>
-",
- "<!-- force_script.csplugin -->
-",
- "<plugin>
-",
- " <scf>
-",
- " <classes>
-",
- " <class>
-",
- " <name>ia.pcfactory.scriptcontroller</name>
-",
- " <implementation>celPf_iaScriptController</implementation>
-",
- " <description>IA Script Controller Property Class</description>
-",
- " <requires>
-",
- " <class>cel.physicallayer</class>
-",
- " </requires>
-",
- " </class>
-",
- " </classes>
-",
- " </scf>
-",
- "</plugin>
-",
+ "<?xml version=""1.0""?>",
+ "<!-- force_script.csplugin -->",
+ "<plugin>",
+ " <scf>",
+ " <classes>",
+ " <class>",
+ " <name>ia.pcfactory.scriptcontroller</name>",
+ " <implementation>celPf_iaScriptController</implementation>",
+ " <description>IA Script Controller Property Class</description>",
+ " <requires>",
+ " <class>cel.physicallayer</class>",
+ " </requires>",
+ " </class>",
+ " </classes>",
+ " </scf>",
+ "</plugin>",
"\0"
}
Modified: trunk/msvc/plgpfcharacter.rc
===================================================================
--- trunk/msvc/plgpfcharacter.rc 2007-10-08 12:38:05 UTC (rev 346)
+++ trunk/msvc/plgpfcharacter.rc 2007-10-10 10:09:48 UTC (rev 347)
@@ -33,51 +33,28 @@
17485 RCDATA
{
- "<?xml version=""1.0""?>
-",
- "<!-- pfcharacter.csplugin -->
-",
- "<plugin>
-",
- " <scf>
-",
- " <classes>
-",
- " <class>
-",
- " <name>ia.pcfactory.character</name>
-",
- " <implementation>celPf_iaCharacter</implementation>
-",
- " <description>IA skeletal animated model Class Factory</description>
-",
- " </class>
-",
- " <class>
-",
- " <name>ia.pcfactory.bone</name>
-",
- " <implementation>celPf_iaBone</implementation>
-",
- " <description>IA bone Class Factory</description>
-",
- " </class>
-",
- " <class>
-",
- " <name>ia.pcfactory.animation</name>
-",
- " <implementation>celPf_iaAnimation</implementation>
-",
- " <description>IA animation Class Factory</description>
-",
- " </class>
-",
- " </classes>
-",
- " </scf>
-",
- "</plugin>
-",
+ "<?xml version=""1.0""?>",
+ "<!-- pfcharacter.csplugin -->",
+ "<plugin>",
+ " <scf>",
+ " <classes>",
+ " <class>",
+ " <name>ia.pcfactory.character</name>",
+ " <implementation>celPf_iaCharacter</implementation>",
+ " <description>IA skeletal animated model Class Factory</description>",
+ " </class>",
+ " <class>",
+ " <name>ia.pcfactory.bone</name>",
+ " <implementation>celPf_iaBone</implementation>",
+ " <description>IA bone Class Factory</description>",
+ " </class>",
+ " <class>",
+ " <name>ia.pcfactory.animation</name>",
+ " <implementation>celPf_iaAnimation</implementation>",
+ " <description>IA animation Class Factory</description>",
+ " </class>",
+ " </classes>",
+ " </scf>",
+ "</plugin>",
"\0"
}
Modified: trunk/msvc/plgpfguiactor.rc
===================================================================
--- trunk/msvc/plgpfguiactor.rc 2007-10-08 12:38:05 UTC (rev 346)
+++ trunk/msvc/plgpfguiactor.rc 2007-10-10 10:09:48 UTC (rev 347)
@@ -33,51 +33,28 @@
17485 RCDATA
{
- "<?xml version=""1.0""?>
-",
- "<plugin>
-",
- " <scf>
-",
- " <classes>
-",
- " <class>
-",
- " <name>cel.pcfactory.cammove</name>
-",
- " <implementation>celPf_iaCamMove</implementation>
-",
- " <description>IA CEL camera handling Class Factory</description>
-",
- " <requires>
-",
- " <class>cel.physicallayer</class>
-",
- " </requires>
-",
- " </class>
-",
- " <class>
-",
- " <name>cel.pcfactory.selector</name>
-",
- " <implementation>celPf_iaSelector</implementation>
-",
- " <description>IA CEL mouse selection Class Factory</description>
-",
- " <requires>
-",
- " <class>cel.physicallayer</class>
-",
- " </requires>
-",
- " </class>
-",
- " </classes>
-",
- " </scf>
-",
- "</plugin>
-",
+ "<?xml version=""1.0""?>",
+ "<plugin>",
+ " <scf>",
+ " <classes>",
+ " <class>",
+ " <name>cel.pcfactory.cammove</name>",
+ " <implementation>celPf_iaCamMove</implementation>",
+ " <description>IA CEL camera handling Class Factory</description>",
+ " <requires>",
+ " <class>cel.physicallayer</class>",
+ " </requires>",
+ " </class>",
+ " <class>",
+ " <name>cel.pcfactory.selector</name>",
+ " <implementation>celPf_iaSelector</implementation>",
+ " <description>IA CEL mouse selection Class Factory</description>",
+ " <requires>",
+ " <class>cel.physicallayer</class>",
+ " </requires>",
+ " </class>",
+ " </classes>",
+ " </scf>",
+ "</plugin>",
"\0"
}
Modified: trunk/msvc/plgpfobj_properties.rc
===================================================================
--- trunk/msvc/plgpfobj_properties.rc 2007-10-08 12:38:05 UTC (rev 346)
+++ trunk/msvc/plgpfobj_properties.rc 2007-10-10 10:09:48 UTC (rev 347)
@@ -33,35 +33,20 @@
17485 RCDATA
{
- "<?xml version=""1.0""?>
-",
- "<plugin>
-",
- " <scf>
-",
- " <classes>
-",
- " <class>
-",
- " <name>ia.propclass.objectproperties</name>
-",
- " <implementation>celPf_iaObjectProperties</implementation>
-",
- " <description></description>
-",
- " <requires>
-",
- " <class>cel.physicallayer</class>
-",
- " </requires>
-",
- " </class>
-",
- " </classes>
-",
- " </scf>
-",
- "</plugin>
-",
+ "<?xml version=""1.0""?>",
+ "<plugin>",
+ " <scf>",
+ " <classes>",
+ " <class>",
+ " <name>ia.propclass.objectproperties</name>",
+ " <implementation>celPf_iaObjectProperties</implementation>",
+ " <description></description>",
+ " <requires>",
+ " <class>cel.physicallayer</class>",
+ " </requires>",
+ " </class>",
+ " </classes>",
+ " </scf>",
+ "</plugin>",
"\0"
}
Modified: trunk/msvc/plgpfodedynamics.rc
===================================================================
--- trunk/msvc/plgpfodedynamics.rc 2007-10-08 12:38:05 UTC (rev 346)
+++ trunk/msvc/plgpfodedynamics.rc 2007-10-10 10:09:48 UTC (rev 347)
@@ -33,67 +33,36 @@
17485 RCDATA
{
- "<?xml version=""1.0""?>
-",
- "<!-- pfodedynamics.csplugin -->
-",
- "<plugin>
-",
- " <scf>
-",
- " <classes>
-",
- " <class>
-",
- " <name>ia.pcfactory.odedynamicsystem</name>
-",
- " <implementation>celPf_iaODEDynamicsSystem</implementation>
-",
- " <description>IA CEL ODE Dynamic System Class Factory</description>
-",
- " </class>
-",
- " <class>
-",
- " <name>ia.pcfactory.odejoint</name>
-",
- " <implementation>celPf_iaODEJoint</implementation>
-",
- " <description>IA CEL ODE Joint Class Factory</description>
-",
- " </class>
-",
- " <class>
-",
- " <name>ia.pcfactory.collider</name>
-",
- " <implementation>celPf_iaCollider</implementation>
-",
- " <description>IA Collider Class Factory</description>
-",
- " </class>
-",
- " <class>
-",
- " <name>cel.pcfactory.rigidbody</name>
-",
- " <implementation>celPf_iaRigidBody</implementation>
-",
- " <description>IA CEL Rigidbody Class Factory</description>
-",
- " <requires>
-",
- " <class>cel.physicallayer</class>
-",
- " </requires>
-",
- " </class>
-",
- " </classes>
-",
- " </scf>
-",
- "</plugin>
-",
+ "<?xml version=""1.0""?>",
+ "<!-- pfodedynamics.csplugin -->",
+ "<plugin>",
+ " <scf>",
+ " <classes>",
+ " <class>",
+ " <name>ia.pcfactory.odedynamicsystem</name>",
+ " <implementation>celPf_iaODEDynamicsSystem</implementation>",
+ " <description>IA CEL ODE Dynamic System Class Factory</description>",
+ " </class>",
+ " <class>",
+ " <name>ia.pcfactory.odejoint</name>",
+ " <implementation>celPf_iaODEJoint</implementation>",
+ " <description>IA CEL ODE Joint Class Factory</description>",
+ " </class>",
+ " <class>",
+ " <name>ia.pcfactory.collider</name>",
+ " <implementation>celPf_iaCollider</implementation>",
+ " <description>IA Collider Class Factory</description>",
+ " </class>",
+ " <class>",
+ " <name>cel.pcfactory.rigidbody</name>",
+ " <implementation>celPf_iaRigidBody</implementation>",
+ " <description>IA CEL Rigidbody Class Factory</description>",
+ " <requires>",
+ " <class>cel.physicallayer</class>",
+ " </requires>",
+ " </class>",
+ " </classes>",
+ " </scf>",
+ "</plugin>",
"\0"
}
Modified: trunk/vfs.cfg
===================================================================
--- trunk/vfs.cfg 2007-10-08 12:38:05 UTC (rev 346)
+++ trunk/vfs.cfg 2007-10-10 10:09:48 UTC (rev 347)
@@ -1,58 +1,58 @@
-;;; Virtual File System mount table
-;;;
-;;; $/ -- path delimiter (i.e. "/" on Unix; "\" on Windows)
-;;; $@ -- installation directory of Crystal Space
-;;; $* -- application resource directory; same as csGetResourceDir()
-;;; $^ -- directory in which application resides; same as csGetAppDir()
-;;; The expansions of $@, $*, and $^ always have a trailing path delimiter.
-
-; Some basic mount points
-VFS.Mount.~ = $(HOME)$/
-VFS.Mount.this = $.$/
-VFS.Mount.cdrom = $(CDROM)$/
-VFS.Mount.tmp = $(TMP)$/
-
-
-; The Unifont
-VFS.Mount.fonts/unifont = $^/data$/fonts$/unifont.zip
-; The TTF font library
-VFS.Mount.fonts/ttf = $^/data$/fonts$/ttf$/, $(TTF_PATH:$.$/), $^/data$/fonts$/ttf-vera.zip
-
-;Mount for IA Editor
-VFS.Mount.data = $^data$/
-VFS.Mount.models = $^data$/models$/
-VFS.Mount.ia_project_path = $^data$/project$/
-VFS.Mount.resource = $^data$/gui$/
-VFS.Mount.config = $^data$/config$/
-VFS.Mount.shader = $^data$/shader$/
-VFS.Mount.icons = $^data$/gui$/icons$/
-
-
-; The following should not change too often...
-; The idea is that everything that should be changed (such as CDROM variable)
-; is set by some sort of setup (installation) program.
-; Note that variables in VFS.Platform. section will override any
-; variables in VFS.PlatformAlias. section.
-VFS.Alias.Unix = VFS.Unix
-VFS.Alias.MacOS/X = VFS.Unix
-VFS.Alias.Win32 = VFS.CP/M
-
-; strange key names follow:
-; VFS.Unix.. means key '.' in section VFS.Unix.*
-; VFS.Unix... means key '..' in section VFS.Unix.*
-VFS.Unix.. = .
-VFS.Unix... = ..
-VFS.Unix.CDROM = /mnt/cdrom
-VFS.Unix.TMP = /tmp
-; This is true at least for systems using XFree86
-VFS.Unix.TTF_PATH = /usr/X11R6/lib/X11/fonts/Truetype/, /usr/X11R6/lib/X11/fonts/TTF/
-
-VFS.CP/M.. = .
-VFS.CP/M... = ..
-VFS.CP/M.HOME = $(HOMEDIR:$(HOMEPATH:.))
-VFS.CP/M.CDROM = x:
-VFS.CP/M.TMP = $(TEMP:$(TMP:$(SYSTEMROOT)$/temp))
-
-; The standard location of TTF fonts is the X:\Windows\fonts directory
-VFS.Win32.TTF_PATH = $(SYSTEMROOT)$/fonts$/
-
+;;; Virtual File System mount table
+;;;
+;;; $/ -- path delimiter (i.e. "/" on Unix; "\" on Windows)
+;;; $@ -- installation directory of Crystal Space
+;;; $* -- application resource directory; same as csGetResourceDir()
+;;; $^ -- directory in which application resides; same as csGetAppDir()
+;;; The expansions of $@, $*, and $^ always have a trailing path delimiter.
+
+; Some basic mount points
+VFS.Mount.~ = $(HOME)$/
+VFS.Mount.this = $.$/
+VFS.Mount.cdrom = $(CDROM)$/
+VFS.Mount.tmp = $(TMP)$/
+
+
+; The Unifont
+VFS.Mount.fonts/unifont = $^/data$/fonts$/unifont.zip
+; The TTF font library
+VFS.Mount.fonts/ttf = $^/data$/fonts$/ttf$/, $(TTF_PATH:$.$/), $^/data$/fonts$/ttf-vera.zip
+
+;Mount for IA Editor
+VFS.Mount.data = $^data$/
+VFS.Mount.models = $^data$/models$/
+VFS.Mount.ia_project_path = $^data$/project$/
+VFS.Mount.resource = $^data$/gui$/
+VFS.Mount.config = $^data$/config$/
+VFS.Mount.shader = $^data$/shader$/
+VFS.Mount.icons = $^data$/gui$/icons$/
+
+
+; The following should not change too often...
+; The idea is that everything that should be changed (such as CDROM variable)
+; is set by some sort of setup (installation) program.
+; Note that variables in VFS.Platform. section will override any
+; variables in VFS.PlatformAlias. section.
+VFS.Alias.Unix = VFS.Unix
+VFS.Alias.MacOS/X = VFS.Unix
+VFS.Alias.Win32 = VFS.CP/M
+
+; strange key names follow:
+; VFS.Unix.. means key '.' in section VFS.Unix.*
+; VFS.Unix... means key '..' in section VFS.Unix.*
+VFS.Unix.. = .
+VFS.Unix... = ..
+VFS.Unix.CDROM = ...
[truncated message content] |
|
From: <ob...@us...> - 2007-10-08 12:38:07
|
Revision: 346
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=346&view=rev
Author: obi666
Date: 2007-10-08 05:38:05 -0700 (Mon, 08 Oct 2007)
Log Message:
-----------
Applied r345 from trunk.
Modified Paths:
--------------
branches/release/V0.2/msvc/8/appiaeditor.vcproj
branches/release/V0.2/src/apps/editor/gui/widgets/iaMainFrame.cpp
branches/release/V0.2/src/apps/editor/gui/widgets/iaMainFrame.h
branches/release/V0.2/src/apps/editor/gui/widgets/iaObjectTree.h
branches/release/V0.2/src/apps/editor/gui/widgets/iaObjectsManager.h
branches/release/V0.2/src/apps/editor/gui/widgets/iaSimulationPanel.h
Modified: branches/release/V0.2/msvc/8/appiaeditor.vcproj
===================================================================
--- branches/release/V0.2/msvc/8/appiaeditor.vcproj 2007-10-08 12:30:21 UTC (rev 345)
+++ branches/release/V0.2/msvc/8/appiaeditor.vcproj 2007-10-08 12:38:05 UTC (rev 346)
@@ -236,7 +236,7 @@
>
</File>
<File
- RelativePath="..\..\src\apps\editor\gui\iaMainFrame.cpp"
+ RelativePath="..\..\src\apps\editor\gui\widgets\iaMainFrame.cpp"
>
</File>
<File
@@ -296,15 +296,15 @@
>
</File>
<File
- RelativePath="..\..\src\apps\editor\gui\widgets\ia_propgrid.h"
+ RelativePath="..\..\src\apps\editor\iaCSApplication.h"
>
</File>
<File
- RelativePath="..\..\src\apps\editor\iaCSApplication.h"
+ RelativePath="..\..\src\apps\editor\gui\widgets\iaMainFrame.h"
>
</File>
<File
- RelativePath="..\..\src\apps\editor\gui\iaMainFrame.h"
+ RelativePath="..\..\src\apps\editor\gui\widgets\iaObjectsManager.h"
>
</File>
<File
Modified: branches/release/V0.2/src/apps/editor/gui/widgets/iaMainFrame.cpp
===================================================================
--- branches/release/V0.2/src/apps/editor/gui/widgets/iaMainFrame.cpp 2007-10-08 12:30:21 UTC (rev 345)
+++ branches/release/V0.2/src/apps/editor/gui/widgets/iaMainFrame.cpp 2007-10-08 12:38:05 UTC (rev 346)
@@ -1,516 +1,516 @@
-/*
-Copyright (C) 2005 - 2007 by Piotr Obrzut and Valentin Vit
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free
-Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "ia_mainframe.h"
-#endif
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-////@begin includes
-#include <cssysdef.h>
-#include "../iaCSApplication.h"
-
-#include <wx/dc.h>
-#include <wx/filedlg.h>
-#include <wx/laywin.h>
-
-#include "widgets/iaObjectTree.h"
-#include "widgets/iaPropertyGrid.h"
-#include "widgets/iaPropertySheet.h"
-#include "widgets/iaSimulationPanel.h"
-#include <string>
-
-#include "editor.h"
-#include "iaMainFrame.h"
-
-IMPLEMENT_CLASS(iaMainFrame, wxFrame)
-/*!
-* iaMainFrame event table definition
-*/
-BEGIN_EVENT_TABLE(iaMainFrame, wxFrame)
-//EVT_LEFT_DOWN(iaMainFrame::OnMouse)
-//EVT_LEFT_DCLICK(iaMainFrame::OnMouse)
-
-EVT_SIZE(iaMainFrame::OnSize)
-
-EVT_MENU(IA_MENUITEM_ATTACH_BODY, iaMainFrame::OnAttachBodyMenuItem)
-EVT_MENU(IA_MENUITEM_ATTACH_SPHERE_COLLIDER, iaMainFrame::OnAttachSphereColliderMenuItem)
-EVT_MENU(IA_MENUITEM_ATTACH_BOX_COLLIDER, iaMainFrame::OnAttachBoxColliderMenuItem)
-EVT_MENU(IA_MENUITEM_ATTACH_CAPSULE_COLLIDER, iaMainFrame::OnAttachCapsuleColliderMenuItem)
-EVT_MENU(IA_MENUITEM_ATTACH_JOINT, iaMainFrame::OnAttachJointMenuItem)
-EVT_MENU(ID_MENUITEM_LOAD, iaMainFrame::OnLoadMenuItem)
-EVT_MENU(ID_MENUITEM_SAVE, iaMainFrame::OnSaveMenuItem)
-EVT_MENU(ID_MENUITEM_NEW_PROJECT, iaMainFrame::OnNewProjectMenuItem)
-EVT_MENU(ID_MENUITEM_LOAD_PROJECT, iaMainFrame::OnLoadProjectMenuItem)
-EVT_MENU(ID_MENUITEM_SAVE_AS, iaMainFrame::OnSaveAsMenuItem)
-EVT_MENU(ID_MENUITEM_EXIT, iaMainFrame::OnExitMenuItem)
-EVT_MENU(IA_MENUITEM_DELETE, iaMainFrame::OnDelete)
-EVT_MENU(IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER, iaMainFrame::OnAttachScriptedControllerMenuItem)
-EVT_MENU(ID_MENUITEM_DRAW_WIREFRAME, iaMainFrame::OnDrawWireFrame)
-EVT_MENU(ID_MENUITEM_SHOW_COLLIDERS, iaMainFrame::OnShowColliders)
-EVT_MENU(ID_MENUITEM_SHOW_JOINTS, iaMainFrame::OnShowJoints)
-EVT_MENU(ID_MENUITEM_SHOW_BONES, iaMainFrame::OnShowBones)
-EVT_MENU(ID_MENUITEM_SHOW_BODIES, iaMainFrame::OnShowBodies)
-EVT_MENU(ID_MENUITEM_SHOW_CHARACTERS, iaMainFrame::OnShowCharacters)
-
-EVT_TOOL(ID_TOOL_ATTACH_CAPSULE_COLLIDER, iaMainFrame::OnAttachCapsuleColliderMenuItem)
-EVT_TOOL(ID_TOOL_ATTACH_BOX_COLLIDER, iaMainFrame::OnAttachBoxColliderMenuItem)
-EVT_TOOL(ID_TOOL_ATTACH_SPHERE_COLLIDER, iaMainFrame::OnAttachSphereColliderMenuItem)
-EVT_TOOL(ID_TOOL_CONTROLLER, iaMainFrame::OnAttachScriptedControllerMenuItem)
-EVT_TOOL(ID_TOOL_SAVE, iaMainFrame::OnSaveMenuItem)
-EVT_TOOL(ID_TOOL_IMPORT, iaMainFrame::OnLoadProjectMenuItem)
-
-END_EVENT_TABLE()
-
-iaMainFrame *m_mainfrm;
-
-iaMainFrame::~iaMainFrame()
-{
- central_info->Get3dView ()->ShutDown ();
- aui_mgr.UnInit();
-}
-
-iaMainFrame::iaMainFrame()
-{
- m_mainfrm = this;
-}
-
-iaMainFrame::iaMainFrame(iEditorCentralInfo* info, wxWindow* parent,
- const wxWindowID id, const wxString& title, const wxPoint& pos,
- const wxSize& size, const long style)
-{
- central_info = info;
- m_mainfrm = this;
- central_info->GetObjectsInfo ()->AddListener ((iaBaseObjectListener*)this);
- SetMinSize(wxSize(400,300));
-}
-
-bool iaMainFrame::Create(wxWindow* parent, wxWindowID id, const wxString& caption,
- const wxPoint& pos, const wxSize& size, long style)
-{
- pnl_3dview = NULL;
- wxFrame::Create (parent, id, caption, pos, size, style);
-
- if (!CreateControls ())
- return false;
-
- pnl_3dview->SetFocus ();
-
- Centre ();
-
- return true;
-}
-
-void iaMainFrame::ObjectSelected (iEditorObject *obj)
-{
- bool can_delete = true;
- for (size_t i = 0; i < central_info->GetObjectsInfo ()->GetSelectedObjectsCount (); i++)
- {
- if (!central_info->GetObjectsInfo ()->GetSelectedObject (i)->CanBeDeleted ())
- can_delete = false;
- }
- itemMenuEdit->Enable (IA_MENUITEM_DELETE, can_delete);
-
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BODY, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BOX_COLLIDER, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_JOINT, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER, false);
-
- if (central_info->GetObjectsInfo ()->GetSelectedObjectsCount () == 1)
- {
- iEditorObject *obj = central_info->GetObjectsInfo ()->GetSelectedObject (0);
- if (obj->CanAttach (IA_OBJECT_TYPE_BODY))
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BODY, true);
- if (obj->CanAttach (IA_OBJECT_TYPE_COLLIDER))
- {
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, true);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BOX_COLLIDER, true);
- }
- if (obj->CanAttach (IA_OBJECT_TYPE_CONTROLLER))
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER, true);
-
- }else if(central_info->GetObjectsInfo ()->GetSelectedObjectsCount () == 2)
- {
- iEditorObject *obj1 = central_info->GetObjectsInfo ()->GetSelectedObject (0);
- iEditorObject *obj2 = central_info->GetObjectsInfo ()->GetSelectedObject (1);
- if (obj1->CanAttach (IA_OBJECT_TYPE_JOINT) && obj2->CanAttach (IA_OBJECT_TYPE_JOINT))
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_JOINT, true);
- }
-
-}
-void iaMainFrame::ObjectRemoved (iEditorObject *obj)
-{
-}
-void iaMainFrame::UpdatePane (wxWindow *wnd)
-{
- aui_mgr.GetPane (wnd).BestSize (wnd->GetSize ());
- aui_mgr.InsertPane (wnd, aui_mgr.GetPane (wnd), wxAUI_INSERT_DOCK);
- aui_mgr.Update ();
-}
-void iaMainFrame::ObjectAdded (iEditorObject *obj)
-{
-}
-void iaMainFrame::ObjectChanged (iEditorObject *obj, iEditorObjectProperty* prop)
-{
-}
-
-/*!
-* Control creation for ia_MainFrame
-*/
-bool iaMainFrame::CreateControls()
-{
- aui_mgr.SetManagedWindow (this);
-
- wxString icons_path = wxString (central_info->GetIconsPath ().c_str (), wxConvUTF8);
- if (icons_path.Cmp (_T("")) == 0)
- return false;
-
- //menu and statusbar
- iaMainFrame* itemFrame1 = this;
-
- wxMenuBar* menuBar = new wxMenuBar;
- wxMenu* itemMenu5 = new wxMenu;
- itemMenu5->Append (ID_MENUITEM_NEW_PROJECT, _("New Project...\tCTRL+N"), _T(""), wxITEM_NORMAL);
- itemMenu5->Append (ID_MENUITEM_LOAD_PROJECT, _("Load Project...\tCTRL+L"), _T(""), wxITEM_NORMAL);
- //itemMenu5->Append (ID_MENUITEM_LOAD, _("Load..."), _T(""), wxITEM_NORMAL);
- itemMenu5->Append (ID_MENUITEM_SAVE, _("Save Project\tCTRL+S"), _T(""), wxITEM_NORMAL);
- //itemMenu5->Append (ID_MENUITEM_SAVE_AS, _("Save As..."), _T(""), wxITEM_NORMAL);
- itemMenu5->Append(ID_MENUITEM_EXIT, _("Exit\tCTRL+X"), _T(""), wxITEM_NORMAL);
- menuBar->Append(itemMenu5, _("File"));
- itemMenuEdit = new wxMenu;
- itemMenuEdit->Append (IA_MENUITEM_DELETE, _("Delete\tDel"), _T(""), wxITEM_NORMAL);
- menuBar->Append(itemMenuEdit, _("Edit"));
- wxMenu* itemMenuView = new wxMenu;
- menuBar->Append(itemMenuView, _("View"));
- itemMenuView->Append (ID_MENUITEM_DRAW_WIREFRAME, _("Draw wireframe"), _T(""), wxITEM_CHECK);
- itemMenuView->Append (ID_MENUITEM_SHOW_BONES, _("Show Bones"), _T(""), wxITEM_CHECK);
- itemMenuView->Check (ID_MENUITEM_SHOW_BONES, true);
- itemMenuView->Append (ID_MENUITEM_SHOW_COLLIDERS, _("Show Colliders"), _T(""), wxITEM_CHECK);
- itemMenuView->Check (ID_MENUITEM_SHOW_COLLIDERS, true);
- itemMenuView->Append (ID_MENUITEM_SHOW_JOINTS, _("Show Joints"), _T(""), wxITEM_CHECK);
- itemMenuView->Check (ID_MENUITEM_SHOW_JOINTS, true);
- itemMenuView->Append (ID_MENUITEM_SHOW_BODIES, _("Show Bodies"), _T(""), wxITEM_CHECK);
- itemMenuView->Check (ID_MENUITEM_SHOW_BODIES, true);
- itemMenuView->Append (ID_MENUITEM_SHOW_CHARACTERS, _("Show Characters"), _T(""), wxITEM_CHECK);
- itemMenuView->Check (ID_MENUITEM_SHOW_CHARACTERS, true);
-
- itemMenuAttach = new wxMenu;
- itemMenuAttach->Append (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, _("Attach Sphere Collider..."),
- _T(""),wxITEM_NORMAL);
- itemMenuAttach->Append (IA_MENUITEM_ATTACH_BOX_COLLIDER, _("Attach Box Collider..."),
- _T(""),wxITEM_NORMAL);
- itemMenuAttach->Append (IA_MENUITEM_ATTACH_BODY, _("Attach Body...\tCTRL+B"), _T(""), wxITEM_NORMAL);
- itemMenuAttach->Append (IA_MENUITEM_ATTACH_JOINT, _("Attach Joint...\tCTRL+J"), _T(""), wxITEM_NORMAL);
- itemMenuAttach->Append (IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER,
- _("Attach Scripted Controler...\tCTRL+C"), _T(""), wxITEM_NORMAL);
- menuBar->Append (itemMenuAttach, _("Attach"));
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, false);
-
- wxMenu* itemMenu13 = new wxMenu;
- itemMenu13->Append (ID_MENUITEM2, _("About"), _T(""), wxITEM_NORMAL);
- menuBar->Append (itemMenu13, _("Help"));
- itemFrame1->SetMenuBar (menuBar);
-
- wxStatusBar* itemStatusBar2 = new wxStatusBar (itemFrame1, ID_STATUSBAR,
- wxST_SIZEGRIP | wxNO_BORDER);
- itemStatusBar2->SetFieldsCount (2);
- itemFrame1->SetStatusBar (itemStatusBar2);
- //end menu and statusbar
-
- //toolbar
- wxInitAllImageHandlers ();
- wxToolBar* tb1 = CreateToolBar (wxTB_FLAT | wxTB_HORIZONTAL, ID_TOOLBAR);
- tb1->SetToolBitmapSize (wxSize(32, 32));
-
- tb1->AddSeparator();
-
- wxBitmap itemtool2Bitmap (icons_path + _T("Icon_save.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool2BitmapDisabled (icons_path + _T("Icon_save_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_SAVE, _T(""), itemtool2Bitmap, itemtool2BitmapDisabled, wxITEM_NORMAL,
- _T(""), wxT("Save project"));
-
- wxBitmap itemtool3Bitmap (icons_path + _T("Icon_import.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool3BitmapDisabled (icons_path + _T("Icon_import_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_IMPORT, _T(""), itemtool3Bitmap, itemtool3BitmapDisabled, wxITEM_NORMAL,
- _T(""), wxT("Load Project"));
-
-#if 0
- wxBitmap itemtool4Bitmap (icons_path + _T("Icon_export.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool4BitmapDisabled (icons_path + _T ("Icon_export_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_EXPORT, _T(""), itemtool4Bitmap, itemtool4BitmapDisabled, wxITEM_NORMAL,
- _T(""), wxT("Export physics (currently not avaible)"));
-#endif
-
- tb1->AddSeparator();
-#if 0
- wxBitmap itemtool5Bitmap (icons_path + _T("Icon_move.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool5BitmapDisabled (icons_path + _T ("Icon_move_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_MOVE, _T(""), itemtool5Bitmap, itemtool5BitmapDisabled, wxITEM_NORMAL, _T(""),
- wxT("Move Object (currently not avaible)"));
-
- wxBitmap itemtool6Bitmap (icons_path + _T("Icon_rotate.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool6BitmapDisabled (icons_path + _T("Icon_rotate_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_ROTATE, _T(""), itemtool6Bitmap, itemtool6BitmapDisabled, wxITEM_NORMAL, _T(""),
- wxT("Rotate Object (currently not avaible)"));
-
- tb1->AddSeparator();
-
- wxBitmap itemtool7Bitmap (icons_path + _T ("Icon_movebody.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool7BitmapDisabled (icons_path + _T("Icon_movebody_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_MOVE_BODY, _T(""), itemtool7Bitmap, itemtool7BitmapDisabled,
- wxITEM_NORMAL, _T(""), wxT("Move rigid body (currently not avaible)"));
-
- wxBitmap itemtool8Bitmap (icons_path + _T("Icon_rotatebody.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool8BitmapDisabled (icons_path + _T("Icon_rotatebody_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_ROTATE_BODY, _T(""), itemtool8Bitmap, itemtool8BitmapDisabled, wxITEM_NORMAL,
- _T(""), wxT("Rotate rigid body (currently not avaible)"));
-
- tb1->AddSeparator();
-
- wxBitmap itemtool9Bitmap (icons_path + _T("Icon_rag.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool9BitmapDisabled (icons_path + _T("Icon_rag_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_CREATE_CHAR, _T(""), itemtool9Bitmap, itemtool9BitmapDisabled, wxITEM_NORMAL,
- _T(""), wxT("Create character from given model"));
-#endif
-
- wxBitmap itemtool10Bitmap (icons_path + _T("Icon_cube.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool10BitmapDisabled (icons_path + _T("Icon_cube_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_ATTACH_BOX_COLLIDER, _T(""), itemtool10Bitmap, itemtool10BitmapDisabled,
- wxITEM_NORMAL, _T(""), wxT("Attach box collider"));
-
- wxBitmap itemtool11Bitmap (icons_path + _T ("Icon_cilinder.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool11BitmapDisabled(icons_path + _T ("Icon_cilinder_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool(ID_TOOL_ATTACH_CAPSULE_COLLIDER, _T(""), itemtool11Bitmap, itemtool11BitmapDisabled,
- wxITEM_NORMAL, _T(""), wxT("Attach cilinder collider"));
-
- wxBitmap itemtool12Bitmap (icons_path + _T ("Icon_sphere.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool12BitmapDisabled (icons_path + _T("Icon_sphere_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_ATTACH_SPHERE_COLLIDER, _T(""), itemtool12Bitmap, itemtool12BitmapDisabled,
- wxITEM_NORMAL, _T(""), wxT("Attach sphere collider"));
-
-#if 0
- wxBitmap itemtool16Bitmap (icons_path + _T("Icon_animation.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool16BitmapDisabled (icons_path + _T("Icon_animation_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_ANIMATION, _T(""), itemtool16Bitmap, itemtool16BitmapDisabled, wxITEM_NORMAL,
- _T(""), wxT("Animation tool (not avaible yet)"));
-
- wxBitmap itemtool17Bitmap (icons_path + _T("Icon_force.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool17BitmapDisabled (icons_path + _T("Icon_force_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_FORCE, _T(""), itemtool17Bitmap, itemtool17BitmapDisabled, wxITEM_NORMAL,
- _T(""), wxT("Create force (not avaible yet)"));
-#endif
-
- wxBitmap itemtool18Bitmap (icons_path + _T("Icon_controler.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool18BitmapDisabled (icons_path + _T("Icon_controler_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_CONTROLLER, _T(""),
- itemtool18Bitmap, itemtool18BitmapDisabled, wxITEM_NORMAL, _T(""), wxT("Attach controller"));
-
- tb1->AddSeparator();
-
-#if 0
- wxBitmap itemtool19Bitmap(icons_path + _T("Icon_camera.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool19BitmapDisabled(icons_path + _T("Icon_camera_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool(ID_TOOL_CAMERA, _T(""), itemtool19Bitmap, itemtool19BitmapDisabled, wxITEM_NORMAL, _T(""),
- wxT("Record (not avaible yet)"));
-
- tb1->AddSeparator();
-#endif
-
- itemMenuEdit->Enable (IA_MENUITEM_DELETE, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BODY, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BOX_COLLIDER, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_JOINT, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER, false);
-
- tb1->Realize();
- itemFrame1->SetToolBar (tb1);
- //end toolbar
-
- sim_panel = new iaSimulationPanel (central_info, this, ID_SIMULATION_PANEL,
- wxDefaultPosition, wxSize(GetSize().x, 115), wxNO_BORDER | wxTAB_TRAVERSAL);
- sim_panel->SetBackgroundColour (wxColor (255, 255, 255));
- sim_panel->CreateControls ();
-
- //the tree
- objtree = new iaObjectTree (central_info, this, ID_OBJECTS_TREE_PANEL, wxDefaultPosition, wxSize(200, 63),
- wxNO_BORDER | wxTAB_TRAVERSAL, icons_path);
- objtree->SetBackgroundColour (wxColor (255, 255, 255));
-
- //3dview
- pnl_3dview = new wxPanel (this, ID_PANEL, wxDefaultPosition, wxSize(131, 63),
- wxSUNKEN_BORDER | wxTAB_TRAVERSAL);
- pnl_3dview->SetBackgroundColour(wxColour(0, 0, 128));
-
- //pnl right ->propgrid
- iaPropertyGrid* propEditor = new iaPropertyGrid (central_info, this, -1, wxPoint(3, 3),
- wxSize(131, 63), wxPG_BOLD_MODIFIED | wxPG_SPLITTER_AUTO_CENTER | wxPG_AUTO_SORT | wxTOP |
- wxTAB_TRAVERSAL| wxPG_BOOL_USE_CHECKBOX);
- propEditor->SetMarginColour (wxColor (122, 110, 90));
- propEditor->SetLineColour (wxColor (0,0,0));
- propEditor->SetCaptionBackgroundColour (wxColor (122, 110, 90));
- propEditor->SetCaptionForegroundColour (wxColor (0,0,0));
- //propEditor->SetCellBackgroundColour (wxColor (122, 110, 90));
-
- aui_mgr.AddPane (sim_panel, wxAuiPaneInfo ().Name (
- wxT ("pnl_bottom")).Caption (wxT ("Simulation")).Bottom());
-
- aui_mgr.AddPane(objtree, wxAuiPaneInfo ().Name (wxT ("objtree")).Caption (
- wxT ("Objects Tree")).Left());
-
- aui_mgr.AddPane (propEditor, wxAuiPaneInfo ().Name (wxT ("properties")).Caption (
- wxT ("Properties")).Right());
-
- aui_mgr.AddPane (pnl_3dview, wxCENTER);
-
- aui_mgr.Update ();
-
- return true;
-}
-
-bool iaMainFrame::ShowToolTips()
-{
- return true;
-}
-
-wxBitmap iaMainFrame::GetBitmapResource(const wxString& name)
-{
- // Bitmap retrieval
- ////@begin iaMainFrame bitmap retrieval
- wxUnusedVar(name);
- return wxNullBitmap;
- ////@end iaMainFrame bitmap retrieval
-}
-void iaMainFrame::OnShowColliders (wxCommandEvent& event)
-{
- central_info->Get3dView ()->Show (IA_OBJECT_TYPE_COLLIDER, event.IsChecked ());
-}
-void iaMainFrame::OnShowJoints (wxCommandEvent& event)
-{
- central_info->Get3dView ()->Show (IA_OBJECT_TYPE_JOINT, event.IsChecked ());
-}
-void iaMainFrame::OnShowBones (wxCommandEvent& event)
-{
- central_info->Get3dView ()->Show (IA_OBJECT_TYPE_BONE, event.IsChecked ());
-}
-void iaMainFrame::OnDrawWireFrame (wxCommandEvent& event)
-{
- central_info->Get3dView ()->DisplayWireframe (event.IsChecked ());
-}
-void iaMainFrame::OnShowBodies (wxCommandEvent& event)
-{
- central_info->Get3dView ()->Show (IA_OBJECT_TYPE_BODY, event.IsChecked ());
-}
-void iaMainFrame::OnShowCharacters (wxCommandEvent& event)
-{
- central_info->Get3dView ()->Show (IA_OBJECT_TYPE_CHARACTER, event.IsChecked ());
-}
-wxIcon iaMainFrame::GetIconResource(const wxString& name)
-{
- // Icon retrieval
- ////@begin iaMainFrame icon retrieval
- wxUnusedVar(name);
- return wxNullIcon;
- ////@end iaMainFrame icon retrieval
-}
-void iaMainFrame::OnLoadMenuItem ( wxCommandEvent& event )
-{
- //wxFileDialog ofd (m_mainfrm, "Load file", central_info->GetProjectPath ().c_str (), "", "*.*", wxOPEN);
- //if (ofd.ShowModal () == wxID_OK)
- //{
- // central_info->LoadObject (ofd.GetFilename ().c_str (),ofd.GetDirectory ().c_str ());
- //}
-}
-void iaMainFrame::OnDelete (wxCommandEvent& event)
-{
- central_info->GetObjectsInfo ()->DeleteSelected ();
-}
-void iaMainFrame::OnSaveMenuItem ( wxCommandEvent& event )
-{
- central_info->SaveProject ();
-}
-void iaMainFrame::OnLoadProjectMenuItem (wxCommandEvent& event)
-{
- wxFileDialog pfd (m_mainfrm, _T("Choose project file"),
- wxString (central_info->GetProjectPath ().c_str (), wxConvUTF8), _T(""), _T("*.iaprj"), wxOPEN);
- if (pfd.ShowModal () == wxID_OK)
- {
- central_info->LoadProject (pfd.GetFilename ().mb_str (), pfd.GetDirectory ().mb_str ());
- }
-}
-void iaMainFrame::OnAttachScriptedControllerMenuItem (wxCommandEvent& event)
-{
- OnAttachScriptedController (this);
-}
-void iaMainFrame::OnAttachJointMenuItem (wxCommandEvent& event)
-{
- OnAttachJoint ();
-}
-void iaMainFrame::OnAttachBodyMenuItem (wxCommandEvent& event)
-{
- OnAttachBody ();
-}
-void iaMainFrame::OnAttachCapsuleColliderMenuItem (wxCommandEvent& event)
-{
- OnAttachCapsuleCollider ();
-}
-void iaMainFrame::OnAttachSphereColliderMenuItem (wxCommandEvent& event)
-{
- OnAttachSphereCollider ();
-}
-void iaMainFrame::OnAttachBoxColliderMenuItem (wxCommandEvent& event)
-{
- OnAttachBoxCollider ();
-}
-void iaMainFrame::OnNewProjectMenuItem (wxCommandEvent& event)
-{
- wxFileDialog wfd (m_mainfrm, _T("Choose world file"),
- wxString (central_info->GetProjectPath ().c_str (), wxConvUTF8), _T(""), _T("*.*"), wxOPEN);
- if (wfd.ShowModal () == wxID_OK)
- {
- central_info->NewProject (wfd.GetFilename ().mb_str (),wfd.GetDirectory ().mb_str ());
- }
-}
-void iaMainFrame::OnExitMenuItem (wxCommandEvent& event)
-{
- m_mainfrm->Close();
-}
-void iaMainFrame::OnSaveAsMenuItem ( wxCommandEvent& event )
-{
- event.Skip();
-}
-void iaMainFrame::OnSize(wxSizeEvent& event)
-{
- if (m_mainfrm->pnl_3dview)
- {
- central_info->Get3dView ()->SetSize (m_mainfrm->pnl_3dview->GetClientSize().x,
- m_mainfrm->pnl_3dview->GetClientSize().y);
- }
- event.Skip();
-}
-
+/*
+Copyright (C) 2005 - 2007 by Piotr Obrzut and Valentin Vit
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with this library; if not, write to the Free
+Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma implementation "ia_mainframe.h"
+#endif
+
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#include "wx/wx.h"
+#endif
+
+////@begin includes
+#include <cssysdef.h>
+#include "../iaCSApplication.h"
+
+#include <wx/dc.h>
+#include <wx/filedlg.h>
+#include <wx/laywin.h>
+
+#include "widgets/iaObjectTree.h"
+#include "widgets/iaPropertyGrid.h"
+#include "widgets/iaPropertySheet.h"
+#include "widgets/iaSimulationPanel.h"
+#include <string>
+
+#include "editor.h"
+#include "iaMainFrame.h"
+
+IMPLEMENT_CLASS(iaMainFrame, wxFrame)
+/*!
+* iaMainFrame event table definition
+*/
+BEGIN_EVENT_TABLE(iaMainFrame, wxFrame)
+//EVT_LEFT_DOWN(iaMainFrame::OnMouse)
+//EVT_LEFT_DCLICK(iaMainFrame::OnMouse)
+
+EVT_SIZE(iaMainFrame::OnSize)
+
+EVT_MENU(IA_MENUITEM_ATTACH_BODY, iaMainFrame::OnAttachBodyMenuItem)
+EVT_MENU(IA_MENUITEM_ATTACH_SPHERE_COLLIDER, iaMainFrame::OnAttachSphereColliderMenuItem)
+EVT_MENU(IA_MENUITEM_ATTACH_BOX_COLLIDER, iaMainFrame::OnAttachBoxColliderMenuItem)
+EVT_MENU(IA_MENUITEM_ATTACH_CAPSULE_COLLIDER, iaMainFrame::OnAttachCapsuleColliderMenuItem)
+EVT_MENU(IA_MENUITEM_ATTACH_JOINT, iaMainFrame::OnAttachJointMenuItem)
+EVT_MENU(ID_MENUITEM_LOAD, iaMainFrame::OnLoadMenuItem)
+EVT_MENU(ID_MENUITEM_SAVE, iaMainFrame::OnSaveMenuItem)
+EVT_MENU(ID_MENUITEM_NEW_PROJECT, iaMainFrame::OnNewProjectMenuItem)
+EVT_MENU(ID_MENUITEM_LOAD_PROJECT, iaMainFrame::OnLoadProjectMenuItem)
+EVT_MENU(ID_MENUITEM_SAVE_AS, iaMainFrame::OnSaveAsMenuItem)
+EVT_MENU(ID_MENUITEM_EXIT, iaMainFrame::OnExitMenuItem)
+EVT_MENU(IA_MENUITEM_DELETE, iaMainFrame::OnDelete)
+EVT_MENU(IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER, iaMainFrame::OnAttachScriptedControllerMenuItem)
+EVT_MENU(ID_MENUITEM_DRAW_WIREFRAME, iaMainFrame::OnDrawWireFrame)
+EVT_MENU(ID_MENUITEM_SHOW_COLLIDERS, iaMainFrame::OnShowColliders)
+EVT_MENU(ID_MENUITEM_SHOW_JOINTS, iaMainFrame::OnShowJoints)
+EVT_MENU(ID_MENUITEM_SHOW_BONES, iaMainFrame::OnShowBones)
+EVT_MENU(ID_MENUITEM_SHOW_BODIES, iaMainFrame::OnShowBodies)
+EVT_MENU(ID_MENUITEM_SHOW_CHARACTERS, iaMainFrame::OnShowCharacters)
+
+EVT_TOOL(ID_TOOL_ATTACH_CAPSULE_COLLIDER, iaMainFrame::OnAttachCapsuleColliderMenuItem)
+EVT_TOOL(ID_TOOL_ATTACH_BOX_COLLIDER, iaMainFrame::OnAttachBoxColliderMenuItem)
+EVT_TOOL(ID_TOOL_ATTACH_SPHERE_COLLIDER, iaMainFrame::OnAttachSphereColliderMenuItem)
+EVT_TOOL(ID_TOOL_CONTROLLER, iaMainFrame::OnAttachScriptedControllerMenuItem)
+EVT_TOOL(ID_TOOL_SAVE, iaMainFrame::OnSaveMenuItem)
+EVT_TOOL(ID_TOOL_IMPORT, iaMainFrame::OnLoadProjectMenuItem)
+
+END_EVENT_TABLE()
+
+iaMainFrame *m_mainfrm;
+
+iaMainFrame::~iaMainFrame()
+{
+ central_info->Get3dView ()->ShutDown ();
+ aui_mgr.UnInit();
+}
+
+iaMainFrame::iaMainFrame()
+{
+ m_mainfrm = this;
+}
+
+iaMainFrame::iaMainFrame(iEditorCentralInfo* info, wxWindow* parent,
+ const wxWindowID id, const wxString& title, const wxPoint& pos,
+ const wxSize& size, const long style)
+{
+ central_info = info;
+ m_mainfrm = this;
+ central_info->GetObjectsInfo ()->AddListener ((iaBaseObjectListener*)this);
+ SetMinSize(wxSize(400,300));
+}
+
+bool iaMainFrame::Create(wxWindow* parent, wxWindowID id, const wxString& caption,
+ const wxPoint& pos, const wxSize& size, long style)
+{
+ pnl_3dview = NULL;
+ wxFrame::Create (parent, id, caption, pos, size, style);
+
+ if (!CreateControls ())
+ return false;
+
+ pnl_3dview->SetFocus ();
+
+ Centre ();
+
+ return true;
+}
+
+void iaMainFrame::ObjectSelected (iEditorObject *obj)
+{
+ bool can_delete = true;
+ for (size_t i = 0; i < central_info->GetObjectsInfo ()->GetSelectedObjectsCount (); i++)
+ {
+ if (!central_info->GetObjectsInfo ()->GetSelectedObject (i)->CanBeDeleted ())
+ can_delete = false;
+ }
+ itemMenuEdit->Enable (IA_MENUITEM_DELETE, can_delete);
+
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BODY, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BOX_COLLIDER, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_JOINT, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER, false);
+
+ if (central_info->GetObjectsInfo ()->GetSelectedObjectsCount () == 1)
+ {
+ iEditorObject *obj = central_info->GetObjectsInfo ()->GetSelectedObject (0);
+ if (obj->CanAttach (IA_OBJECT_TYPE_BODY))
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BODY, true);
+ if (obj->CanAttach (IA_OBJECT_TYPE_COLLIDER))
+ {
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, true);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BOX_COLLIDER, true);
+ }
+ if (obj->CanAttach (IA_OBJECT_TYPE_CONTROLLER))
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER, true);
+
+ }else if(central_info->GetObjectsInfo ()->GetSelectedObjectsCount () == 2)
+ {
+ iEditorObject *obj1 = central_info->GetObjectsInfo ()->GetSelectedObject (0);
+ iEditorObject *obj2 = central_info->GetObjectsInfo ()->GetSelectedObject (1);
+ if (obj1->CanAttach (IA_OBJECT_TYPE_JOINT) && obj2->CanAttach (IA_OBJECT_TYPE_JOINT))
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_JOINT, true);
+ }
+
+}
+void iaMainFrame::ObjectRemoved (iEditorObject *obj)
+{
+}
+void iaMainFrame::UpdatePane (wxWindow *wnd)
+{
+ aui_mgr.GetPane (wnd).BestSize (wnd->GetSize ());
+ aui_mgr.InsertPane (wnd, aui_mgr.GetPane (wnd), wxAUI_INSERT_DOCK);
+ aui_mgr.Update ();
+}
+void iaMainFrame::ObjectAdded (iEditorObject *obj)
+{
+}
+void iaMainFrame::ObjectChanged (iEditorObject *obj, iEditorObjectProperty* prop)
+{
+}
+
+/*!
+* Control creation for ia_MainFrame
+*/
+bool iaMainFrame::CreateControls()
+{
+ aui_mgr.SetManagedWindow (this);
+
+ wxString icons_path = wxString (central_info->GetIconsPath ().c_str (), wxConvUTF8);
+ if (icons_path.Cmp (_T("")) == 0)
+ return false;
+
+ //menu and statusbar
+ iaMainFrame* itemFrame1 = this;
+
+ wxMenuBar* menuBar = new wxMenuBar;
+ wxMenu* itemMenu5 = new wxMenu;
+ itemMenu5->Append (ID_MENUITEM_NEW_PROJECT, _("New Project...\tCTRL+N"), _T(""), wxITEM_NORMAL);
+ itemMenu5->Append (ID_MENUITEM_LOAD_PROJECT, _("Load Project...\tCTRL+L"), _T(""), wxITEM_NORMAL);
+ //itemMenu5->Append (ID_MENUITEM_LOAD, _("Load..."), _T(""), wxITEM_NORMAL);
+ itemMenu5->Append (ID_MENUITEM_SAVE, _("Save Project\tCTRL+S"), _T(""), wxITEM_NORMAL);
+ //itemMenu5->Append (ID_MENUITEM_SAVE_AS, _("Save As..."), _T(""), wxITEM_NORMAL);
+ itemMenu5->Append(ID_MENUITEM_EXIT, _("Exit\tCTRL+X"), _T(""), wxITEM_NORMAL);
+ menuBar->Append(itemMenu5, _("File"));
+ itemMenuEdit = new wxMenu;
+ itemMenuEdit->Append (IA_MENUITEM_DELETE, _("Delete\tDel"), _T(""), wxITEM_NORMAL);
+ menuBar->Append(itemMenuEdit, _("Edit"));
+ wxMenu* itemMenuView = new wxMenu;
+ menuBar->Append(itemMenuView, _("View"));
+ itemMenuView->Append (ID_MENUITEM_DRAW_WIREFRAME, _("Draw wireframe"), _T(""), wxITEM_CHECK);
+ itemMenuView->Append (ID_MENUITEM_SHOW_BONES, _("Show Bones"), _T(""), wxITEM_CHECK);
+ itemMenuView->Check (ID_MENUITEM_SHOW_BONES, true);
+ itemMenuView->Append (ID_MENUITEM_SHOW_COLLIDERS, _("Show Colliders"), _T(""), wxITEM_CHECK);
+ itemMenuView->Check (ID_MENUITEM_SHOW_COLLIDERS, true);
+ itemMenuView->Append (ID_MENUITEM_SHOW_JOINTS, _("Show Joints"), _T(""), wxITEM_CHECK);
+ itemMenuView->Check (ID_MENUITEM_SHOW_JOINTS, true);
+ itemMenuView->Append (ID_MENUITEM_SHOW_BODIES, _("Show Bodies"), _T(""), wxITEM_CHECK);
+ itemMenuView->Check (ID_MENUITEM_SHOW_BODIES, true);
+ itemMenuView->Append (ID_MENUITEM_SHOW_CHARACTERS, _("Show Characters"), _T(""), wxITEM_CHECK);
+ itemMenuView->Check (ID_MENUITEM_SHOW_CHARACTERS, true);
+
+ itemMenuAttach = new wxMenu;
+ itemMenuAttach->Append (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, _("Attach Sphere Collider..."),
+ _T(""),wxITEM_NORMAL);
+ itemMenuAttach->Append (IA_MENUITEM_ATTACH_BOX_COLLIDER, _("Attach Box Collider..."),
+ _T(""),wxITEM_NORMAL);
+ itemMenuAttach->Append (IA_MENUITEM_ATTACH_BODY, _("Attach Body...\tCTRL+B"), _T(""), wxITEM_NORMAL);
+ itemMenuAttach->Append (IA_MENUITEM_ATTACH_JOINT, _("Attach Joint...\tCTRL+J"), _T(""), wxITEM_NORMAL);
+ itemMenuAttach->Append (IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER,
+ _("Attach Scripted Controler...\tCTRL+C"), _T(""), wxITEM_NORMAL);
+ menuBar->Append (itemMenuAttach, _("Attach"));
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, false);
+
+ wxMenu* itemMenu13 = new wxMenu;
+ itemMenu13->Append (ID_MENUITEM2, _("About"), _T(""), wxITEM_NORMAL);
+ menuBar->Append (itemMenu13, _("Help"));
+ itemFrame1->SetMenuBar (menuBar);
+
+ wxStatusBar* itemStatusBar2 = new wxStatusBar (itemFrame1, ID_STATUSBAR,
+ wxST_SIZEGRIP | wxNO_BORDER);
+ itemStatusBar2->SetFieldsCount (2);
+ itemFrame1->SetStatusBar (itemStatusBar2);
+ //end menu and statusbar
+
+ //toolbar
+ wxInitAllImageHandlers ();
+ wxToolBar* tb1 = CreateToolBar (wxTB_FLAT | wxTB_HORIZONTAL, ID_TOOLBAR);
+ tb1->SetToolBitmapSize (wxSize(32, 32));
+
+ tb1->AddSeparator();
+
+ wxBitmap itemtool2Bitmap (icons_path + _T("Icon_save.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool2BitmapDisabled (icons_path + _T("Icon_save_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_SAVE, _T(""), itemtool2Bitmap, itemtool2BitmapDisabled, wxITEM_NORMAL,
+ _T(""), wxT("Save project"));
+
+ wxBitmap itemtool3Bitmap (icons_path + _T("Icon_import.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool3BitmapDisabled (icons_path + _T("Icon_import_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_IMPORT, _T(""), itemtool3Bitmap, itemtool3BitmapDisabled, wxITEM_NORMAL,
+ _T(""), wxT("Load Project"));
+
+#if 0
+ wxBitmap itemtool4Bitmap (icons_path + _T("Icon_export.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool4BitmapDisabled (icons_path + _T ("Icon_export_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_EXPORT, _T(""), itemtool4Bitmap, itemtool4BitmapDisabled, wxITEM_NORMAL,
+ _T(""), wxT("Export physics (currently not avaible)"));
+#endif
+
+ tb1->AddSeparator();
+#if 0
+ wxBitmap itemtool5Bitmap (icons_path + _T("Icon_move.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool5BitmapDisabled (icons_path + _T ("Icon_move_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_MOVE, _T(""), itemtool5Bitmap, itemtool5BitmapDisabled, wxITEM_NORMAL, _T(""),
+ wxT("Move Object (currently not avaible)"));
+
+ wxBitmap itemtool6Bitmap (icons_path + _T("Icon_rotate.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool6BitmapDisabled (icons_path + _T("Icon_rotate_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_ROTATE, _T(""), itemtool6Bitmap, itemtool6BitmapDisabled, wxITEM_NORMAL, _T(""),
+ wxT("Rotate Object (currently not avaible)"));
+
+ tb1->AddSeparator();
+
+ wxBitmap itemtool7Bitmap (icons_path + _T ("Icon_movebody.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool7BitmapDisabled (icons_path + _T("Icon_movebody_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_MOVE_BODY, _T(""), itemtool7Bitmap, itemtool7BitmapDisabled,
+ wxITEM_NORMAL, _T(""), wxT("Move rigid body (currently not avaible)"));
+
+ wxBitmap itemtool8Bitmap (icons_path + _T("Icon_rotatebody.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool8BitmapDisabled (icons_path + _T("Icon_rotatebody_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_ROTATE_BODY, _T(""), itemtool8Bitmap, itemtool8BitmapDisabled, wxITEM_NORMAL,
+ _T(""), wxT("Rotate rigid body (currently not avaible)"));
+
+ tb1->AddSeparator();
+
+ wxBitmap itemtool9Bitmap (icons_path + _T("Icon_rag.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool9BitmapDisabled (icons_path + _T("Icon_rag_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_CREATE_CHAR, _T(""), itemtool9Bitmap, itemtool9BitmapDisabled, wxITEM_NORMAL,
+ _T(""), wxT("Create character from given model"));
+#endif
+
+ wxBitmap itemtool10Bitmap (icons_path + _T("Icon_cube.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool10BitmapDisabled (icons_path + _T("Icon_cube_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_ATTACH_BOX_COLLIDER, _T(""), itemtool10Bitmap, itemtool10BitmapDisabled,
+ wxITEM_NORMAL, _T(""), wxT("Attach box collider"));
+
+ wxBitmap itemtool11Bitmap (icons_path + _T ("Icon_cilinder.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool11BitmapDisabled(icons_path + _T ("Icon_cilinder_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool(ID_TOOL_ATTACH_CAPSULE_COLLIDER, _T(""), itemtool11Bitmap, itemtool11BitmapDisabled,
+ wxITEM_NORMAL, _T(""), wxT("Attach cilinder collider"));
+
+ wxBitmap itemtool12Bitmap (icons_path + _T ("Icon_sphere.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool12BitmapDisabled (icons_path + _T("Icon_sphere_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_ATTACH_SPHERE_COLLIDER, _T(""), itemtool12Bitmap, itemtool12BitmapDisabled,
+ wxITEM_NORMAL, _T(""), wxT("Attach sphere collider"));
+
+#if 0
+ wxBitmap itemtool16Bitmap (icons_path + _T("Icon_animation.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool16BitmapDisabled (icons_path + _T("Icon_animation_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_ANIMATION, _T(""), itemtool16Bitmap, itemtool16BitmapDisabled, wxITEM_NORMAL,
+ _T(""), wxT("Animation tool (not avaible yet)"));
+
+ wxBitmap itemtool17Bitmap (icons_path + _T("Icon_force.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool17BitmapDisabled (icons_path + _T("Icon_force_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_FORCE, _T(""), itemtool17Bitmap, itemtool17BitmapDisabled, wxITEM_NORMAL,
+ _T(""), wxT("Create force (not avaible yet)"));
+#endif
+
+ wxBitmap itemtool18Bitmap (icons_path + _T("Icon_controler.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool18BitmapDisabled (icons_path + _T("Icon_controler_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_CONTROLLER, _T(""),
+ itemtool18Bitmap, itemtool18BitmapDisabled, wxITEM_NORMAL, _T(""), wxT("Attach controller"));
+
+ tb1->AddSeparator();
+
+#if 0
+ wxBitmap itemtool19Bitmap(icons_path + _T("Icon_camera.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool19BitmapDisabled(icons_path + _T("Icon_camera_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool(ID_TOOL_CAMERA, _T(""), itemtool19Bitmap, itemtool19BitmapDisabled, wxITEM_NORMAL, _T(""),
+ wxT("Record (not avaible yet)"));
+
+ tb1->AddSeparator();
+#endif
+
+ itemMenuEdit->Enable (IA_MENUITEM_DELETE, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BODY, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BOX_COLLIDER, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_JOINT, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER, false);
+
+ tb1->Realize();
+ itemFrame1->SetToolBar (tb1);
+ //end toolbar
+
+ sim_panel = new iaSimulationPanel (central_info, this, ID_SIMULATION_PANEL,
+ wxDefaultPosition, wxSize(GetSize().x, 115), wxNO_BORDER | wxTAB_TRAVERSAL);
+ sim_panel->SetBackgroundColour (wxColor (255, 255, 255));
+ sim_panel->CreateControls ();
+
+ //the tree
+ objtree = new iaObjectTree (central_info, this, ID_OBJECTS_TREE_PANEL, wxDefaultPosition, wxSize(200, 63),
+ wxNO_BORDER | wxTAB_TRAVERSAL, icons_path);
+ objtree->SetBackgroundColour (wxColor (255, 255, 255));
+
+ //3dview
+ pnl_3dview = new wxPanel (this, ID_PANEL, wxDefaultPosition, wxSize(131, 63),
+ wxSUNKEN_BORDER | wxTAB_TRAVERSAL);
+ pnl_3dview->SetBackgroundColour(wxColour(0, 0, 128));
+
+ //pnl right ->propgrid
+ iaPropertyGrid* propEditor = new iaPropertyGrid (central_info, this, -1, wxPoint(3, 3),
+ wxSize(131, 63), wxPG_BOLD_MODIFIED | wxPG_SPLITTER_AUTO_CENTER | wxPG_AUTO_SORT | wxTOP |
+ wxTAB_TRAVERSAL| wxPG_BOOL_USE_CHECKBOX);
+ propEditor->SetMarginColour (wxColor (122, 110, 90));
+ propEditor->SetLineColour (wxColor (0,0,0));
+ propEditor->SetCaptionBackgroundColour (wxColor (122, 110, 90));
+ propEditor->SetCaptionForegroundColour (wxColor (0,0,0));
+ //propEditor->SetCellBackgroundColour (wxColor (122, 110, 90));
+
+ aui_mgr.AddPane (sim_panel, wxAuiPaneInfo ().Name (
+ wxT ("pnl_bottom")).Caption (wxT ("Simulation")).Bottom());
+
+ aui_mgr.AddPane(objtree, wxAuiPaneInfo ().Name (wxT ("objtree")).Caption (
+ wxT ("Objects Tree")).Left());
+
+ aui_mgr.AddPane (propEditor, wxAuiPaneInfo ().Name (wxT ("properties")).Caption (
+ wxT ("Properties")).Right());
+
+ aui_mgr.AddPane (pnl_3dview, wxCENTER);
+
+ aui_mgr.Update ();
+
+ return true;
+}
+
+bool iaMainFrame::ShowToolTips()
+{
+ return true;
+}
+
+wxBitmap iaMainFrame::GetBitmapResource(const wxString& name)
+{
+ // Bitmap retrieval
+ ////@begin iaMainFrame bitmap retrieval
+ wxUnusedVar(name);
+ return wxNullBitmap;
+ ////@end iaMainFrame bitmap retrieval
+}
+void iaMainFrame::OnShowColliders (wxCommandEvent& event)
+{
+ central_info->Get3dView ()->Show (IA_OBJECT_TYPE_COLLIDER, event.IsChecked ());
+}
+void iaMainFrame::OnShowJoints (wxCommandEvent& event)
+{
+ central_info->Get3dView ()->Show (IA_OBJECT_TYPE_JOINT, event.IsChecked ());
+}
+void iaMainFrame::OnShowBones (wxCommandEvent& event)
+{
+ central_info->Get3dView ()->Show (IA_OBJECT_TYPE_BONE, event.IsChecked ());
+}
+void iaMainFrame::OnDrawWireFrame (wxCommandEvent& event)
+{
+ central_info->Get3dView ()->DisplayWireframe (event.IsChecked ());
+}
+void iaMainFrame::OnShowBodies (wxCommandEvent& event)
+{
+ central_info->Get3dView ()->Show (IA_OBJECT_TYPE_BODY, event.IsChecked ());
+}
+void iaMainFrame::OnShowCharacters (wxCommandEvent& event)
+{
+ central_info->Get3dView ()->Show (IA_OBJECT_TYPE_CHARACTER, event.IsChecked ());
+}
+wxIcon iaMainFrame::GetIconResource(const wxString& name)
+{
+ // Icon retrieval
+ ////@begin iaMainFrame icon retrieval
+ wxUnusedVar(name);
+ return wxNullIcon;
+ ////@end iaMainFrame icon retrieval
+}
+void iaMainFrame::OnLoadMenuItem ( wxCommandEvent& event )
+{
+ //wxFileDialog ofd (m_mainfrm, "Load file", central_info->GetProjectPath ().c_str (), "", "*.*", wxOPEN);
+ //if (ofd.ShowModal () == wxID_OK)
+ //{
+ // central_info->LoadObject (ofd.GetFilename ().c_str (),ofd.GetDirectory ().c_str ());
+ //}
+}
+void iaMainFrame::OnDelete (wxCommandEvent& event)
+{
+ central_info->GetObjectsInfo ()->DeleteSelected ();
+}
+void iaMainFrame::OnSaveMenuItem ( wxCommandEvent& event )
+{
+ central_info->SaveProject ();
+}
+void iaMainFrame::OnLoadProjectMenuItem (wxCommandEvent& event)
+{
+ wxFileDialog pfd (m_mainfrm, _T("Choose project file"),
+ wxString (central_info->GetProjectPath ().c_str (), wxConvUTF8), _T(""), _T("*.iaprj"), wxOPEN);
+ if (pfd.ShowModal () == wxID_OK)
+ {
+ central_info->LoadProject (pfd.GetFilename ().mb_str (), pfd.GetDirectory ().mb_str ());
+ }
+}
+void iaMainFrame::OnAttachScriptedControllerMenuItem (wxCommandEvent& event)
+{
+ OnAttachScriptedController (this);
+}
+void iaMainFrame::OnAttachJointMenuItem (wxCommandEvent& event)
+{
+ OnAttachJoint ();
+}
+void iaMainFrame::OnAttachBodyMenuItem (wxCommandEvent& event)
+{
+ OnAttachBody ();
+}
+void iaMainFrame::OnAttachCapsuleColliderMenuItem (wxCommandEvent& event)
+{
+ OnAttachCapsuleCollider ();
+}
+void iaMainFrame::OnAttachSphereColliderMenuItem (wxCommandEvent& event)
+{
+ OnAttachSphereCollider ();
+}
+void iaMainFrame::OnAttachBoxColliderMenuItem (wxCommandEvent& event)
+{
+ OnAttachBoxCollider ();
+}
+void iaMainFrame::OnNewProjectMenuItem (wxCommandEvent& event)
+{
+ wxFileDialog wfd (m_mainfrm, _T("Choose world file"),
+ wxString (central_info->GetProjectPath ().c_str (), wxConvUTF8), _T(""), _T("*.*"), wxOPEN);
+ if (wfd.ShowModal () == wxID_OK)
+ {
+ central_info->NewProject (wfd.GetFilename ().mb_str (),wfd.GetDirectory ().mb_str ());
+ }
+}
+void iaMainFrame::OnExitMenuItem (wxCommandEvent& event)
+{
+ m_mainfrm->Close();
+}
+void iaMainFrame::OnSaveAsMenuItem ( wxCommandEvent& event )
+{
+ event.Skip();
+}
+void iaMainFrame::OnSize(wxSizeEvent& event)
+{
+ if (m_mainfrm->pnl_3dview)
+ {
+ central_info->Get3dView ()->SetSize (m_mainfrm->pnl_3dview->GetClientSize().x,
+ m_mainfrm->pnl_3dview->GetClientSize().y);
+ }
+ event.Skip();
+}
+
Modified: branches/release/V0.2/src/apps/editor/gui/widgets/iaMainFrame.h
===================================================================
--- branches/release/V0.2/src/apps/editor/gui/widgets/iaMainFrame.h 2007-10-08 12:30:21 UTC (rev 345)
+++ branches/release/V0.2/src/apps/editor/gui/widgets/iaMainFrame.h 2007-10-08 12:38:05 UTC (rev 346)
@@ -1,185 +1,183 @@
-/*
-Copyright (C) 2005 - 2007 by Piotr Obrzut and Valentin Vit
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free
-Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-
-#ifndef _IA_MAINFRAME_H_
-#define _IA_MAINFRAME_H_
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "ia_mainframe.h"
-#endif
-
-
-#include <wx/statusbr.h>
-#include <wx/laywin.h>
-#include <wx/intl.h>
-
-#include "editor.h"
-#include "iaObjectsManager.h"
-#include "ia-tool/iaBaseObjectListener.h"
-#include <wx/aui/aui.h>
-
-
-
-////@begin control identifiers
-#define ID_FRAME 10000
-#define SYMBOL_IAMAINFRAME_STYLE wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE | wxHSCROLL | wxVSCROLL
-#define SYMBOL_IAMAINFRAME_TITLE _("iaMainFrame")
-#define SYMBOL_IAMAINFRAME_IDNAME ID_FRAME
-#define SYMBOL_IAMAINFRAME_SIZE wxSize(300, 300)
-#define SYMBOL_IAMAINFRAME_POSITION wxPoint(10, 10)
-#define ID_STATUSBAR 10001
-#define ID_PANEL 10002
-#define ID_MENUITEM1 10008
-#define ID_MENU 10006
-#define ID_MENUITEM 10007
-#define ID_MENUITEM2 10009
-#define ID_MENUITEM_SAVE 10010
-#define ID_MENUITEM_SAVE_AS 10011
-#define ID_MENUITEM_LOAD 10012
-#define ID_TOOLBAR 10004
-#define ID_PANEL 10002
-#define ID_SIMULATION_PANEL 10019
-#define ID_OBJECTS_TREE_PANEL 10020
-#define ID_PANEL7 10024
-#define ID_TOOLBAR2 10025
-//#define ID_MENUITEM_CREATE_RAGDOLL 10023
-#define ID_MENUITEM_NEW_PROJECT 10027
-#define ID_MENUITEM_LOAD_PROJECT 10028
-#define ID_MENUITEM_EXIT 10029
-#define ID_TOOL_SAVE 10032
-#define ID_TOOL_IMPORT 10033
-#define ID_TOOL_EXPORT 10034
-#define ID_TOOL_MOVE 10035
-#define ID_TOOL_ROTATE 10036
-#define ID_TOOL_MOVE_BODY 10037
-#define ID_TOOL_ROTATE_BODY 10038
-#define ID_TOOL_CREATE_CHAR 10039
-#define ID_TOOL_ATTACH_BOX_COLLIDER 10040
-#define ID_TOOL_ATTACH_CILINDER_COLLIDER 10041
-#define ID_TOOL_ATTACH_SPHERE_COLLIDER 10042
-#define ID_TOOL_ANIMATION 10043
-#define ID_TOOL_FORCE 10044
-#define ID_TOOL_CONTROLLER 10045
-#define ID_TOOL_CAMERA 10045
-#define ID_MENUITEM_DRAW_WIREFRAME 10046
-#define ID_MENUITEM_SHOW_COLLIDERS 10047
-#define ID_MENUITEM_SHOW_BONES 10048
-#define ID_MENUITEM_SHOW_JOINTS 10049
-#define ID_MENUITEM_SHOW_BODIES 10050
-#define ID_MENUITEM_SHOW_CHARACTERS 10051
-#define ID_TOOL_ATTACH_CAPSULE_COLLIDER 10052
-////@end control identifiers
-
-/*!
-* Compatibility
-*/
-
-#ifndef wxCLOSE_BOX
-#define wxCLOSE_BOX 0x1000
-#endif
-
-
-struct iEditorObjectsInfo;
-class iaMainFrame;
-class iaObjectTree;
-class ObjectToolbarGUI;
-class iaSimulationPanel;
-
-/*!
-* iaMainFrame class declaration
-*/
-
-class iaMainFrame : public wxFrame, public iaObjectsManager, public iaBaseObjectListener
-{
- DECLARE_CLASS( iaMainFrame )
-
-public:
-
- wxAuiManager aui_mgr;
- wxPanel *pnl_3dview;
- wxBoxSizer *bxSz3Dview;
- iaObjectTree *objtree;
- iaSimulationPanel *sim_panel;
-
- wxMenu *itemMenuAttach;
- wxMenu *itemMenuEdit;
-
- wxPanel *pnl_controler;
- wxPanel *pnl_tlb;
- wxToolBar * tlb_bottom;
-
- iaMainFrame ();
- ~iaMainFrame ();
- //iaMainFrame(iaDataSubject *data,iaCSApplication *csApp,wxWindow* parent, wxWindowID id = SYMBOL_IAMAINFRAME_IDNAME, const wxString& caption = SYMBOL_IAMAINFRAME_TITLE, const wxPoint& pos = SYMBOL_IAMAINFRAME_POSITION, const wxSize& size = SYMBOL_IAMAINFRAME_SIZE, long style = SYMBOL_IAMAINFRAME_STYLE );
- iaMainFrame (iEditorCentralInfo* info,wxWindow *parent, const wxWindowID id,
- const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
-
- bool Create (wxWindow* parent, wxWindowID id = SYMBOL_IAMAINFRAME_IDNAME,
- const wxString& caption = SYMBOL_IAMAINFRAME_TITLE,
- const wxPoint& pos = SYMBOL_IAMAINFRAME_POSITION,
- const wxSize& size = SYMBOL_IAMAINFRAME_SIZE, long style = SYMBOL_IAMAINFRAME_STYLE );
-
- /// Creates the controls and sizers
- bool CreateControls();
- void UpdatePane (wxWindow *wnd);
-
- wxBitmap GetBitmapResource (const wxString& name );
- wxIcon GetIconResource (const wxString& name );
- /// Should we show tooltips?
- static bool ShowToolTips ();
-
- //events
- //void OnMouse ( wxMouseEvent& event );
- void OnAttachScriptedControllerMenuItem (wxCommandEvent& event);
- void OnAttachJointMenuItem (wxCommandEvent& event);
- void OnAttachBodyMenuItem (wxCommandEvent& event);
- void OnAttachSphereColliderMenuItem (wxCommandEvent& event);
- void OnAttachCapsuleColliderMenuItem (wxCommandEvent& event);
- void OnAttachBoxColliderMenuItem (wxCommandEvent& event);
-
- void OnSize (wxSizeEvent& event);
-
- void OnSaveAsMenuItem (wxCommandEvent& event);
- void OnSaveMenuItem (wxCommandEvent& event);
- void OnLoadMenuItem (wxCommandEvent& event);
- //void OnCreateRagdollMenuItem (wxCommandEvent& event);
- void OnNewProjectMenuItem (wxCommandEvent& event);
- void OnLoadProjectMenuItem (wxCommandEvent& event);
- void OnExitMenuItem (wxCommandEvent& event);
- void OnDelete (wxCommandEvent& event);
- void OnSortByType (wxCommandEvent& event);
- void OnDrawWireFrame (wxCommandEvent& event);
- void OnShowColliders (wxCommandEvent& event);
- void OnShowJoints (wxCommandEvent& event);
- void OnShowBones (wxCommandEvent& event);
- void OnShowBodies (wxCommandEvent& event);
- void OnShowCharacters (wxCommandEvent& event);
-
- void ObjectSelected (iEditorObject *obj);
- void ObjectRemoved (iEditorObject *obj);
- void ObjectAdded (iEditorObject *obj);
- void ObjectChanged (iEditorObject *obj, iEditorObjectProperty* prop);
-
- DECLARE_EVENT_TABLE()
-};
-
-
-#endif
-// _IA_MAINFRAME_H_
-
+/*
+Copyright (C) 2005 - 2007 by Piotr Obrzut and Valentin Vit
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with this library; if not, write to the Free
+Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+
+#ifndef _IA_MAINFRAME_H_
+#define _IA_MAINFRAME_H_
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "ia_mainframe.h"
+#endif
+
+
+#include <wx/statusbr.h>
+#include <wx/laywin.h>
+#include <wx/intl.h>
+
+#include "editor.h"
+#include "iaObjectsManager.h"
+#include "ia-tool/iaBaseObjectListener.h"
+#include <wx/aui/aui.h>
+
+#define SYMBOL_IAMAINFRAME_STYLE wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE | wxHSCROLL | wxVSCROLL
+#define SYMBOL_IAMAINFRAME_TITLE _("iaMainFrame")
+#define SYMBOL_IAMAINFRAME_IDNAME ID_FRAME
+#define SYMBOL_IAMAINFRAME_SIZE wxSize(300, 300)
+#define SYMBOL_IAMAINFRAME_POSITION wxPoint(10, 10)
+
+enum iaEMainFrameControlIds
+{
+ ID_FRAME = 10000,
+ ID_STATUSBAR,
+ ID_PANEL,
+ ID_MENUITEM1,
+ ID_MENU,
+ ID_MENUITEM,
+ ID_MENUITEM2,
+ ID_MENUITEM_SAVE,
+ ID_MENUITEM_SAVE_AS,
+ ID_MENUITEM_LOAD,
+ ID_TOOLBAR,
+ ID_SIMULATION_PANEL,
+ ID_OBJECTS_TREE_PANEL,
+ ID_PANEL7,
+ ID_TOOLBAR2,
+ ID_MENUITEM_NEW_PROJECT,
+ ID_MENUITEM_LOAD_PROJECT,
+ ID_MENUITEM_EXIT,
+ ID_TOOL_SAVE,
+ ID_TOOL_IMPORT,
+ ID_TOOL_EXPORT,
+ ID_TOOL_MOVE,
+ ID_TOOL_ROTATE,
+ ID_TOOL_MOVE_BODY,
+ ID_TOOL_ROTATE_BODY,
+ ID_TOOL_CREATE_CHAR,
+ ID_TOOL_ATTACH_BOX_COLLIDER,
+ ID_TOOL_ATTACH_CILINDER_COLLIDER,
+ ID_TOOL_ATTACH_SPHERE_COLLIDER,
+ ID_TOOL_ANIMATION,
+ ID_TOOL_FORCE,
+ ID_TOOL_CONTROLLER,
+ ID_TOOL_CAMERA,
+ ID_MENUITEM_DRAW_WIREFRAME,
+ ID_MENUITEM_SHOW_COLLIDERS,
+ ID_MENUITEM_SHOW_BONES,
+ ID_MENUITEM_SHOW_JOINTS,
+ ID_MENUITEM_SHOW_BODIES,
+ ID_MENUITEM_SHOW_CHARACTERS,
+ ID_TOOL_ATTACH_CAPSULE_COLLIDER
+};
+
+/*!
+* Compatibility
+*/
+
+#ifndef wxCLOSE_BOX
+#define wxCLOSE_BOX 0x1000
+#endif
+
+
+struct iEditorObjectsInfo;
+class iaMainFrame;
+class iaObjectTree;
+class ObjectToolbarGUI;
+class iaSimulationPanel;
+
+/*!
+* iaMainFrame class declaration
+*/
+
+class iaMainFrame : public wxFrame, public iaObjectsManager, public iaBaseObjectListener
+{
+ DECLARE_CLASS( iaMainFrame )
+
+public:
+
+ wxAuiManager aui_mgr;
+ wxPanel *pnl_3dview;
+ wxBoxSizer *bxSz3Dview;
+ iaObjectTree *objtree;
+ iaSimulationPanel *sim_panel;
+
+ wxMenu *itemMenuAttach;
+ wxMenu *itemMenuEdit;
+
+ wxPanel *pnl_controler;
+ wxPanel *pnl_tlb;
+ wxToolBar * tlb_bottom;
+
+ iaMainFrame ();
+ ~iaMainFrame ();
+ //iaMainFrame(iaDataSubject *data,iaCSApplication *csApp,wxWindow* parent, wxWindowID id = SYMBOL_IAMAINFRAME_IDNAME, const wxString& caption = SYMBOL_IAMAINFRAME_TITLE, const wxPoint& pos = SYMBOL_IAMAINFRAME_POSITION, const wxSize& size = SYMBOL_IAMAINFRAME_SIZE, long style = SYMBOL_IAMAINFRAME_STYLE );
+ iaMainFrame (iEditorCentralInfo* info,wxWindow *parent, const wxWindowID id,
+ const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
+
+ bool Create (wxWindow* parent, wxWindowID id = SYMBOL_IAMAINFRAME_IDNAME,
+ const wxString& caption = SYMBOL_IAMAINFRAME_TITLE,
+ const wxPoint& pos = SYMBOL_IAMAINFRAME_POSITION,
+ const wxSize& size = SYMBOL_IAMAINFRAME_SIZE, long style = SYMBOL_IAMAINFRAME_STYLE );
+
+ /// Creates the controls and sizers
+ bool CreateControls();
+ void UpdatePane (wxWindow *wnd);
+
+ wxBitmap GetBitmapResource (const wxString& name );
+ wxIcon GetIconResource (const wxString& name );
+ /// Should we show tooltips?
+ static bool ShowToolTips ();
+
+ //events
+ //void OnMouse ( wxMouseEvent& event );
+ void OnAttachScriptedControllerMenuItem (wxCommandEvent& event);
+ void OnAttachJointMenuItem (wxCommandEvent& event);
+ void OnAttachBodyMenuItem (wxCommandEvent& event);
+ void OnAttachSphereColliderMenuItem (wxCommandEvent& event);
+ void OnAttachCapsuleColliderMenuItem (wxCommandEvent& event);
+ void OnAttachBoxColliderMenuItem (wxCommandEvent& event);
+
+ void OnSize (wxSizeEvent& event);
+
+ void OnSaveAsMenuItem (wxCommandEvent& event);
+ void OnSaveMenuItem (wxCommandEvent& event);
+ void OnLoadMenuItem (wxCommandEvent& event);
+ //void OnCreateRagdollMenuItem (wxCommandEvent& event);
+ void OnNewProjectMenuItem (wxCommandEvent& event);
+ void OnLoadProjectMenuItem (wxCommandEvent& event);
+ void OnExitMenuItem (wxCommandEvent& event);
+ void OnDelete (wxCommandEvent& event);
+ void OnSortByType (wxCommandEvent& event);
+ void OnDrawWireFrame (wxCommandEvent& event);
+ void OnShowColliders (wxCommandEvent& event);
+ void OnShowJoints (wxCommandEvent& event);
+ void OnShowBones (wxCommandEvent& event);
+ void OnShowBodies (wxCommandEvent& event);
+ void OnShowCharacters (wxCommandEvent& event);
+
+ void ObjectSelected (iEditorObject *obj);
+ void ObjectRemoved (iEditorObject *obj);
+ void ObjectAdded (iEditorObject *obj);
+ void ObjectChanged (iEditorObject *obj, iEditorObjectProperty* prop);
+
+ DECLARE_EVENT_TABLE()
+};
+
+
+#endif
+// _IA_MAINFRAME_H_
+
Modified: branches/release/V0.2/src/apps/editor/gui/widgets/iaObjectTree.h
===================================================================
--- branches/release/V0.2/src/apps/editor/gui/widgets/iaObjectTree.h 2007-10-08 12:30:21 UTC (rev 345)
+++ branches/release/V0.2/src/apps/editor/gui/widgets/iaObjectTree.h 2007-10-08 12:38:05 UTC (rev 346)
@@ -135,4 +135,3 @@
};
-
Modified: branches/release/V0.2/src/apps/editor/gui/widgets/iaObjectsManager.h
===================================================================
--- branches/release/V0.2/src/apps/editor/gui/widgets/iaObjectsManager.h 2007-10-08 12:30:21 UTC (rev 345)
+++ branches/release/V0.2/src/apps/editor/gui/widgets/iaObjectsManager.h 2007-10-08 12:38:05 UTC (rev 346)
@@ -1,144 +1,145 @@
-/*
-Copyright (C) 2007 by Piotr Obrzut
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-
-
-#ifndef _IA_OBJ_MANAGER_H_
-#define _IA_OBJ_MANAGER_H_
-
-
-#include <wx/statusbr.h>
-#include <wx/laywin.h>
-#include <wx/intl.h>
-
-#include "editor.h"
-
-////@begin control identifiers
-#define IA_MENUITEM_ATTACH_BODY 0
-#define IA_MENUITEM_ATTACH_JOINT 2
-#define IA_MENUITEM_ATTACH_SPHERE_COLLIDER 3
-#define IA_MENUITEM_ATTACH_BOX_COLLIDER 4
-#define IA_MENUITEM_DELETE 5
-#define ID_MENUITEM_SORT_BY_TYPE 6
-#define IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER 7
-#define IA_MENUITEM_ATTACH_CAPSULE_COLLIDER 8
-#define IA_MENUITEM_HIDE 9
-#define IA_MENUITEM_SHOW 10
-#define IA_MENUITEM_GROUP 11
-#define IA_MENUITEM_SAVE_ANIMATION 12
-////@end control identifiers
-
-/*!
-* Compatibility
-*/
-
-#ifndef wxCLOSE_BOX
-#define wxCLOSE_BOX 0x1000
-#endif
-
-
-struct iEditorObjectsInfo;
-class iaMainFrame;
-class iaObjectTree;
-class ObjectToolbarGUI;
-//class wxFrameManager;
-
-#include <wx/filedlg.h>
-#include <iScriptController.h>
-#include "iPcDynamicsSystem.h"
-#include "iPcCharacter.h"
-
-class iaObjectsManager : public iEditorObjectsListener
-{
-protected:
-
- iEditorCentralInfo *central_info;
-
-public:
-
- iaObjectsManager () : central_info (0) {;}
-
- void OnSaveAnimation (wxWindow *parent)
- {
- wxFileDialog ofd (parent, _T ("Export character animation"),
- wxString (central_info->GetProjectPath ().c_str (), wxConvUTF8), _T(""), _T("*.*"), wxSAVE);
- if (ofd.ShowModal () == wxID_OK)
- {
- csRef<iPcCharacter> character = scfQueryInterface <iPcCharacter> (
- central_info->GetObjectsInfo ()->GetSelectedObject (0));
-
- central_info->GetObjectsInfo ()->ExportAnimation (character,
- character->GetOutputAnimation (),
- ofd.GetDirectory ().mb_str (),
- ofd.GetFilename ().mb_str ());
- }
- }
- void OnAttachScriptedController (wxWindow *parent)
- {
- wxFileDialog ofd (parent, _T ("Select script file"),
- wxString (central_info->GetProjectPath ().c_str (), wxConvUTF8), _T (""), _T ("*.iascr"), wxOPEN);
- if (ofd.ShowModal () == wxID_OK)
- {
- iEditorObject *obj = central_info->GetObjectsInfo ()->CreateScriptController ();
- csRef<iScriptController> pccontroller =
- scfQueryInterface<iScriptController> (obj);
- central_info->GetObjectsInfo ()->GetSelectedObject (0)->AttachObject (obj);
- pccontroller->ParseRealPath (ofd.GetPath ().mb_str ());
- }
- }
- void OnGroup ()
- {
- central_info->GetSimulator ()->GroupSelectedBodies ();
- }
- void OnAttachJoint ()
- {
- iEditorObject *obj = central_info->GetObjectsInfo ()->CreateJoint ();
- central_info->GetObjectsInfo ()->GetSelectedObject (0)->AttachObject (obj);
- }
- void OnAttachBody ()
- {
- iEditorObject *obj = central_info->GetObjectsInfo ()->CreateBody ();
- central_info->GetObjectsInfo ()->GetSelectedObject (0)->AttachObject (obj);
- }
- void OnAttachSphereCollider ()
- {
- iEditorObject *obj = central_info->Ge...
[truncated message content] |
|
From: <ob...@us...> - 2007-10-08 12:30:18
|
Revision: 345
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=345&view=rev
Author: obi666
Date: 2007-10-08 05:30:21 -0700 (Mon, 08 Oct 2007)
Log Message:
-----------
- Cleaned widgets controls ids
- Fixed several compile bugs leftover after previous commit
Modified Paths:
--------------
trunk/msvc/8/appiaeditor.vcproj
trunk/src/apps/editor/gui/widgets/iaMainFrame.h
trunk/src/apps/editor/gui/widgets/iaObjectsManager.h
trunk/src/apps/editor/gui/widgets/iaSimulationPanel.h
Modified: trunk/msvc/8/appiaeditor.vcproj
===================================================================
--- trunk/msvc/8/appiaeditor.vcproj 2007-10-08 11:59:58 UTC (rev 344)
+++ trunk/msvc/8/appiaeditor.vcproj 2007-10-08 12:30:21 UTC (rev 345)
@@ -236,7 +236,7 @@
>
</File>
<File
- RelativePath="..\..\src\apps\editor\gui\iaMainFrame.cpp"
+ RelativePath="..\..\src\apps\editor\gui\widgets\iaMainFrame.cpp"
>
</File>
<File
@@ -296,15 +296,15 @@
>
</File>
<File
- RelativePath="..\..\src\apps\editor\gui\widgets\ia_propgrid.h"
+ RelativePath="..\..\src\apps\editor\iaCSApplication.h"
>
</File>
<File
- RelativePath="..\..\src\apps\editor\iaCSApplication.h"
+ RelativePath="..\..\src\apps\editor\gui\widgets\iaMainFrame.h"
>
</File>
<File
- RelativePath="..\..\src\apps\editor\gui\iaMainFrame.h"
+ RelativePath="..\..\src\apps\editor\gui\widgets\iaObjectsManager.h"
>
</File>
<File
Modified: trunk/src/apps/editor/gui/widgets/iaMainFrame.h
===================================================================
--- trunk/src/apps/editor/gui/widgets/iaMainFrame.h 2007-10-08 11:59:58 UTC (rev 344)
+++ trunk/src/apps/editor/gui/widgets/iaMainFrame.h 2007-10-08 12:30:21 UTC (rev 345)
@@ -34,58 +34,56 @@
#include "ia-tool/iaBaseObjectListener.h"
#include <wx/aui/aui.h>
-
-
-////@begin control identifiers
-#define ID_FRAME 10000
#define SYMBOL_IAMAINFRAME_STYLE wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE | wxHSCROLL | wxVSCROLL
#define SYMBOL_IAMAINFRAME_TITLE _("iaMainFrame")
#define SYMBOL_IAMAINFRAME_IDNAME ID_FRAME
#define SYMBOL_IAMAINFRAME_SIZE wxSize(300, 300)
#define SYMBOL_IAMAINFRAME_POSITION wxPoint(10, 10)
-#define ID_STATUSBAR 10001
-#define ID_PANEL 10002
-#define ID_MENUITEM1 10008
-#define ID_MENU 10006
-#define ID_MENUITEM 10007
-#define ID_MENUITEM2 10009
-#define ID_MENUITEM_SAVE 10010
-#define ID_MENUITEM_SAVE_AS 10011
-#define ID_MENUITEM_LOAD 10012
-#define ID_TOOLBAR 10004
-#define ID_PANEL 10002
-#define ID_SIMULATION_PANEL 10019
-#define ID_OBJECTS_TREE_PANEL 10020
-#define ID_PANEL7 10024
-#define ID_TOOLBAR2 10025
-//#define ID_MENUITEM_CREATE_RAGDOLL 10023
-#define ID_MENUITEM_NEW_PROJECT 10027
-#define ID_MENUITEM_LOAD_PROJECT 10028
-#define ID_MENUITEM_EXIT 10029
-#define ID_TOOL_SAVE 10032
-#define ID_TOOL_IMPORT 10033
-#define ID_TOOL_EXPORT 10034
-#define ID_TOOL_MOVE 10035
-#define ID_TOOL_ROTATE 10036
-#define ID_TOOL_MOVE_BODY 10037
-#define ID_TOOL_ROTATE_BODY 10038
-#define ID_TOOL_CREATE_CHAR 10039
-#define ID_TOOL_ATTACH_BOX_COLLIDER 10040
-#define ID_TOOL_ATTACH_CILINDER_COLLIDER 10041
-#define ID_TOOL_ATTACH_SPHERE_COLLIDER 10042
-#define ID_TOOL_ANIMATION 10043
-#define ID_TOOL_FORCE 10044
-#define ID_TOOL_CONTROLLER 10045
-#define ID_TOOL_CAMERA 10045
-#define ID_MENUITEM_DRAW_WIREFRAME 10046
-#define ID_MENUITEM_SHOW_COLLIDERS 10047
-#define ID_MENUITEM_SHOW_BONES 10048
-#define ID_MENUITEM_SHOW_JOINTS 10049
-#define ID_MENUITEM_SHOW_BODIES 10050
-#define ID_MENUITEM_SHOW_CHARACTERS 10051
-#define ID_TOOL_ATTACH_CAPSULE_COLLIDER 10052
-////@end control identifiers
+enum iaEMainFrameControlIds
+{
+ ID_FRAME = 10000,
+ ID_STATUSBAR,
+ ID_PANEL,
+ ID_MENUITEM1,
+ ID_MENU,
+ ID_MENUITEM,
+ ID_MENUITEM2,
+ ID_MENUITEM_SAVE,
+ ID_MENUITEM_SAVE_AS,
+ ID_MENUITEM_LOAD,
+ ID_TOOLBAR,
+ ID_SIMULATION_PANEL,
+ ID_OBJECTS_TREE_PANEL,
+ ID_PANEL7,
+ ID_TOOLBAR2,
+ ID_MENUITEM_NEW_PROJECT,
+ ID_MENUITEM_LOAD_PROJECT,
+ ID_MENUITEM_EXIT,
+ ID_TOOL_SAVE,
+ ID_TOOL_IMPORT,
+ ID_TOOL_EXPORT,
+ ID_TOOL_MOVE,
+ ID_TOOL_ROTATE,
+ ID_TOOL_MOVE_BODY,
+ ID_TOOL_ROTATE_BODY,
+ ID_TOOL_CREATE_CHAR,
+ ID_TOOL_ATTACH_BOX_COLLIDER,
+ ID_TOOL_ATTACH_CILINDER_COLLIDER,
+ ID_TOOL_ATTACH_SPHERE_COLLIDER,
+ ID_TOOL_ANIMATION,
+ ID_TOOL_FORCE,
+ ID_TOOL_CONTROLLER,
+ ID_TOOL_CAMERA,
+ ID_MENUITEM_DRAW_WIREFRAME,
+ ID_MENUITEM_SHOW_COLLIDERS,
+ ID_MENUITEM_SHOW_BONES,
+ ID_MENUITEM_SHOW_JOINTS,
+ ID_MENUITEM_SHOW_BODIES,
+ ID_MENUITEM_SHOW_CHARACTERS,
+ ID_TOOL_ATTACH_CAPSULE_COLLIDER
+};
+
/*!
* Compatibility
*/
Modified: trunk/src/apps/editor/gui/widgets/iaObjectsManager.h
===================================================================
--- trunk/src/apps/editor/gui/widgets/iaObjectsManager.h 2007-10-08 11:59:58 UTC (rev 344)
+++ trunk/src/apps/editor/gui/widgets/iaObjectsManager.h 2007-10-08 12:30:21 UTC (rev 345)
@@ -27,20 +27,21 @@
#include "editor.h"
-////@begin control identifiers
-#define IA_MENUITEM_ATTACH_BODY 0
-#define IA_MENUITEM_ATTACH_JOINT 2
-#define IA_MENUITEM_ATTACH_SPHERE_COLLIDER 3
-#define IA_MENUITEM_ATTACH_BOX_COLLIDER 4
-#define IA_MENUITEM_DELETE 5
-#define ID_MENUITEM_SORT_BY_TYPE 6
-#define IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER 7
-#define IA_MENUITEM_ATTACH_CAPSULE_COLLIDER 8
-#define IA_MENUITEM_HIDE 9
-#define IA_MENUITEM_SHOW 10
-#define IA_MENUITEM_GROUP 11
-#define IA_MENUITEM_SAVE_ANIMATION 12
-////@end control identifiers
+enum iaMenuItems
+{
+ IA_MENUITEM_ATTACH_BODY = 0,
+ IA_MENUITEM_ATTACH_JOINT,
+ IA_MENUITEM_ATTACH_SPHERE_COLLIDER,
+ IA_MENUITEM_ATTACH_BOX_COLLIDER,
+ IA_MENUITEM_DELETE,
+ ID_MENUITEM_SORT_BY_TYPE,
+ IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER,
+ IA_MENUITEM_ATTACH_CAPSULE_COLLIDER,
+ IA_MENUITEM_HIDE,
+ IA_MENUITEM_SHOW,
+ IA_MENUITEM_GROUP,
+ IA_MENUITEM_SAVE_ANIMATION
+};
/*!
* Compatibility
Modified: trunk/src/apps/editor/gui/widgets/iaSimulationPanel.h
===================================================================
--- trunk/src/apps/editor/gui/widgets/iaSimulationPanel.h 2007-10-08 11:59:58 UTC (rev 344)
+++ trunk/src/apps/editor/gui/widgets/iaSimulationPanel.h 2007-10-08 12:30:21 UTC (rev 345)
@@ -1,105 +1,105 @@
-/*
- Copyright (C) 2007 by Piotr Obrzut
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*/
-#ifndef _IA_SIMULATION_PANEL_H_
-#define _IA_SIMULATION_PANEL_H_
-
-#include <wx/wxprec.h>
-#include <wx/wx.h>
-#include <wx/math.h>
-#include <wx/aui/aui.h>
-#include "../iaMainFrame.h"
-#include "editor.h"
-
-#define ID_TIME_LINE_PANEL 10022
-#define ID_BUTTONS_PANEL 10023
-#define ID_PLAY_BUTTON 10024
-#define ID_SIMULATE_BUTTON 10025
-#define ID_STEP_FORWARD 10026
-#define ID_LAST_FRAME 10027
-#define ID_FIRST_FRAME 10028
-#define ID_STEP_BACKWARD 10029
-#define ID_PLAY_BACKWARD 10030
-#define ID_TRACKS_CTRL 10031
-
-class iaTimeLineCtrl;
-class iaSimulationTracksCtrl;
-
-class iaSimulationPanel : public wxPanel
-{
-public:
-
- iaSimulationPanel () {};
- iaSimulationPanel (iEditorCentralInfo *central_info, iaMainFrame* parent, wxWindowID id,
- const wxPoint& pos, const wxSize& size, long style);
-
- virtual ~iaSimulationPanel()
- {
- };
-
- void CreateControls ();
- iaTimeLineCtrl *GetTimeLineCtrl () {return time_line_ctrl;}
-
- //events
- void OnLastFrameClick (wxCommandEvent& event);
- void OnStartSimulationClick (wxCommandEvent& event);
- void OnPlayClick (wxCommandEvent& event);
- void OnStepForwardClick (wxCommandEvent& event);
- void OnFirstFrameClick (wxCommandEvent& event);
- void OnPlayBackwardClick (wxCommandEvent& event);
- void OnStepBackwardClick (wxCommandEvent& event);
- void OnSize (wxSizeEvent& event);
-
+/*
+ Copyright (C) 2007 by Piotr Obrzut
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+#ifndef _IA_SIMULATION_PANEL_H_
+#define _IA_SIMULATION_PANEL_H_
+
+#include <wx/wxprec.h>
+#include <wx/wx.h>
+#include <wx/math.h>
+#include <wx/aui/aui.h>
+#include "iaMainFrame.h"
+#include "editor.h"
+
+#define ID_TIME_LINE_PANEL 10022
+#define ID_BUTTONS_PANEL 10023
+#define ID_PLAY_BUTTON 10024
+#define ID_SIMULATE_BUTTON 10025
+#define ID_STEP_FORWARD 10026
+#define ID_LAST_FRAME 10027
+#define ID_FIRST_FRAME 10028
+#define ID_STEP_BACKWARD 10029
+#define ID_PLAY_BACKWARD 10030
+#define ID_TRACKS_CTRL 10031
+
+class iaTimeLineCtrl;
+class iaSimulationTracksCtrl;
+
+class iaSimulationPanel : public wxPanel
+{
+public:
+
+ iaSimulationPanel () {};
+ iaSimulationPanel (iEditorCentralInfo *central_info, iaMainFrame* parent, wxWindowID id,
+ const wxPoint& pos, const wxSize& size, long style);
+
+ virtual ~iaSimulationPanel()
+ {
+ };
+
+ void CreateControls ();
+ iaTimeLineCtrl *GetTimeLineCtrl () {return time_line_ctrl;}
+
+ //events
+ void OnLastFrameClick (wxCommandEvent& event);
+ void OnStartSimulationClick (wxCommandEvent& event);
+ void OnPlayClick (wxCommandEvent& event);
+ void OnStepForwardClick (wxCommandEvent& event);
+ void OnFirstFrameClick (wxCommandEvent& event);
+ void OnPlayBackwardClick (wxCommandEvent& event);
+ void OnStepBackwardClick (wxCommandEvent& event);
+ void OnSize (wxSizeEvent& event);
+
/// singleton instance access
- static iaSimulationPanel* instance () {return m_pInstance;}
-
- DECLARE_DYNAMIC_CLASS(iaSimulationPanel)
-
-private:
-
- iaTimeLineCtrl *time_line_ctrl;
- iaSimulationTracksCtrl *tracks_ctrl;
- iEditorCentralInfo *central_info;
- iaMainFrame *parent;
- static iaSimulationPanel *m_pInstance;
-
- //Buttons
- wxBitmapButton *item_bitmap_button_step_forward;
- wxBitmapButton *item_bitmap_button_last_frame;
- wxBitmapButton *item_bitmap_button_simulate;
- wxBitmapButton *item_bitmap_button_play;
- wxBitmapButton *item_bitmap_button_step_backward;
- wxBitmapButton *item_bitmap_button_first_frame;
- wxBitmapButton *item_bitmap_button_play_backward;
- //Buttons bitmaps
- wxBitmap item_bitmap_simulate;
- wxBitmap item_bitmap_play;
- wxBitmap item_bitmap_stop;
- wxBitmap item_bitmap_step_forward;
- wxBitmap item_bitmap_last_frame;
- wxBitmap item_bitmap_play_backward;
- wxBitmap item_bitmap_step_backward;
- wxBitmap item_bitmap_first_frame;
- //pressed flags
- bool play_forward_pressed;
- bool play_backward_pressed;
- bool simulate_pressed;
-
- DECLARE_EVENT_TABLE()
-};
-#endif // _IA_SIMULATION_PANEL_H_
-
+ static iaSimulationPanel* instance () {return m_pInstance;}
+
+ DECLARE_DYNAMIC_CLASS(iaSimulationPanel)
+
+private:
+
+ iaTimeLineCtrl *time_line_ctrl;
+ iaSimulationTracksCtrl *tracks_ctrl;
+ iEditorCentralInfo *central_info;
+ iaMainFrame *parent;
+ static iaSimulationPanel *m_pInstance;
+
+ //Buttons
+ wxBitmapButton *item_bitmap_button_step_forward;
+ wxBitmapButton *item_bitmap_button_last_frame;
+ wxBitmapButton *item_bitmap_button_simulate;
+ wxBitmapButton *item_bitmap_button_play;
+ wxBitmapButton *item_bitmap_button_step_backward;
+ wxBitmapButton *item_bitmap_button_first_frame;
+ wxBitmapButton *item_bitmap_button_play_backward;
+ //Buttons bitmaps
+ wxBitmap item_bitmap_simulate;
+ wxBitmap item_bitmap_play;
+ wxBitmap item_bitmap_stop;
+ wxBitmap item_bitmap_step_forward;
+ wxBitmap item_bitmap_last_frame;
+ wxBitmap item_bitmap_play_backward;
+ wxBitmap item_bitmap_step_backward;
+ wxBitmap item_bitmap_first_frame;
+ //pressed flags
+ bool play_forward_pressed;
+ bool play_backward_pressed;
+ bool simulate_pressed;
+
+ DECLARE_EVENT_TABLE()
+};
+#endif // _IA_SIMULATION_PANEL_H_
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ob...@us...> - 2007-10-08 11:59:54
|
Revision: 344
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=344&view=rev
Author: obi666
Date: 2007-10-08 04:59:58 -0700 (Mon, 08 Oct 2007)
Log Message:
-----------
Applied r343 from trunk.
Modified Paths:
--------------
branches/release/V0.2/src/apps/editor/application.cpp
branches/release/V0.2/src/apps/editor/gui/widgets/iaObjectTree.h
branches/release/V0.2/src/apps/editor/iaCSApplication.cpp
Added Paths:
-----------
branches/release/V0.2/src/apps/editor/gui/widgets/iaMainFrame.cpp
branches/release/V0.2/src/apps/editor/gui/widgets/iaMainFrame.h
branches/release/V0.2/src/apps/editor/gui/widgets/iaObjectsManager.h
Removed Paths:
-------------
branches/release/V0.2/src/apps/editor/gui/iaMainFrame.cpp
branches/release/V0.2/src/apps/editor/gui/iaMainFrame.h
branches/release/V0.2/src/include/ia-tool/iaObjectsManager.h
Modified: branches/release/V0.2/src/apps/editor/application.cpp
===================================================================
--- branches/release/V0.2/src/apps/editor/application.cpp 2007-10-08 11:59:12 UTC (rev 343)
+++ branches/release/V0.2/src/apps/editor/application.cpp 2007-10-08 11:59:58 UTC (rev 344)
@@ -39,14 +39,8 @@
#include "windows.h"
#endif
-#include "iutil/vfs.h"
-#include "csutil/cscolor.h"
-#include "cstool/csview.h"
-#include "cstool/initapp.h"
-#include "csutil/syspath.h"
+#include "gui/widgets/iaMainFrame.h"
-#include "gui/iaMainFrame.h"
-
IMPLEMENT_APP(iaApplication)
iObjectRegistry * object_reg;
@@ -142,3 +136,4 @@
event.RequestMore();
}
+
Deleted: branches/release/V0.2/src/apps/editor/gui/iaMainFrame.cpp
===================================================================
--- branches/release/V0.2/src/apps/editor/gui/iaMainFrame.cpp 2007-10-08 11:59:12 UTC (rev 343)
+++ branches/release/V0.2/src/apps/editor/gui/iaMainFrame.cpp 2007-10-08 11:59:58 UTC (rev 344)
@@ -1,522 +0,0 @@
-/*
-Copyright (C) 2005 - 2007 by Piotr Obrzut and Valentin Vit
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free
-Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "ia_mainframe.h"
-#endif
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-////@begin includes
-#include <cssysdef.h>
-#include "../iaCSApplication.h"
-//#include "csutil/cscolor.h"
-//#include "cstool/csview.h"
-//#include "ivideo/graph3d.h"
-//#include "ivideo/graph2d.h"
-//#include "ivideo/wxwin.h"
-
-#include <wx/dc.h>
-#include <wx/filedlg.h>
-#include <wx/laywin.h>
-
-#include "widgets/iaObjectTree.h"
-#include "widgets/iaPropertyGrid.h"
-#include "widgets/iaPropertySheet.h"
-#include "widgets/iaSimulationPanel.h"
-#include <string>
-
-#include "editor.h"
-#include "iaMainFrame.h"
-
-IMPLEMENT_CLASS(iaMainFrame, wxFrame)
-/*!
-* iaMainFrame event table definition
-*/
-BEGIN_EVENT_TABLE(iaMainFrame, wxFrame)
-//EVT_LEFT_DOWN(iaMainFrame::OnMouse)
-//EVT_LEFT_DCLICK(iaMainFrame::OnMouse)
-
-EVT_SIZE(iaMainFrame::OnSize)
-
-EVT_MENU(IA_MENUITEM_ATTACH_BODY, iaMainFrame::OnAttachBodyMenuItem)
-EVT_MENU(IA_MENUITEM_ATTACH_SPHERE_COLLIDER, iaMainFrame::OnAttachSphereColliderMenuItem)
-EVT_MENU(IA_MENUITEM_ATTACH_BOX_COLLIDER, iaMainFrame::OnAttachBoxColliderMenuItem)
-EVT_MENU(IA_MENUITEM_ATTACH_CAPSULE_COLLIDER, iaMainFrame::OnAttachCapsuleColliderMenuItem)
-EVT_MENU(IA_MENUITEM_ATTACH_JOINT, iaMainFrame::OnAttachJointMenuItem)
-EVT_MENU(ID_MENUITEM_LOAD, iaMainFrame::OnLoadMenuItem)
-EVT_MENU(ID_MENUITEM_SAVE, iaMainFrame::OnSaveMenuItem)
-EVT_MENU(ID_MENUITEM_NEW_PROJECT, iaMainFrame::OnNewProjectMenuItem)
-EVT_MENU(ID_MENUITEM_LOAD_PROJECT, iaMainFrame::OnLoadProjectMenuItem)
-EVT_MENU(ID_MENUITEM_SAVE_AS, iaMainFrame::OnSaveAsMenuItem)
-EVT_MENU(ID_MENUITEM_EXIT, iaMainFrame::OnExitMenuItem)
-EVT_MENU(IA_MENUITEM_DELETE, iaMainFrame::OnDelete)
-EVT_MENU(IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER, iaMainFrame::OnAttachScriptedControllerMenuItem)
-EVT_MENU(ID_MENUITEM_DRAW_WIREFRAME, iaMainFrame::OnDrawWireFrame)
-EVT_MENU(ID_MENUITEM_SHOW_COLLIDERS, iaMainFrame::OnShowColliders)
-EVT_MENU(ID_MENUITEM_SHOW_JOINTS, iaMainFrame::OnShowJoints)
-EVT_MENU(ID_MENUITEM_SHOW_BONES, iaMainFrame::OnShowBones)
-EVT_MENU(ID_MENUITEM_SHOW_BODIES, iaMainFrame::OnShowBodies)
-EVT_MENU(ID_MENUITEM_SHOW_CHARACTERS, iaMainFrame::OnShowCharacters)
-
-EVT_TOOL(ID_TOOL_ATTACH_CAPSULE_COLLIDER, iaMainFrame::OnAttachCapsuleColliderMenuItem)
-EVT_TOOL(ID_TOOL_ATTACH_BOX_COLLIDER, iaMainFrame::OnAttachBoxColliderMenuItem)
-EVT_TOOL(ID_TOOL_ATTACH_SPHERE_COLLIDER, iaMainFrame::OnAttachSphereColliderMenuItem)
-EVT_TOOL(ID_TOOL_CONTROLLER, iaMainFrame::OnAttachScriptedControllerMenuItem)
-EVT_TOOL(ID_TOOL_SAVE, iaMainFrame::OnSaveMenuItem)
-EVT_TOOL(ID_TOOL_IMPORT, iaMainFrame::OnLoadProjectMenuItem)
-
-END_EVENT_TABLE()
-
-iaMainFrame *m_mainfrm;
-
-iaMainFrame::~iaMainFrame()
-{
- central_info->Get3dView ()->ShutDown ();
- aui_mgr.UnInit();
-}
-
-iaMainFrame::iaMainFrame()
-{
- m_mainfrm = this;
-}
-
-iaMainFrame::iaMainFrame(iEditorCentralInfo* info, wxWindow* parent,
- const wxWindowID id, const wxString& title, const wxPoint& pos,
- const wxSize& size, const long style)
-{
- central_info = info;
- m_mainfrm = this;
- central_info->GetObjectsInfo ()->AddListener ((iaBaseObjectListener*)this);
- SetMinSize(wxSize(400,300));
-}
-
-bool iaMainFrame::Create(wxWindow* parent, wxWindowID id, const wxString& caption,
- const wxPoint& pos, const wxSize& size, long style)
-{
- pnl_3dview = NULL;
- wxFrame::Create (parent, id, caption, pos, size, style);
-
- if (!CreateControls ())
- return false;
-
- pnl_3dview->SetFocus ();
-
- Centre ();
-
- return true;
-}
-
-void iaMainFrame::ObjectSelected (iEditorObject *obj)
-{
- bool can_delete = true;
- for (size_t i = 0; i < central_info->GetObjectsInfo ()->GetSelectedObjectsCount (); i++)
- {
- if (!central_info->GetObjectsInfo ()->GetSelectedObject (i)->CanBeDeleted ())
- can_delete = false;
- }
- itemMenuEdit->Enable (IA_MENUITEM_DELETE, can_delete);
-
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BODY, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BOX_COLLIDER, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_JOINT, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER, false);
-
- if (central_info->GetObjectsInfo ()->GetSelectedObjectsCount () == 1)
- {
- iEditorObject *obj = central_info->GetObjectsInfo ()->GetSelectedObject (0);
- if (obj->CanAttach (IA_OBJECT_TYPE_BODY))
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BODY, true);
- if (obj->CanAttach (IA_OBJECT_TYPE_COLLIDER))
- {
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, true);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BOX_COLLIDER, true);
- }
- if (obj->CanAttach (IA_OBJECT_TYPE_CONTROLLER))
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER, true);
-
- }else if(central_info->GetObjectsInfo ()->GetSelectedObjectsCount () == 2)
- {
- iEditorObject *obj1 = central_info->GetObjectsInfo ()->GetSelectedObject (0);
- iEditorObject *obj2 = central_info->GetObjectsInfo ()->GetSelectedObject (1);
- if (obj1->CanAttach (IA_OBJECT_TYPE_JOINT) && obj2->CanAttach (IA_OBJECT_TYPE_JOINT))
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_JOINT, true);
- }
-
-}
-void iaMainFrame::ObjectRemoved (iEditorObject *obj)
-{
-}
-void iaMainFrame::UpdatePane (wxWindow *wnd)
-{
- aui_mgr.GetPane (wnd).BestSize (wnd->GetSize ());
- aui_mgr.InsertPane (wnd, aui_mgr.GetPane (wnd), wxAUI_INSERT_DOCK);
- aui_mgr.Update ();
-}
-void iaMainFrame::ObjectAdded (iEditorObject *obj)
-{
-}
-void iaMainFrame::ObjectChanged (iEditorObject *obj, iEditorObjectProperty* prop)
-{
-}
-
-/*!
-* Control creation for ia_MainFrame
-*/
-bool iaMainFrame::CreateControls()
-{
- aui_mgr.SetManagedWindow (this);
-
- wxString icons_path = wxString (central_info->GetIconsPath ().c_str (), wxConvUTF8);
- if (icons_path.Cmp (_T("")) == 0)
- return false;
-
- //menu and statusbar
- iaMainFrame* itemFrame1 = this;
-
- wxMenuBar* menuBar = new wxMenuBar;
- wxMenu* itemMenu5 = new wxMenu;
- itemMenu5->Append (ID_MENUITEM_NEW_PROJECT, _("New Project...\tCTRL+N"), _T(""), wxITEM_NORMAL);
- itemMenu5->Append (ID_MENUITEM_LOAD_PROJECT, _("Load Project...\tCTRL+L"), _T(""), wxITEM_NORMAL);
- //itemMenu5->Append (ID_MENUITEM_LOAD, _("Load..."), _T(""), wxITEM_NORMAL);
- itemMenu5->Append (ID_MENUITEM_SAVE, _("Save Project\tCTRL+S"), _T(""), wxITEM_NORMAL);
- //itemMenu5->Append (ID_MENUITEM_SAVE_AS, _("Save As..."), _T(""), wxITEM_NORMAL);
- itemMenu5->Append(ID_MENUITEM_EXIT, _("Exit\tCTRL+X"), _T(""), wxITEM_NORMAL);
- menuBar->Append(itemMenu5, _("File"));
- itemMenuEdit = new wxMenu;
- itemMenuEdit->Append (IA_MENUITEM_DELETE, _("Delete\tDel"), _T(""), wxITEM_NORMAL);
- menuBar->Append(itemMenuEdit, _("Edit"));
- wxMenu* itemMenuView = new wxMenu;
- menuBar->Append(itemMenuView, _("View"));
- itemMenuView->Append (ID_MENUITEM_DRAW_WIREFRAME, _("Draw wireframe"), _T(""), wxITEM_CHECK);
- itemMenuView->Append (ID_MENUITEM_SHOW_BONES, _("Show Bones"), _T(""), wxITEM_CHECK);
- itemMenuView->Check (ID_MENUITEM_SHOW_BONES, true);
- itemMenuView->Append (ID_MENUITEM_SHOW_COLLIDERS, _("Show Colliders"), _T(""), wxITEM_CHECK);
- itemMenuView->Check (ID_MENUITEM_SHOW_COLLIDERS, true);
- itemMenuView->Append (ID_MENUITEM_SHOW_JOINTS, _("Show Joints"), _T(""), wxITEM_CHECK);
- itemMenuView->Check (ID_MENUITEM_SHOW_JOINTS, true);
- itemMenuView->Append (ID_MENUITEM_SHOW_BODIES, _("Show Bodies"), _T(""), wxITEM_CHECK);
- itemMenuView->Check (ID_MENUITEM_SHOW_BODIES, true);
- itemMenuView->Append (ID_MENUITEM_SHOW_CHARACTERS, _("Show Characters"), _T(""), wxITEM_CHECK);
- itemMenuView->Check (ID_MENUITEM_SHOW_CHARACTERS, true);
-
- itemMenuAttach = new wxMenu;
- itemMenuAttach->Append (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, _("Attach Sphere Collider..."),
- _T(""),wxITEM_NORMAL);
- itemMenuAttach->Append (IA_MENUITEM_ATTACH_BOX_COLLIDER, _("Attach Box Collider..."),
- _T(""),wxITEM_NORMAL);
- itemMenuAttach->Append (IA_MENUITEM_ATTACH_BODY, _("Attach Body...\tCTRL+B"), _T(""), wxITEM_NORMAL);
- itemMenuAttach->Append (IA_MENUITEM_ATTACH_JOINT, _("Attach Joint...\tCTRL+J"), _T(""), wxITEM_NORMAL);
- itemMenuAttach->Append (IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER,
- _("Attach Scripted Controler...\tCTRL+C"), _T(""), wxITEM_NORMAL);
- menuBar->Append (itemMenuAttach, _("Attach"));
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, false);
-
- wxMenu* itemMenu13 = new wxMenu;
- itemMenu13->Append (ID_MENUITEM2, _("About"), _T(""), wxITEM_NORMAL);
- menuBar->Append (itemMenu13, _("Help"));
- itemFrame1->SetMenuBar (menuBar);
-
- wxStatusBar* itemStatusBar2 = new wxStatusBar (itemFrame1, ID_STATUSBAR,
- wxST_SIZEGRIP | wxNO_BORDER);
- itemStatusBar2->SetFieldsCount (2);
- itemFrame1->SetStatusBar (itemStatusBar2);
- //end menu and statusbar
-
- //toolbar
- wxInitAllImageHandlers ();
- wxToolBar* tb1 = CreateToolBar (wxTB_FLAT | wxTB_HORIZONTAL, ID_TOOLBAR);
- tb1->SetToolBitmapSize (wxSize(32, 32));
-
- tb1->AddSeparator();
-
- wxBitmap itemtool2Bitmap (icons_path + _T("Icon_save.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool2BitmapDisabled (icons_path + _T("Icon_save_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_SAVE, _T(""), itemtool2Bitmap, itemtool2BitmapDisabled, wxITEM_NORMAL,
- _T(""), wxT("Save project"));
-
- wxBitmap itemtool3Bitmap (icons_path + _T("Icon_import.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool3BitmapDisabled (icons_path + _T("Icon_import_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_IMPORT, _T(""), itemtool3Bitmap, itemtool3BitmapDisabled, wxITEM_NORMAL,
- _T(""), wxT("Load Project"));
-
-#if 0
- wxBitmap itemtool4Bitmap (icons_path + _T("Icon_export.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool4BitmapDisabled (icons_path + _T ("Icon_export_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_EXPORT, _T(""), itemtool4Bitmap, itemtool4BitmapDisabled, wxITEM_NORMAL,
- _T(""), wxT("Export physics (currently not avaible)"));
-#endif
-
- tb1->AddSeparator();
-#if 0
- wxBitmap itemtool5Bitmap (icons_path + _T("Icon_move.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool5BitmapDisabled (icons_path + _T ("Icon_move_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_MOVE, _T(""), itemtool5Bitmap, itemtool5BitmapDisabled, wxITEM_NORMAL, _T(""),
- wxT("Move Object (currently not avaible)"));
-
- wxBitmap itemtool6Bitmap (icons_path + _T("Icon_rotate.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool6BitmapDisabled (icons_path + _T("Icon_rotate_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_ROTATE, _T(""), itemtool6Bitmap, itemtool6BitmapDisabled, wxITEM_NORMAL, _T(""),
- wxT("Rotate Object (currently not avaible)"));
-
- tb1->AddSeparator();
-
- wxBitmap itemtool7Bitmap (icons_path + _T ("Icon_movebody.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool7BitmapDisabled (icons_path + _T("Icon_movebody_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_MOVE_BODY, _T(""), itemtool7Bitmap, itemtool7BitmapDisabled,
- wxITEM_NORMAL, _T(""), wxT("Move rigid body (currently not avaible)"));
-
- wxBitmap itemtool8Bitmap (icons_path + _T("Icon_rotatebody.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool8BitmapDisabled (icons_path + _T("Icon_rotatebody_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_ROTATE_BODY, _T(""), itemtool8Bitmap, itemtool8BitmapDisabled, wxITEM_NORMAL,
- _T(""), wxT("Rotate rigid body (currently not avaible)"));
-
- tb1->AddSeparator();
-
- wxBitmap itemtool9Bitmap (icons_path + _T("Icon_rag.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool9BitmapDisabled (icons_path + _T("Icon_rag_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_CREATE_CHAR, _T(""), itemtool9Bitmap, itemtool9BitmapDisabled, wxITEM_NORMAL,
- _T(""), wxT("Create character from given model"));
-#endif
-
- wxBitmap itemtool10Bitmap (icons_path + _T("Icon_cube.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool10BitmapDisabled (icons_path + _T("Icon_cube_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_ATTACH_BOX_COLLIDER, _T(""), itemtool10Bitmap, itemtool10BitmapDisabled,
- wxITEM_NORMAL, _T(""), wxT("Attach box collider"));
-
- wxBitmap itemtool11Bitmap (icons_path + _T ("Icon_cilinder.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool11BitmapDisabled(icons_path + _T ("Icon_cilinder_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool(ID_TOOL_ATTACH_CAPSULE_COLLIDER, _T(""), itemtool11Bitmap, itemtool11BitmapDisabled,
- wxITEM_NORMAL, _T(""), wxT("Attach cilinder collider"));
-
- wxBitmap itemtool12Bitmap (icons_path + _T ("Icon_sphere.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool12BitmapDisabled (icons_path + _T("Icon_sphere_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_ATTACH_SPHERE_COLLIDER, _T(""), itemtool12Bitmap, itemtool12BitmapDisabled,
- wxITEM_NORMAL, _T(""), wxT("Attach sphere collider"));
-
-#if 0
- wxBitmap itemtool16Bitmap (icons_path + _T("Icon_animation.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool16BitmapDisabled (icons_path + _T("Icon_animation_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_ANIMATION, _T(""), itemtool16Bitmap, itemtool16BitmapDisabled, wxITEM_NORMAL,
- _T(""), wxT("Animation tool (not avaible yet)"));
-
- wxBitmap itemtool17Bitmap (icons_path + _T("Icon_force.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool17BitmapDisabled (icons_path + _T("Icon_force_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_FORCE, _T(""), itemtool17Bitmap, itemtool17BitmapDisabled, wxITEM_NORMAL,
- _T(""), wxT("Create force (not avaible yet)"));
-#endif
-
- wxBitmap itemtool18Bitmap (icons_path + _T("Icon_controler.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool18BitmapDisabled (icons_path + _T("Icon_controler_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_CONTROLLER, _T(""),
- itemtool18Bitmap, itemtool18BitmapDisabled, wxITEM_NORMAL, _T(""), wxT("Attach controller"));
-
- tb1->AddSeparator();
-
-#if 0
- wxBitmap itemtool19Bitmap(icons_path + _T("Icon_camera.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool19BitmapDisabled(icons_path + _T("Icon_camera_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool(ID_TOOL_CAMERA, _T(""), itemtool19Bitmap, itemtool19BitmapDisabled, wxITEM_NORMAL, _T(""),
- wxT("Record (not avaible yet)"));
-
- tb1->AddSeparator();
-#endif
-
- itemMenuEdit->Enable (IA_MENUITEM_DELETE, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BODY, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BOX_COLLIDER, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_JOINT, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER, false);
-
- tb1->Realize();
- itemFrame1->SetToolBar (tb1);
- //end toolbar
-
- sim_panel = new iaSimulationPanel (central_info, this, ID_SIMULATION_PANEL,
- wxDefaultPosition, wxSize(GetSize().x, 115), wxNO_BORDER | wxTAB_TRAVERSAL);
- sim_panel->SetBackgroundColour (wxColor (255, 255, 255));
- sim_panel->CreateControls ();
-
- //the tree
- objtree = new iaObjectTree (central_info, this, ID_OBJECTS_TREE_PANEL, wxDefaultPosition, wxSize(200, 63),
- wxNO_BORDER | wxTAB_TRAVERSAL, icons_path);
- objtree->SetBackgroundColour (wxColor (255, 255, 255));
-
- //3dview
- pnl_3dview = new wxPanel (this, ID_PANEL, wxDefaultPosition, wxSize(131, 63),
- wxSUNKEN_BORDER | wxTAB_TRAVERSAL);
- pnl_3dview->SetBackgroundColour(wxColour(0, 0, 128));
-
- //pnl right ->propgrid
- iaPropertyGrid* propEditor = new iaPropertyGrid (central_info, this, -1, wxPoint(3, 3),
- wxSize(131, 63), wxPG_BOLD_MODIFIED | wxPG_SPLITTER_AUTO_CENTER | wxPG_AUTO_SORT | wxTOP |
- wxTAB_TRAVERSAL| wxPG_BOOL_USE_CHECKBOX);
- propEditor->SetMarginColour (wxColor (122, 110, 90));
- propEditor->SetLineColour (wxColor (0,0,0));
- propEditor->SetCaptionBackgroundColour (wxColor (122, 110, 90));
- propEditor->SetCaptionForegroundColour (wxColor (0,0,0));
- //propEditor->SetCellBackgroundColour (wxColor (122, 110, 90));
-
- aui_mgr.AddPane (sim_panel, wxAuiPaneInfo ().Name (
- wxT ("pnl_bottom")).Caption (wxT ("Simulation")).Bottom());
-
- aui_mgr.AddPane(objtree, wxAuiPaneInfo ().Name (wxT ("objtree")).Caption (
- wxT ("Objects Tree")).Left());
-
- aui_mgr.AddPane (propEditor, wxAuiPaneInfo ().Name (wxT ("properties")).Caption (
- wxT ("Properties")).Right());
-
- aui_mgr.AddPane (pnl_3dview, wxCENTER);
-
- aui_mgr.Update ();
-
- return true;
-}
-
-bool iaMainFrame::ShowToolTips()
-{
- return true;
-}
-
-wxBitmap iaMainFrame::GetBitmapResource(const wxString& name)
-{
- // Bitmap retrieval
- ////@begin iaMainFrame bitmap retrieval
- wxUnusedVar(name);
- return wxNullBitmap;
- ////@end iaMainFrame bitmap retrieval
-}
-void iaMainFrame::OnShowColliders (wxCommandEvent& event)
-{
- central_info->Get3dView ()->Show (IA_OBJECT_TYPE_COLLIDER, event.IsChecked ());
-}
-void iaMainFrame::OnShowJoints (wxCommandEvent& event)
-{
- central_info->Get3dView ()->Show (IA_OBJECT_TYPE_JOINT, event.IsChecked ());
-}
-void iaMainFrame::OnShowBones (wxCommandEvent& event)
-{
- central_info->Get3dView ()->Show (IA_OBJECT_TYPE_BONE, event.IsChecked ());
-}
-void iaMainFrame::OnDrawWireFrame (wxCommandEvent& event)
-{
- central_info->Get3dView ()->DisplayWireframe (event.IsChecked ());
-}
-void iaMainFrame::OnShowBodies (wxCommandEvent& event)
-{
- central_info->Get3dView ()->Show (IA_OBJECT_TYPE_BODY, event.IsChecked ());
-}
-void iaMainFrame::OnShowCharacters (wxCommandEvent& event)
-{
- central_info->Get3dView ()->Show (IA_OBJECT_TYPE_CHARACTER, event.IsChecked ());
-}
-wxIcon iaMainFrame::GetIconResource(const wxString& name)
-{
- // Icon retrieval
- ////@begin iaMainFrame icon retrieval
- wxUnusedVar(name);
- return wxNullIcon;
- ////@end iaMainFrame icon retrieval
-}
-void iaMainFrame::OnLoadMenuItem ( wxCommandEvent& event )
-{
- //wxFileDialog ofd (m_mainfrm, "Load file", central_info->GetProjectPath ().c_str (), "", "*.*", wxOPEN);
- //if (ofd.ShowModal () == wxID_OK)
- //{
- // central_info->LoadObject (ofd.GetFilename ().c_str (),ofd.GetDirectory ().c_str ());
- //}
-}
-void iaMainFrame::OnDelete (wxCommandEvent& event)
-{
- central_info->GetObjectsInfo ()->DeleteSelected ();
-}
-void iaMainFrame::OnSaveMenuItem ( wxCommandEvent& event )
-{
- central_info->SaveProject ();
-}
-void iaMainFrame::OnLoadProjectMenuItem (wxCommandEvent& event)
-{
- wxFileDialog pfd (m_mainfrm, _T("Choose project file"),
- wxString (central_info->GetProjectPath ().c_str (), wxConvUTF8), _T(""), _T("*.iaprj"), wxOPEN);
- if (pfd.ShowModal () == wxID_OK)
- {
- central_info->LoadProject (pfd.GetFilename ().mb_str (), pfd.GetDirectory ().mb_str ());
- }
-}
-void iaMainFrame::OnAttachScriptedControllerMenuItem (wxCommandEvent& event)
-{
- OnAttachScriptedController (this);
-}
-void iaMainFrame::OnAttachJointMenuItem (wxCommandEvent& event)
-{
- OnAttachJoint ();
-}
-void iaMainFrame::OnAttachBodyMenuItem (wxCommandEvent& event)
-{
- OnAttachBody ();
-}
-void iaMainFrame::OnAttachCapsuleColliderMenuItem (wxCommandEvent& event)
-{
- OnAttachCapsuleCollider ();
-}
-void iaMainFrame::OnAttachSphereColliderMenuItem (wxCommandEvent& event)
-{
- OnAttachSphereCollider ();
-}
-void iaMainFrame::OnAttachBoxColliderMenuItem (wxCommandEvent& event)
-{
- OnAttachBoxCollider ();
-}
-void iaMainFrame::OnNewProjectMenuItem (wxCommandEvent& event)
-{
- wxFileDialog wfd (m_mainfrm, _T("Choose world file"),
- wxString (central_info->GetProjectPath ().c_str (), wxConvUTF8), _T(""), _T("*.*"), wxOPEN);
- if (wfd.ShowModal () == wxID_OK)
- {
- central_info->NewProject (wfd.GetFilename ().mb_str (),wfd.GetDirectory ().mb_str ());
- }
-}
-void iaMainFrame::OnExitMenuItem (wxCommandEvent& event)
-{
- m_mainfrm->Close();
-}
-void iaMainFrame::OnSaveAsMenuItem ( wxCommandEvent& event )
-{
- event.Skip();
-}
-void iaMainFrame::OnSize(wxSizeEvent& event)
-{
- if (m_mainfrm->pnl_3dview)
- {
- central_info->Get3dView ()->SetSize (m_mainfrm->pnl_3dview->GetClientSize().x,
- m_mainfrm->pnl_3dview->GetClientSize().y);
- }
- event.Skip();
-}
-
-
Deleted: branches/release/V0.2/src/apps/editor/gui/iaMainFrame.h
===================================================================
--- branches/release/V0.2/src/apps/editor/gui/iaMainFrame.h 2007-10-08 11:59:12 UTC (rev 343)
+++ branches/release/V0.2/src/apps/editor/gui/iaMainFrame.h 2007-10-08 11:59:58 UTC (rev 344)
@@ -1,186 +0,0 @@
-/*
-Copyright (C) 2005 - 2007 by Piotr Obrzut and Valentin Vit
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free
-Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-
-#ifndef _IA_MAINFRAME_H_
-#define _IA_MAINFRAME_H_
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "ia_mainframe.h"
-#endif
-
-
-#include <wx/statusbr.h>
-#include <wx/laywin.h>
-#include <wx/intl.h>
-
-#include "editor.h"
-#include "ia-tool/iaObjectsManager.h"
-#include "ia-tool/iaBaseObjectListener.h"
-#include <wx/aui/aui.h>
-
-
-
-////@begin control identifiers
-#define ID_FRAME 10000
-#define SYMBOL_IAMAINFRAME_STYLE wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE | wxHSCROLL | wxVSCROLL
-#define SYMBOL_IAMAINFRAME_TITLE _("iaMainFrame")
-#define SYMBOL_IAMAINFRAME_IDNAME ID_FRAME
-#define SYMBOL_IAMAINFRAME_SIZE wxSize(300, 300)
-#define SYMBOL_IAMAINFRAME_POSITION wxPoint(10, 10)
-#define ID_STATUSBAR 10001
-#define ID_PANEL 10002
-#define ID_MENUITEM1 10008
-#define ID_MENU 10006
-#define ID_MENUITEM 10007
-#define ID_MENUITEM2 10009
-#define ID_MENUITEM_SAVE 10010
-#define ID_MENUITEM_SAVE_AS 10011
-#define ID_MENUITEM_LOAD 10012
-#define ID_TOOLBAR 10004
-#define ID_PANEL 10002
-#define ID_SIMULATION_PANEL 10019
-#define ID_OBJECTS_TREE_PANEL 10020
-#define ID_PANEL7 10024
-#define ID_TOOLBAR2 10025
-//#define ID_MENUITEM_CREATE_RAGDOLL 10023
-#define ID_MENUITEM_NEW_PROJECT 10027
-#define ID_MENUITEM_LOAD_PROJECT 10028
-#define ID_MENUITEM_EXIT 10029
-#define ID_TOOL_SAVE 10032
-#define ID_TOOL_IMPORT 10033
-#define ID_TOOL_EXPORT 10034
-#define ID_TOOL_MOVE 10035
-#define ID_TOOL_ROTATE 10036
-#define ID_TOOL_MOVE_BODY 10037
-#define ID_TOOL_ROTATE_BODY 10038
-#define ID_TOOL_CREATE_CHAR 10039
-#define ID_TOOL_ATTACH_BOX_COLLIDER 10040
-#define ID_TOOL_ATTACH_CILINDER_COLLIDER 10041
-#define ID_TOOL_ATTACH_SPHERE_COLLIDER 10042
-#define ID_TOOL_ANIMATION 10043
-#define ID_TOOL_FORCE 10044
-#define ID_TOOL_CONTROLLER 10045
-#define ID_TOOL_CAMERA 10045
-#define ID_MENUITEM_DRAW_WIREFRAME 10046
-#define ID_MENUITEM_SHOW_COLLIDERS 10047
-#define ID_MENUITEM_SHOW_BONES 10048
-#define ID_MENUITEM_SHOW_JOINTS 10049
-#define ID_MENUITEM_SHOW_BODIES 10050
-#define ID_MENUITEM_SHOW_CHARACTERS 10051
-#define ID_TOOL_ATTACH_CAPSULE_COLLIDER 10052
-////@end control identifiers
-
-/*!
-* Compatibility
-*/
-
-#ifndef wxCLOSE_BOX
-#define wxCLOSE_BOX 0x1000
-#endif
-
-
-struct iEditorObjectsInfo;
-class iaMainFrame;
-class iaObjectTree;
-class ObjectToolbarGUI;
-class iaSimulationPanel;
-
-/*!
-* iaMainFrame class declaration
-*/
-
-class iaMainFrame : public wxFrame, public iaObjectsManager, public iaBaseObjectListener
-{
- DECLARE_CLASS( iaMainFrame )
-
-public:
-
- wxAuiManager aui_mgr;
- wxPanel *pnl_3dview;
- wxBoxSizer *bxSz3Dview;
- iaObjectTree *objtree;
- iaSimulationPanel *sim_panel;
-
- wxMenu *itemMenuAttach;
- wxMenu *itemMenuEdit;
-
- wxPanel *pnl_controler;
- wxPanel *pnl_tlb;
- wxToolBar * tlb_bottom;
-
- iaMainFrame ();
- ~iaMainFrame ();
- //iaMainFrame(iaDataSubject *data,iaCSApplication *csApp,wxWindow* parent, wxWindowID id = SYMBOL_IAMAINFRAME_IDNAME, const wxString& caption = SYMBOL_IAMAINFRAME_TITLE, const wxPoint& pos = SYMBOL_IAMAINFRAME_POSITION, const wxSize& size = SYMBOL_IAMAINFRAME_SIZE, long style = SYMBOL_IAMAINFRAME_STYLE );
- iaMainFrame (iEditorCentralInfo* info,wxWindow *parent, const wxWindowID id,
- const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
-
- bool Create (wxWindow* parent, wxWindowID id = SYMBOL_IAMAINFRAME_IDNAME,
- const wxString& caption = SYMBOL_IAMAINFRAME_TITLE,
- const wxPoint& pos = SYMBOL_IAMAINFRAME_POSITION,
- const wxSize& size = SYMBOL_IAMAINFRAME_SIZE, long style = SYMBOL_IAMAINFRAME_STYLE );
-
- /// Creates the controls and sizers
- bool CreateControls();
- void UpdatePane (wxWindow *wnd);
-
- wxBitmap GetBitmapResource (const wxString& name );
- wxIcon GetIconResource (const wxString& name );
- /// Should we show tooltips?
- static bool ShowToolTips ();
-
- //events
- //void OnMouse ( wxMouseEvent& event );
- void OnAttachScriptedControllerMenuItem (wxCommandEvent& event);
- void OnAttachJointMenuItem (wxCommandEvent& event);
- void OnAttachBodyMenuItem (wxCommandEvent& event);
- void OnAttachSphereColliderMenuItem (wxCommandEvent& event);
- void OnAttachCapsuleColliderMenuItem (wxCommandEvent& event);
- void OnAttachBoxColliderMenuItem (wxCommandEvent& event);
-
- void OnSize (wxSizeEvent& event);
-
- void OnSaveAsMenuItem (wxCommandEvent& event);
- void OnSaveMenuItem (wxCommandEvent& event);
- void OnLoadMenuItem (wxCommandEvent& event);
- //void OnCreateRagdollMenuItem (wxCommandEvent& event);
- void OnNewProjectMenuItem (wxCommandEvent& event);
- void OnLoadProjectMenuItem (wxCommandEvent& event);
- void OnExitMenuItem (wxCommandEvent& event);
- void OnDelete (wxCommandEvent& event);
- void OnSortByType (wxCommandEvent& event);
- void OnDrawWireFrame (wxCommandEvent& event);
- void OnShowColliders (wxCommandEvent& event);
- void OnShowJoints (wxCommandEvent& event);
- void OnShowBones (wxCommandEvent& event);
- void OnShowBodies (wxCommandEvent& event);
- void OnShowCharacters (wxCommandEvent& event);
-
- void ObjectSelected (iEditorObject *obj);
- void ObjectRemoved (iEditorObject *obj);
- void ObjectAdded (iEditorObject *obj);
- void ObjectChanged (iEditorObject *obj, iEditorObjectProperty* prop);
-
- DECLARE_EVENT_TABLE()
-};
-
-
-#endif
-// _IA_MAINFRAME_H_
-
-
Added: branches/release/V0.2/src/apps/editor/gui/widgets/iaMainFrame.cpp
===================================================================
--- branches/release/V0.2/src/apps/editor/gui/widgets/iaMainFrame.cpp (rev 0)
+++ branches/release/V0.2/src/apps/editor/gui/widgets/iaMainFrame.cpp 2007-10-08 11:59:58 UTC (rev 344)
@@ -0,0 +1,516 @@
+/*
+Copyright (C) 2005 - 2007 by Piotr Obrzut and Valentin Vit
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with this library; if not, write to the Free
+Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma implementation "ia_mainframe.h"
+#endif
+
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#include "wx/wx.h"
+#endif
+
+////@begin includes
+#include <cssysdef.h>
+#include "../iaCSApplication.h"
+
+#include <wx/dc.h>
+#include <wx/filedlg.h>
+#include <wx/laywin.h>
+
+#include "widgets/iaObjectTree.h"
+#include "widgets/iaPropertyGrid.h"
+#include "widgets/iaPropertySheet.h"
+#include "widgets/iaSimulationPanel.h"
+#include <string>
+
+#include "editor.h"
+#include "iaMainFrame.h"
+
+IMPLEMENT_CLASS(iaMainFrame, wxFrame)
+/*!
+* iaMainFrame event table definition
+*/
+BEGIN_EVENT_TABLE(iaMainFrame, wxFrame)
+//EVT_LEFT_DOWN(iaMainFrame::OnMouse)
+//EVT_LEFT_DCLICK(iaMainFrame::OnMouse)
+
+EVT_SIZE(iaMainFrame::OnSize)
+
+EVT_MENU(IA_MENUITEM_ATTACH_BODY, iaMainFrame::OnAttachBodyMenuItem)
+EVT_MENU(IA_MENUITEM_ATTACH_SPHERE_COLLIDER, iaMainFrame::OnAttachSphereColliderMenuItem)
+EVT_MENU(IA_MENUITEM_ATTACH_BOX_COLLIDER, iaMainFrame::OnAttachBoxColliderMenuItem)
+EVT_MENU(IA_MENUITEM_ATTACH_CAPSULE_COLLIDER, iaMainFrame::OnAttachCapsuleColliderMenuItem)
+EVT_MENU(IA_MENUITEM_ATTACH_JOINT, iaMainFrame::OnAttachJointMenuItem)
+EVT_MENU(ID_MENUITEM_LOAD, iaMainFrame::OnLoadMenuItem)
+EVT_MENU(ID_MENUITEM_SAVE, iaMainFrame::OnSaveMenuItem)
+EVT_MENU(ID_MENUITEM_NEW_PROJECT, iaMainFrame::OnNewProjectMenuItem)
+EVT_MENU(ID_MENUITEM_LOAD_PROJECT, iaMainFrame::OnLoadProjectMenuItem)
+EVT_MENU(ID_MENUITEM_SAVE_AS, iaMainFrame::OnSaveAsMenuItem)
+EVT_MENU(ID_MENUITEM_EXIT, iaMainFrame::OnExitMenuItem)
+EVT_MENU(IA_MENUITEM_DELETE, iaMainFrame::OnDelete)
+EVT_MENU(IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER, iaMainFrame::OnAttachScriptedControllerMenuItem)
+EVT_MENU(ID_MENUITEM_DRAW_WIREFRAME, iaMainFrame::OnDrawWireFrame)
+EVT_MENU(ID_MENUITEM_SHOW_COLLIDERS, iaMainFrame::OnShowColliders)
+EVT_MENU(ID_MENUITEM_SHOW_JOINTS, iaMainFrame::OnShowJoints)
+EVT_MENU(ID_MENUITEM_SHOW_BONES, iaMainFrame::OnShowBones)
+EVT_MENU(ID_MENUITEM_SHOW_BODIES, iaMainFrame::OnShowBodies)
+EVT_MENU(ID_MENUITEM_SHOW_CHARACTERS, iaMainFrame::OnShowCharacters)
+
+EVT_TOOL(ID_TOOL_ATTACH_CAPSULE_COLLIDER, iaMainFrame::OnAttachCapsuleColliderMenuItem)
+EVT_TOOL(ID_TOOL_ATTACH_BOX_COLLIDER, iaMainFrame::OnAttachBoxColliderMenuItem)
+EVT_TOOL(ID_TOOL_ATTACH_SPHERE_COLLIDER, iaMainFrame::OnAttachSphereColliderMenuItem)
+EVT_TOOL(ID_TOOL_CONTROLLER, iaMainFrame::OnAttachScriptedControllerMenuItem)
+EVT_TOOL(ID_TOOL_SAVE, iaMainFrame::OnSaveMenuItem)
+EVT_TOOL(ID_TOOL_IMPORT, iaMainFrame::OnLoadProjectMenuItem)
+
+END_EVENT_TABLE()
+
+iaMainFrame *m_mainfrm;
+
+iaMainFrame::~iaMainFrame()
+{
+ central_info->Get3dView ()->ShutDown ();
+ aui_mgr.UnInit();
+}
+
+iaMainFrame::iaMainFrame()
+{
+ m_mainfrm = this;
+}
+
+iaMainFrame::iaMainFrame(iEditorCentralInfo* info, wxWindow* parent,
+ const wxWindowID id, const wxString& title, const wxPoint& pos,
+ const wxSize& size, const long style)
+{
+ central_info = info;
+ m_mainfrm = this;
+ central_info->GetObjectsInfo ()->AddListener ((iaBaseObjectListener*)this);
+ SetMinSize(wxSize(400,300));
+}
+
+bool iaMainFrame::Create(wxWindow* parent, wxWindowID id, const wxString& caption,
+ const wxPoint& pos, const wxSize& size, long style)
+{
+ pnl_3dview = NULL;
+ wxFrame::Create (parent, id, caption, pos, size, style);
+
+ if (!CreateControls ())
+ return false;
+
+ pnl_3dview->SetFocus ();
+
+ Centre ();
+
+ return true;
+}
+
+void iaMainFrame::ObjectSelected (iEditorObject *obj)
+{
+ bool can_delete = true;
+ for (size_t i = 0; i < central_info->GetObjectsInfo ()->GetSelectedObjectsCount (); i++)
+ {
+ if (!central_info->GetObjectsInfo ()->GetSelectedObject (i)->CanBeDeleted ())
+ can_delete = false;
+ }
+ itemMenuEdit->Enable (IA_MENUITEM_DELETE, can_delete);
+
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BODY, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BOX_COLLIDER, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_JOINT, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER, false);
+
+ if (central_info->GetObjectsInfo ()->GetSelectedObjectsCount () == 1)
+ {
+ iEditorObject *obj = central_info->GetObjectsInfo ()->GetSelectedObject (0);
+ if (obj->CanAttach (IA_OBJECT_TYPE_BODY))
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BODY, true);
+ if (obj->CanAttach (IA_OBJECT_TYPE_COLLIDER))
+ {
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, true);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BOX_COLLIDER, true);
+ }
+ if (obj->CanAttach (IA_OBJECT_TYPE_CONTROLLER))
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER, true);
+
+ }else if(central_info->GetObjectsInfo ()->GetSelectedObjectsCount () == 2)
+ {
+ iEditorObject *obj1 = central_info->GetObjectsInfo ()->GetSelectedObject (0);
+ iEditorObject *obj2 = central_info->GetObjectsInfo ()->GetSelectedObject (1);
+ if (obj1->CanAttach (IA_OBJECT_TYPE_JOINT) && obj2->CanAttach (IA_OBJECT_TYPE_JOINT))
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_JOINT, true);
+ }
+
+}
+void iaMainFrame::ObjectRemoved (iEditorObject *obj)
+{
+}
+void iaMainFrame::UpdatePane (wxWindow *wnd)
+{
+ aui_mgr.GetPane (wnd).BestSize (wnd->GetSize ());
+ aui_mgr.InsertPane (wnd, aui_mgr.GetPane (wnd), wxAUI_INSERT_DOCK);
+ aui_mgr.Update ();
+}
+void iaMainFrame::ObjectAdded (iEditorObject *obj)
+{
+}
+void iaMainFrame::ObjectChanged (iEditorObject *obj, iEditorObjectProperty* prop)
+{
+}
+
+/*!
+* Control creation for ia_MainFrame
+*/
+bool iaMainFrame::CreateControls()
+{
+ aui_mgr.SetManagedWindow (this);
+
+ wxString icons_path = wxString (central_info->GetIconsPath ().c_str (), wxConvUTF8);
+ if (icons_path.Cmp (_T("")) == 0)
+ return false;
+
+ //menu and statusbar
+ iaMainFrame* itemFrame1 = this;
+
+ wxMenuBar* menuBar = new wxMenuBar;
+ wxMenu* itemMenu5 = new wxMenu;
+ itemMenu5->Append (ID_MENUITEM_NEW_PROJECT, _("New Project...\tCTRL+N"), _T(""), wxITEM_NORMAL);
+ itemMenu5->Append (ID_MENUITEM_LOAD_PROJECT, _("Load Project...\tCTRL+L"), _T(""), wxITEM_NORMAL);
+ //itemMenu5->Append (ID_MENUITEM_LOAD, _("Load..."), _T(""), wxITEM_NORMAL);
+ itemMenu5->Append (ID_MENUITEM_SAVE, _("Save Project\tCTRL+S"), _T(""), wxITEM_NORMAL);
+ //itemMenu5->Append (ID_MENUITEM_SAVE_AS, _("Save As..."), _T(""), wxITEM_NORMAL);
+ itemMenu5->Append(ID_MENUITEM_EXIT, _("Exit\tCTRL+X"), _T(""), wxITEM_NORMAL);
+ menuBar->Append(itemMenu5, _("File"));
+ itemMenuEdit = new wxMenu;
+ itemMenuEdit->Append (IA_MENUITEM_DELETE, _("Delete\tDel"), _T(""), wxITEM_NORMAL);
+ menuBar->Append(itemMenuEdit, _("Edit"));
+ wxMenu* itemMenuView = new wxMenu;
+ menuBar->Append(itemMenuView, _("View"));
+ itemMenuView->Append (ID_MENUITEM_DRAW_WIREFRAME, _("Draw wireframe"), _T(""), wxITEM_CHECK);
+ itemMenuView->Append (ID_MENUITEM_SHOW_BONES, _("Show Bones"), _T(""), wxITEM_CHECK);
+ itemMenuView->Check (ID_MENUITEM_SHOW_BONES, true);
+ itemMenuView->Append (ID_MENUITEM_SHOW_COLLIDERS, _("Show Colliders"), _T(""), wxITEM_CHECK);
+ itemMenuView->Check (ID_MENUITEM_SHOW_COLLIDERS, true);
+ itemMenuView->Append (ID_MENUITEM_SHOW_JOINTS, _("Show Joints"), _T(""), wxITEM_CHECK);
+ itemMenuView->Check (ID_MENUITEM_SHOW_JOINTS, true);
+ itemMenuView->Append (ID_MENUITEM_SHOW_BODIES, _("Show Bodies"), _T(""), wxITEM_CHECK);
+ itemMenuView->Check (ID_MENUITEM_SHOW_BODIES, true);
+ itemMenuView->Append (ID_MENUITEM_SHOW_CHARACTERS, _("Show Characters"), _T(""), wxITEM_CHECK);
+ itemMenuView->Check (ID_MENUITEM_SHOW_CHARACTERS, true);
+
+ itemMenuAttach = new wxMenu;
+ itemMenuAttach->Append (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, _("Attach Sphere Collider..."),
+ _T(""),wxITEM_NORMAL);
+ itemMenuAttach->Append (IA_MENUITEM_ATTACH_BOX_COLLIDER, _("Attach Box Collider..."),
+ _T(""),wxITEM_NORMAL);
+ itemMenuAttach->Append (IA_MENUITEM_ATTACH_BODY, _("Attach Body...\tCTRL+B"), _T(""), wxITEM_NORMAL);
+ itemMenuAttach->Append (IA_MENUITEM_ATTACH_JOINT, _("Attach Joint...\tCTRL+J"), _T(""), wxITEM_NORMAL);
+ itemMenuAttach->Append (IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER,
+ _("Attach Scripted Controler...\tCTRL+C"), _T(""), wxITEM_NORMAL);
+ menuBar->Append (itemMenuAttach, _("Attach"));
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, false);
+
+ wxMenu* itemMenu13 = new wxMenu;
+ itemMenu13->Append (ID_MENUITEM2, _("About"), _T(""), wxITEM_NORMAL);
+ menuBar->Append (itemMenu13, _("Help"));
+ itemFrame1->SetMenuBar (menuBar);
+
+ wxStatusBar* itemStatusBar2 = new wxStatusBar (itemFrame1, ID_STATUSBAR,
+ wxST_SIZEGRIP | wxNO_BORDER);
+ itemStatusBar2->SetFieldsCount (2);
+ itemFrame1->SetStatusBar (itemStatusBar2);
+ //end menu and statusbar
+
+ //toolbar
+ wxInitAllImageHandlers ();
+ wxToolBar* tb1 = CreateToolBar (wxTB_FLAT | wxTB_HORIZONTAL, ID_TOOLBAR);
+ tb1->SetToolBitmapSize (wxSize(32, 32));
+
+ tb1->AddSeparator();
+
+ wxBitmap itemtool2Bitmap (icons_path + _T("Icon_save.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool2BitmapDisabled (icons_path + _T("Icon_save_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_SAVE, _T(""), itemtool2Bitmap, itemtool2BitmapDisabled, wxITEM_NORMAL,
+ _T(""), wxT("Save project"));
+
+ wxBitmap itemtool3Bitmap (icons_path + _T("Icon_import.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool3BitmapDisabled (icons_path + _T("Icon_import_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_IMPORT, _T(""), itemtool3Bitmap, itemtool3BitmapDisabled, wxITEM_NORMAL,
+ _T(""), wxT("Load Project"));
+
+#if 0
+ wxBitmap itemtool4Bitmap (icons_path + _T("Icon_export.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool4BitmapDisabled (icons_path + _T ("Icon_export_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_EXPORT, _T(""), itemtool4Bitmap, itemtool4BitmapDisabled, wxITEM_NORMAL,
+ _T(""), wxT("Export physics (currently not avaible)"));
+#endif
+
+ tb1->AddSeparator();
+#if 0
+ wxBitmap itemtool5Bitmap (icons_path + _T("Icon_move.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool5BitmapDisabled (icons_path + _T ("Icon_move_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_MOVE, _T(""), itemtool5Bitmap, itemtool5BitmapDisabled, wxITEM_NORMAL, _T(""),
+ wxT("Move Object (currently not avaible)"));
+
+ wxBitmap itemtool6Bitmap (icons_path + _T("Icon_rotate.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool6BitmapDisabled (icons_path + _T("Icon_rotate_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_ROTATE, _T(""), itemtool6Bitmap, itemtool6BitmapDisabled, wxITEM_NORMAL, _T(""),
+ wxT("Rotate Object (currently not avaible)"));
+
+ tb1->AddSeparator();
+
+ wxBitmap itemtool7Bitmap (icons_path + _T ("Icon_movebody.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool7BitmapDisabled (icons_path + _T("Icon_movebody_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_MOVE_BODY, _T(""), itemtool7Bitmap, itemtool7BitmapDisabled,
+ wxITEM_NORMAL, _T(""), wxT("Move rigid body (currently not avaible)"));
+
+ wxBitmap itemtool8Bitmap (icons_path + _T("Icon_rotatebody.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool8BitmapDisabled (icons_path + _T("Icon_rotatebody_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_ROTATE_BODY, _T(""), itemtool8Bitmap, itemtool8BitmapDisabled, wxITEM_NORMAL,
+ _T(""), wxT("Rotate rigid body (currently not avaible)"));
+
+ tb1->AddSeparator();
+
+ wxBitmap itemtool9Bitmap (icons_path + _T("Icon_rag.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool9BitmapDisabled (icons_path + _T("Icon_rag_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_CREATE_CHAR, _T(""), itemtool9Bitmap, itemtool9BitmapDisabled, wxITEM_NORMAL,
+ _T(""), wxT("Create character from given model"));
+#endif
+
+ wxBitmap itemtool10Bitmap (icons_path + _T("Icon_cube.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool10BitmapDisabled (icons_path + _T("Icon_cube_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_ATTACH_BOX_COLLIDER, _T(""), itemtool10Bitmap, itemtool10BitmapDisabled,
+ wxITEM_NORMAL, _T(""), wxT("Attach box collider"));
+
+ wxBitmap itemtool11Bitmap (icons_path + _T ("Icon_cilinder.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool11BitmapDisabled(icons_path + _T ("Icon_cilinder_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool(ID_TOOL_ATTACH_CAPSULE_COLLIDER, _T(""), itemtool11Bitmap, itemtool11BitmapDisabled,
+ wxITEM_NORMAL, _T(""), wxT("Attach cilinder collider"));
+
+ wxBitmap itemtool12Bitmap (icons_path + _T ("Icon_sphere.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool12BitmapDisabled (icons_path + _T("Icon_sphere_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_ATTACH_SPHERE_COLLIDER, _T(""), itemtool12Bitmap, itemtool12BitmapDisabled,
+ wxITEM_NORMAL, _T(""), wxT("Attach sphere collider"));
+
+#if 0
+ wxBitmap itemtool16Bitmap (icons_path + _T("Icon_animation.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool16BitmapDisabled (icons_path + _T("Icon_animation_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_ANIMATION, _T(""), itemtool16Bitmap, itemtool16BitmapDisabled, wxITEM_NORMAL,
+ _T(""), wxT("Animation tool (not avaible yet)"));
+
+ wxBitmap itemtool17Bitmap (icons_path + _T("Icon_force.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool17BitmapDisabled (icons_path + _T("Icon_force_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_FORCE, _T(""), itemtool17Bitmap, itemtool17BitmapDisabled, wxITEM_NORMAL,
+ _T(""), wxT("Create force (not avaible yet)"));
+#endif
+
+ wxBitmap itemtool18Bitmap (icons_path + _T("Icon_controler.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool18BitmapDisabled (icons_path + _T("Icon_controler_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_CONTROLLER, _T(""),
+ itemtool18Bitmap, itemtool18BitmapDisabled, wxITEM_NORMAL, _T(""), wxT("Attach controller"));
+
+ tb1->AddSeparator();
+
+#if 0
+ wxBitmap itemtool19Bitmap(icons_path + _T("Icon_camera.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool19BitmapDisabled(icons_path + _T("Icon_camera_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool(ID_TOOL_CAMERA, _T(""), itemtool19Bitmap, itemtool19BitmapDisabled, wxITEM_NORMAL, _T(""),
+ wxT("Record (not avaible yet)"));
+
+ tb1->AddSeparator();
+#endif
+
+ itemMenuEdit->Enable (IA_MENUITEM_DELETE, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BODY, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BOX_COLLIDER, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_JOINT, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER, false);
+
+ tb1->Realize();
+ itemFrame1->SetToolBar (tb1);
+ //end toolbar
+
+ sim_panel = new iaSimulationPanel (central_info, this, ID_SIMULATION_PANEL,
+ wxDefaultPosition, wxSize(GetSize().x, 115), wxNO_BORDER | wxTAB_TRAVERSAL);
+ sim_panel->SetBackgroundColour (wxColor (255, 255, 255));
+ sim_panel->CreateControls ();
+
+ //the tree
+ objtree = new iaObjectTree (central_info, this, ID_OBJECTS_TREE_PANEL, wxDefaultPosition, wxSize(200, 63),
+ wxNO_BORDER | wxTAB_TRAVERSAL, icons_path);
+ objtree->SetBackgroundColour (wxColor (255, 255, 255));
+
+ //3dview
+ pnl_3dview = new wxPanel (this, ID_PANEL, wxDefaultPosition, wxSize(131, 63),
+ wxSUNKEN_BORDER | wxTAB_TRAVERSAL);
+ pnl_3dview->SetBackgroundColour(wxColour(0, 0, 128));
+
+ //pnl right ->propgrid
+ iaPropertyGrid* propEditor = new iaPropertyGrid (central_info, this, -1, wxPoint(3, 3),
+ wxSize(131, 63), wxPG_BOLD_MODIFIED | wxPG_SPLITTER_AUTO_CENTER | wxPG_AUTO_SORT | wxTOP |
+ wxTAB_TRAVERSAL| wxPG_BOOL_USE_CHECKBOX);
+ propEditor->SetMarginColour (wxColor (122, 110, 90));
+ propEditor->SetLineColour (wxColor (0,0,0));
+ propEditor->SetCaptionBackgroundColour (wxColor (122, 110, 90));
+ propEditor->SetCaptionForegroundColour (wxColor (0,0,0));
+ //propEditor->SetCellBackgroundColour (wxColor (122, 110, 90));
+
+ aui_mgr.AddPane (sim_panel, wxAuiPaneInfo ().Name (
+ wxT ("pnl_bottom")).Caption (wxT ("Simulation")).Bottom());
+
+ aui_mgr.AddPane(objtree, wxAuiPaneInfo ().Name (wxT ("objtree")).Caption (
+ wxT ("Objects Tree")).Left());
+
+ aui_mgr.AddPane (propEditor, wxAuiPaneInfo ().Name (wxT ("properties")).Caption (
+ wxT ("Properties")).Right());
+
+ aui_mgr.AddPane (pnl_3dview, wxCENTER);
+
+ aui_mgr.Update ();
+
+ return true;
+}
+
+bool iaMainFrame::ShowToolTips()
+{
+ return true;
+}
+
+wxBitmap iaMainFrame::GetBitmapResource(const wxString& name)
+{
+ // Bitmap retrieval
+ ////@begin iaMainFrame bitmap retrieval
+ wxUnusedVar(name);
+ return wxNullBitmap;
+ ////@end iaMainFrame bitmap retrieval
+}
+void iaMainFrame::OnShowColliders (wxCommandEvent& event)
+{
+ central_info->Get3dView ()->Show (IA_OBJECT_TYPE_COLLIDER, event.IsChecked ());
+}
+void iaMainFrame::OnShowJoints (wxCommandEvent& event)
+{
+ central_info->Get3dView ()->Show (IA_OBJECT_TYPE_JOINT, event.IsChecked ());
+}
+void iaMainFrame::OnShowBones (wxCommandEvent& event)
+{
+ central_info->Get3dView ()->Show (IA_OBJECT_TYPE_BONE, event.IsChecked ());
+}
+void iaMainFrame::OnDrawWireFrame (wxCommandEvent& event)
+{
+ central_info->Get3dView ()->DisplayWireframe (event.IsChecked ());
+}
+void iaMainFrame::OnShowBodies (wxCommandEvent& event)
+{
+ central_info->Get3dView ()->Show (IA_OBJECT_TYPE_BODY, event.IsChecked ());
+}
+void iaMainFrame::OnShowCharacters (wxCommandEvent& event)
+{
+ central_info->Get3dView ()->Show (IA_OBJECT_TYPE_CHARACTER, event.IsChecked ());
+}
+wxIcon iaMainFrame::GetIconResource(const wxString& name)
+{
+ // Icon retrieval
+ ////@begin iaMainFrame icon retrieval
+ wxUnusedVar(name);
+ return wxNullIcon;
+ ////@end iaMainFrame icon retrieval
+}
+void iaMainFrame::OnLoadMenuItem ( wxCommandEvent& event )
+{
+ //wxFileDialog ofd (m_mainfrm, "Load file", central_info->GetProjectPath ().c_str (), "", "*.*", wxOPEN);
+ //if (ofd.ShowModal () == wxID_OK)
+ //{
+ // central_info->LoadObject (ofd.GetFilename ().c_str (),ofd.GetDirectory ().c_str ());
+ //}
+}
+void iaMainFrame::OnDelete (wxCommandEvent& event)
+{
+ central_info->GetObjectsInfo ()->DeleteSelected ();
+}
+void iaMainFrame::OnSaveMenuItem ( wxCommandEvent& event )
+{
+ central_info->SaveProject ();
+}
+void iaMainFrame::OnLoadProjectMenuItem (wxCommandEvent& event)
+{
+ wxFileDialog pfd (m_mainfrm, _T("Choose project file"),
+ wxString (central_info->GetProjectPath ().c_str (), wxConvUTF8), _T(""), _T("*.iaprj"), wxOPEN);
+ if (pfd.ShowModal () == wxID_OK)
+ {
+ central_info->LoadProject (pfd.GetFilename ().mb_str (), pfd.GetDirectory ().mb_str ());
+ }
+}
+void iaMainFrame::OnAttachScriptedControllerMenuItem (wxCommandEvent& event)
+{
+ OnAttachScriptedController (this);
+}
+void iaMainFrame::OnAttachJointMenuItem (wxCommandEvent& event)
+{
+ OnAttachJoint ();
+}
+void iaMainFrame::OnAttachBodyMenuItem (wxCommandEvent& event)
+{
+ OnAttachBody ();
+}
+void iaMainFrame::OnAttachCapsuleColliderMenuItem (wxCommandEvent& event)
+{
+ OnAttachCapsuleCollider ();
+}
+void iaMainFrame::OnAttachSphereColliderMenuItem (wxCommandEvent& event)
+{
+ OnAttachSphereCollider ();
+}
+void iaMainFrame::OnAttachBoxColliderMenuItem (wxCommandEvent& event)
+{
+ OnAttachBoxCollider ();
+}
+void iaMainFrame::OnNewProjectMenuItem (wxCommandEvent& event)
+{
+ wxFileDialog wfd (m_mainfrm, _T("Choose world file"),
+ wxString (central_info->GetProjectPath ().c_str (), wxConvUTF8), _T(""), _T("*.*"), wxOPEN);
+ if (wfd.ShowModal () == wxID_OK)
+ {
+ central_info->NewProject (wfd.GetFilename ().mb_str (),wfd.GetDirectory ().mb_str ());
+ }
+}
+void iaMainFrame::OnExitMenuItem (wxCommandEvent& event)
+{
+ m_mainfrm->Close();
+}
+void iaMainFrame::OnSaveAsMenuItem ( wxCommandEvent& event )
+{
+ event.Skip();
+}
+void iaMainFrame::OnSize(wxSizeEvent& event)
+{
+ if (m_mainfrm->pnl_3dview)
+ {
+ central_info->Get3dView ()->SetSize (m_mainfrm->pnl_3dview->GetClientSize().x,
+ m_mainfrm->pnl_3dview->GetClientSize().y);
+ }
+ event.Skip();
+}
+
Added: branches/release/V0.2/src/apps/editor/gui/widgets/iaMainFrame.h
===================================================================
--- branches/release/V0.2/src/apps/editor/gui/widgets/iaMainFrame.h (rev 0)
+++ branches/release/V0.2/src/apps/editor/gui/widgets/iaMainFrame.h 2007-10-08 11:59:58 UTC (rev 344)
@@ -0,0 +1,185 @@
+/*
+Copyright (C) 2005 - 2007 by Piotr Obrzut and Valentin Vit
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with this library; if not, write to the Free
+Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+
+#ifndef _IA_MAINFRAME_H_
+#define _IA_MAINFRAME_H_
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "ia_mainframe.h"
+#endif
+
+
+#include <wx/statusbr.h>
+#include <wx/laywin.h>
+#include <wx/intl.h>
+
+#include "editor.h"
+#include "iaObjectsManager.h"
+#include "ia-tool/iaBaseObjectListener.h"
+#include <wx/aui/aui.h>
+
+
+
+////@begin control identifiers
+#define ID_FRAME 10000
+#define SYMBOL_IAMAINFRAME_STYLE wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE | wxHSCROLL | wxVSCROLL
+#define SYMBOL_IAMAINFRAME_TITLE _("iaMainFrame")
+#define SYMBOL_IAMAINFRAME_IDNAME ID_FRAME
+#define SYMBOL_IAMAINFRAME_SIZE wxSize(300, 300)
+#define SYMBOL_IAMAINFRAME_POSITION wxPoint(10, 10)
+#define ID_STATUSBAR 10001
+#define ID_PANEL 10002
+#define ID_MENUITEM1 10008
+#define ID_MENU 10006
+#define ID_MENUITEM 10007
+#define ID_MENUITEM2 10009
+#define ID_MENUITEM_SAVE 10010
+#define ID_MENUITEM_SAVE_AS 10011
+#define ID_MENUITEM_LOAD 10012
+#define ID_TOOLBAR 10004
+#define ID_PANEL 10002
+#define ID_SIMULATION_PANEL 10019
+#define ID_OBJECTS_TREE_PANEL 10020
+#define ID_PANEL7 10024
+#define ID_TOOLBAR2 10025
+//#define ID_MENUITEM_CREATE_RAGDOLL 10023
+#define ID_MENUITEM_NEW_PROJECT 10027
+#define ID_MENUITEM_LOAD_PROJECT 10028
+#define ID_MENUITEM_EXIT 10029
+#define ID_TOOL_SAVE 10032
+#define ID_TOOL_IMPORT 10033
+#define ID_TOOL_EXPORT 10034
+#define ID_TOOL_MOVE 10035
+#define ID_TOOL_ROTATE 10036
+#define ID_TOOL_MOVE_BODY 10037
+#define ID_TOOL_ROTATE_BODY 10038
+#define ID_TOOL_CREATE_CHAR 10039
+#define ID_TOOL_ATTACH_BOX_COLLIDER 10040
+#define ID_TOOL_ATTACH_CILINDER_COLLIDER 10041
+#define ID_TOOL_ATTACH_SPHERE_COLLIDER 10042
+#define ID_TOOL_ANIMATION 10043
+#define ID_TOOL_FORCE 10044
+#define ID_TOOL_CONTROLLER 10045
+#define ID_TOOL_CAMERA 10045
+#define ID_MENUITEM_DRAW_WIREFRAME 10046
+#define ID_MENUITEM_SHOW_COLLIDERS 10047
+#define ID_MENUITEM_SHOW_BONES 10048
+#define ID_MENUITEM_SHOW_JOINTS 10049
+#define ID_MENUITEM_SHOW_BODIES 10050
+#define ID_MENUITEM_SHOW_CHARACTERS 10051
+#define ID_TOOL_ATTACH_CAPSULE_COLLIDER 10052
+////@end control identifiers
+
+/*!
+* Compatibility
+*/
+
+#ifndef wxCLOSE_BOX
+#define wxCLOSE_BOX 0x1000
+#endif
+
+
+struct iEditorObjectsInfo;
+class iaMainFrame;
+class iaObjectTree;
+class ObjectToolbarGUI;
+class iaSimulationPanel;
+
+/*!
+* iaMainFrame class declaration
+*/
+
+class iaMainFrame : public wxFrame, public iaObjectsManager, public iaBaseObjectListener
+{
+ DECLARE_CLASS( iaMainFrame )
+
+public:
+
+ wxAuiManager aui_mgr;
+ wxPanel *pnl_3dview;
+ wxBoxSizer *bxSz3Dview;
+ iaObjectTree *objtree;
+ iaSimulationPanel *sim_panel;
+
+ wxMenu *itemMenuAttach;
+ wxMenu *itemMenuEdit;
+
+ wxPanel *pnl_controler;
+ wxPanel *pnl_tlb;
+ wxToolBar * tlb_bottom;
+
+ iaMainFrame ();
+ ~iaMainFrame ();
+ //iaMainFrame(iaDataSubject *data,iaCSApplication *csApp,wxWindow* parent, wxWindowID id = SYMBOL_IAMAINFRAME_IDNAME, const wxString& caption = SYMBOL_IAMAINFRAME_TITLE, const wxPoint& pos = SYMBOL_IAMAINFRAME_POSITION, const wxSize& size = SYMBOL_IAMAINFRAME_SIZE, long style = SYMBOL_IAMAINFRAME_STYLE );
+ iaMainFrame (iEditorCentralInfo* info,wxWindow *parent, const wxWindowID id,
+ const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
+
+ bool Create (wxWindow* parent, wxWindowID id = SYMBOL_IAMAINFRAME_IDNAME,
+ const wxString& caption = SYMBOL_IAMAINFRAME_TITLE,
+ const wxPoint& pos = SYMBOL_IAMAINFRAME_POSITION,
+ const wxSize& size = SYMBOL_IAMAINFRAME_SIZE, long style = SYMBOL_IAMAINFRAME_STYLE );
+
+ /// Creates the controls and sizers
+ bool CreateControls();
+ void UpdatePane (wxWindow *wnd);
+
+ wxBitmap GetBitmapResource (const wxString& name );
+ wxIcon GetIconResource (const wxString& name );
+ /// Should we show tooltips?
+ static bool ShowToolTips ();
+
+ //events
+ //void OnMouse ( wxMouseEvent& event );
+ void OnAttachScriptedControllerMenuItem (wxCommandEvent& event);
+ void OnAttachJointMenuItem (wxCommandEvent& event);
+ void OnAttachBodyMenuItem (wxCommandEvent& event);
+ void OnAttachSphereColliderMenuItem (wxCommandEvent& event);
+ void OnAttachCapsuleColliderMenuItem (wxCommandEvent& event);
+ void OnAttachBoxColliderMenuItem (wxCommandEvent& event);
+
+ void OnSize (wxSizeEvent& event);
+
+ void OnSaveAsMenuItem (wxCommandEvent& event);
+ void OnSaveMenuItem (wxCommandEvent& event);
+ void OnLoadMenuItem (wxCommandEvent& event);
+ //void OnCreateRagdollMenuItem (wxCommandEvent& event);
+ void OnNewProjectMenuItem (wxCommandEvent& event);
+ void OnLoadProjectMenuItem (wxCommandEvent& event);
+ void OnExitMenuItem (wxCommandEvent& event);
+ void OnDelete (wxCommandEvent& event);
+ void OnSortByType (wxCommandEvent& event);
+ void OnDrawWireFrame (wxCommandEvent& event);
+ void OnShowColliders (wxCommandEvent& event);
+ void OnShowJoints (wxCommandEvent& event);
+ void OnShowBones (wxCommandEvent& event);
+ void OnShowBodies (wxCommandEvent& event);
+ void OnShowCharacters (wxCommandEvent& event);
+
+ void ObjectSelected (iEditorObject *obj);
+ void ObjectRemoved (iEditorObject *obj);
+ void ObjectAdded (iEditorObject *obj);
+ void ObjectChanged (iEditorObject *obj, iEditorObjectProperty* prop);
+
+ DECLARE_EVENT_TABLE()
+};
+
+
+#endif
+// _IA_MAINFRAME_H_
+
Modified: branches/release/V0.2/src/apps/editor/gui/widgets/iaObjectTree.h
===================================================================
--- branches/release/V0.2/src/apps/editor/gui/widgets/iaObjectTree.h 2007-10-08 11:59:12 UTC (rev 343)
+++ branches/release/V0.2/src/apps/editor/gui/widgets/iaObjectTree.h 2007-10-08 11:59:58 UTC (rev 344)
@@ -19,7 +19,7 @@
#include "wx/wx.h"
#include <wx/treectrl.h>
#include <csutil/hash.h>
-#include "ia-tool/iaObjectsManager.h"
+#include "iaObjectsManager.h"
#include "ia-tool/iaBaseObjectListener.h"
#include "editor.h"
@@ -135,3 +135,4 @@
};
+
Added: branches/release/V0.2/src/apps/editor/gui/widgets/iaObjectsManager.h
===================================================================
--- branches/release/V0.2/src/apps/editor/gui/widgets/iaObjectsManager.h (rev 0)
+++ branches/release/V0.2/src/apps/editor/gui/widgets/iaObjectsManager.h 2007-10-08 11:59:58 UTC (rev 344)
@@ -0,0 +1,144 @@
+/*
+Copyright (C) 2007 by Piotr Obrzut
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+
+#ifndef _IA_OBJ_MANAGER_H_
+#define _IA_OBJ_MANAGER_H_
+
+
+#include <wx/statusbr.h>
+#include <wx/laywin.h>
+#include <wx/intl.h>
+
+#include "editor.h"
+
+////@begin control identifiers
+#define IA_MENUITEM_ATTACH_BODY 0
+#define IA_MENUITEM_ATTACH_JOINT 2
+#define IA_MENUITEM_ATTACH_SPHERE_COLLIDER 3
+#define IA_MENUITEM_ATTACH_BOX_COLLIDER 4
+#define IA_MENUITEM_DELETE 5
+#define ID_MENUITEM_SORT_BY_TYPE 6
+#define IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER 7
+#define IA_MENUITEM_ATTACH_CAPSULE_COLLIDER 8
+#define IA_MENUITEM_HIDE 9
+#define IA_MENUITEM_SHOW 10
+#define IA_MENUITEM_GROUP 11
+#define IA_MENUITEM_SAVE_ANIMATION 12
+////@end control identifiers
+
+/*!
+* Compatibility
+*/
+
+#ifndef wxCLOSE_BOX
+#define wxCLOSE_BOX 0x1000
+#endif
+
+
+struct iEditorObjectsInfo;
+class iaMainFrame;
+class iaObjectTree;
+class ObjectToolbarGUI;
+//class wxFrameManager;
+
+#include <wx/filedlg.h>
+#include <iScriptController.h>
+#include "iPcDynamicsSystem.h"
+#include "iPcCharacter.h"
+
+class iaObjectsManager : public iEditorObjectsListener
+{
+protected:
+
+ iEditorCentralInfo *central_info;
+
+public:
+
+ iaObjectsManager () : central_info (0) {;}
+
+ void OnSaveAnimation (wxWindow *parent)
+ {
+ wxFileDialog ofd (parent, _T ("Export character animation"),
+ wxString (central_info->GetProjectPath ().c_str (), wxConvUTF8), _T(""), _T("*.*"), wxSAVE);
+ if (ofd.ShowModal () == wxID_OK)
+ {
+ csRef<iPcCharacter> character...
[truncated message content] |
|
From: <ob...@us...> - 2007-10-08 11:59:08
|
Revision: 343
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=343&view=rev
Author: obi666
Date: 2007-10-08 04:59:12 -0700 (Mon, 08 Oct 2007)
Log Message:
-----------
Moved iaMainFrame and iaObjectsManager to widgets.
Modified Paths:
--------------
trunk/src/apps/editor/application.cpp
trunk/src/apps/editor/gui/widgets/iaObjectTree.h
trunk/src/apps/editor/iaCSApplication.cpp
Added Paths:
-----------
trunk/src/apps/editor/gui/widgets/iaMainFrame.cpp
trunk/src/apps/editor/gui/widgets/iaMainFrame.h
trunk/src/apps/editor/gui/widgets/iaObjectsManager.h
Removed Paths:
-------------
trunk/src/apps/editor/gui/iaMainFrame.cpp
trunk/src/apps/editor/gui/iaMainFrame.h
trunk/src/include/ia-tool/iaObjectsManager.h
Modified: trunk/src/apps/editor/application.cpp
===================================================================
--- trunk/src/apps/editor/application.cpp 2007-10-08 11:40:28 UTC (rev 342)
+++ trunk/src/apps/editor/application.cpp 2007-10-08 11:59:12 UTC (rev 343)
@@ -39,14 +39,8 @@
#include "windows.h"
#endif
-#include "iutil/vfs.h"
-#include "csutil/cscolor.h"
-#include "cstool/csview.h"
-#include "cstool/initapp.h"
-#include "csutil/syspath.h"
+#include "gui/widgets/iaMainFrame.h"
-#include "gui/iaMainFrame.h"
-
IMPLEMENT_APP(iaApplication)
iObjectRegistry * object_reg;
Deleted: trunk/src/apps/editor/gui/iaMainFrame.cpp
===================================================================
--- trunk/src/apps/editor/gui/iaMainFrame.cpp 2007-10-08 11:40:28 UTC (rev 342)
+++ trunk/src/apps/editor/gui/iaMainFrame.cpp 2007-10-08 11:59:12 UTC (rev 343)
@@ -1,521 +0,0 @@
-/*
-Copyright (C) 2005 - 2007 by Piotr Obrzut and Valentin Vit
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free
-Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "ia_mainframe.h"
-#endif
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
-
-////@begin includes
-#include <cssysdef.h>
-#include "../iaCSApplication.h"
-//#include "csutil/cscolor.h"
-//#include "cstool/csview.h"
-//#include "ivideo/graph3d.h"
-//#include "ivideo/graph2d.h"
-//#include "ivideo/wxwin.h"
-
-#include <wx/dc.h>
-#include <wx/filedlg.h>
-#include <wx/laywin.h>
-
-#include "widgets/iaObjectTree.h"
-#include "widgets/iaPropertyGrid.h"
-#include "widgets/iaPropertySheet.h"
-#include "widgets/iaSimulationPanel.h"
-#include <string>
-
-#include "editor.h"
-#include "iaMainFrame.h"
-
-IMPLEMENT_CLASS(iaMainFrame, wxFrame)
-/*!
-* iaMainFrame event table definition
-*/
-BEGIN_EVENT_TABLE(iaMainFrame, wxFrame)
-//EVT_LEFT_DOWN(iaMainFrame::OnMouse)
-//EVT_LEFT_DCLICK(iaMainFrame::OnMouse)
-
-EVT_SIZE(iaMainFrame::OnSize)
-
-EVT_MENU(IA_MENUITEM_ATTACH_BODY, iaMainFrame::OnAttachBodyMenuItem)
-EVT_MENU(IA_MENUITEM_ATTACH_SPHERE_COLLIDER, iaMainFrame::OnAttachSphereColliderMenuItem)
-EVT_MENU(IA_MENUITEM_ATTACH_BOX_COLLIDER, iaMainFrame::OnAttachBoxColliderMenuItem)
-EVT_MENU(IA_MENUITEM_ATTACH_CAPSULE_COLLIDER, iaMainFrame::OnAttachCapsuleColliderMenuItem)
-EVT_MENU(IA_MENUITEM_ATTACH_JOINT, iaMainFrame::OnAttachJointMenuItem)
-EVT_MENU(ID_MENUITEM_LOAD, iaMainFrame::OnLoadMenuItem)
-EVT_MENU(ID_MENUITEM_SAVE, iaMainFrame::OnSaveMenuItem)
-EVT_MENU(ID_MENUITEM_NEW_PROJECT, iaMainFrame::OnNewProjectMenuItem)
-EVT_MENU(ID_MENUITEM_LOAD_PROJECT, iaMainFrame::OnLoadProjectMenuItem)
-EVT_MENU(ID_MENUITEM_SAVE_AS, iaMainFrame::OnSaveAsMenuItem)
-EVT_MENU(ID_MENUITEM_EXIT, iaMainFrame::OnExitMenuItem)
-EVT_MENU(IA_MENUITEM_DELETE, iaMainFrame::OnDelete)
-EVT_MENU(IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER, iaMainFrame::OnAttachScriptedControllerMenuItem)
-EVT_MENU(ID_MENUITEM_DRAW_WIREFRAME, iaMainFrame::OnDrawWireFrame)
-EVT_MENU(ID_MENUITEM_SHOW_COLLIDERS, iaMainFrame::OnShowColliders)
-EVT_MENU(ID_MENUITEM_SHOW_JOINTS, iaMainFrame::OnShowJoints)
-EVT_MENU(ID_MENUITEM_SHOW_BONES, iaMainFrame::OnShowBones)
-EVT_MENU(ID_MENUITEM_SHOW_BODIES, iaMainFrame::OnShowBodies)
-EVT_MENU(ID_MENUITEM_SHOW_CHARACTERS, iaMainFrame::OnShowCharacters)
-
-EVT_TOOL(ID_TOOL_ATTACH_CAPSULE_COLLIDER, iaMainFrame::OnAttachCapsuleColliderMenuItem)
-EVT_TOOL(ID_TOOL_ATTACH_BOX_COLLIDER, iaMainFrame::OnAttachBoxColliderMenuItem)
-EVT_TOOL(ID_TOOL_ATTACH_SPHERE_COLLIDER, iaMainFrame::OnAttachSphereColliderMenuItem)
-EVT_TOOL(ID_TOOL_CONTROLLER, iaMainFrame::OnAttachScriptedControllerMenuItem)
-EVT_TOOL(ID_TOOL_SAVE, iaMainFrame::OnSaveMenuItem)
-EVT_TOOL(ID_TOOL_IMPORT, iaMainFrame::OnLoadProjectMenuItem)
-
-END_EVENT_TABLE()
-
-iaMainFrame *m_mainfrm;
-
-iaMainFrame::~iaMainFrame()
-{
- central_info->Get3dView ()->ShutDown ();
- aui_mgr.UnInit();
-}
-
-iaMainFrame::iaMainFrame()
-{
- m_mainfrm = this;
-}
-
-iaMainFrame::iaMainFrame(iEditorCentralInfo* info, wxWindow* parent,
- const wxWindowID id, const wxString& title, const wxPoint& pos,
- const wxSize& size, const long style)
-{
- central_info = info;
- m_mainfrm = this;
- central_info->GetObjectsInfo ()->AddListener ((iaBaseObjectListener*)this);
- SetMinSize(wxSize(400,300));
-}
-
-bool iaMainFrame::Create(wxWindow* parent, wxWindowID id, const wxString& caption,
- const wxPoint& pos, const wxSize& size, long style)
-{
- pnl_3dview = NULL;
- wxFrame::Create (parent, id, caption, pos, size, style);
-
- if (!CreateControls ())
- return false;
-
- pnl_3dview->SetFocus ();
-
- Centre ();
-
- return true;
-}
-
-void iaMainFrame::ObjectSelected (iEditorObject *obj)
-{
- bool can_delete = true;
- for (size_t i = 0; i < central_info->GetObjectsInfo ()->GetSelectedObjectsCount (); i++)
- {
- if (!central_info->GetObjectsInfo ()->GetSelectedObject (i)->CanBeDeleted ())
- can_delete = false;
- }
- itemMenuEdit->Enable (IA_MENUITEM_DELETE, can_delete);
-
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BODY, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BOX_COLLIDER, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_JOINT, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER, false);
-
- if (central_info->GetObjectsInfo ()->GetSelectedObjectsCount () == 1)
- {
- iEditorObject *obj = central_info->GetObjectsInfo ()->GetSelectedObject (0);
- if (obj->CanAttach (IA_OBJECT_TYPE_BODY))
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BODY, true);
- if (obj->CanAttach (IA_OBJECT_TYPE_COLLIDER))
- {
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, true);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BOX_COLLIDER, true);
- }
- if (obj->CanAttach (IA_OBJECT_TYPE_CONTROLLER))
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER, true);
-
- }else if(central_info->GetObjectsInfo ()->GetSelectedObjectsCount () == 2)
- {
- iEditorObject *obj1 = central_info->GetObjectsInfo ()->GetSelectedObject (0);
- iEditorObject *obj2 = central_info->GetObjectsInfo ()->GetSelectedObject (1);
- if (obj1->CanAttach (IA_OBJECT_TYPE_JOINT) && obj2->CanAttach (IA_OBJECT_TYPE_JOINT))
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_JOINT, true);
- }
-
-}
-void iaMainFrame::ObjectRemoved (iEditorObject *obj)
-{
-}
-void iaMainFrame::UpdatePane (wxWindow *wnd)
-{
- aui_mgr.GetPane (wnd).BestSize (wnd->GetSize ());
- aui_mgr.InsertPane (wnd, aui_mgr.GetPane (wnd), wxAUI_INSERT_DOCK);
- aui_mgr.Update ();
-}
-void iaMainFrame::ObjectAdded (iEditorObject *obj)
-{
-}
-void iaMainFrame::ObjectChanged (iEditorObject *obj, iEditorObjectProperty* prop)
-{
-}
-
-/*!
-* Control creation for ia_MainFrame
-*/
-bool iaMainFrame::CreateControls()
-{
- aui_mgr.SetManagedWindow (this);
-
- wxString icons_path = wxString (central_info->GetIconsPath ().c_str (), wxConvUTF8);
- if (icons_path.Cmp (_T("")) == 0)
- return false;
-
- //menu and statusbar
- iaMainFrame* itemFrame1 = this;
-
- wxMenuBar* menuBar = new wxMenuBar;
- wxMenu* itemMenu5 = new wxMenu;
- itemMenu5->Append (ID_MENUITEM_NEW_PROJECT, _("New Project...\tCTRL+N"), _T(""), wxITEM_NORMAL);
- itemMenu5->Append (ID_MENUITEM_LOAD_PROJECT, _("Load Project...\tCTRL+L"), _T(""), wxITEM_NORMAL);
- //itemMenu5->Append (ID_MENUITEM_LOAD, _("Load..."), _T(""), wxITEM_NORMAL);
- itemMenu5->Append (ID_MENUITEM_SAVE, _("Save Project\tCTRL+S"), _T(""), wxITEM_NORMAL);
- //itemMenu5->Append (ID_MENUITEM_SAVE_AS, _("Save As..."), _T(""), wxITEM_NORMAL);
- itemMenu5->Append(ID_MENUITEM_EXIT, _("Exit\tCTRL+X"), _T(""), wxITEM_NORMAL);
- menuBar->Append(itemMenu5, _("File"));
- itemMenuEdit = new wxMenu;
- itemMenuEdit->Append (IA_MENUITEM_DELETE, _("Delete\tDel"), _T(""), wxITEM_NORMAL);
- menuBar->Append(itemMenuEdit, _("Edit"));
- wxMenu* itemMenuView = new wxMenu;
- menuBar->Append(itemMenuView, _("View"));
- itemMenuView->Append (ID_MENUITEM_DRAW_WIREFRAME, _("Draw wireframe"), _T(""), wxITEM_CHECK);
- itemMenuView->Append (ID_MENUITEM_SHOW_BONES, _("Show Bones"), _T(""), wxITEM_CHECK);
- itemMenuView->Check (ID_MENUITEM_SHOW_BONES, true);
- itemMenuView->Append (ID_MENUITEM_SHOW_COLLIDERS, _("Show Colliders"), _T(""), wxITEM_CHECK);
- itemMenuView->Check (ID_MENUITEM_SHOW_COLLIDERS, true);
- itemMenuView->Append (ID_MENUITEM_SHOW_JOINTS, _("Show Joints"), _T(""), wxITEM_CHECK);
- itemMenuView->Check (ID_MENUITEM_SHOW_JOINTS, true);
- itemMenuView->Append (ID_MENUITEM_SHOW_BODIES, _("Show Bodies"), _T(""), wxITEM_CHECK);
- itemMenuView->Check (ID_MENUITEM_SHOW_BODIES, true);
- itemMenuView->Append (ID_MENUITEM_SHOW_CHARACTERS, _("Show Characters"), _T(""), wxITEM_CHECK);
- itemMenuView->Check (ID_MENUITEM_SHOW_CHARACTERS, true);
-
- itemMenuAttach = new wxMenu;
- itemMenuAttach->Append (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, _("Attach Sphere Collider..."),
- _T(""),wxITEM_NORMAL);
- itemMenuAttach->Append (IA_MENUITEM_ATTACH_BOX_COLLIDER, _("Attach Box Collider..."),
- _T(""),wxITEM_NORMAL);
- itemMenuAttach->Append (IA_MENUITEM_ATTACH_BODY, _("Attach Body...\tCTRL+B"), _T(""), wxITEM_NORMAL);
- itemMenuAttach->Append (IA_MENUITEM_ATTACH_JOINT, _("Attach Joint...\tCTRL+J"), _T(""), wxITEM_NORMAL);
- itemMenuAttach->Append (IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER,
- _("Attach Scripted Controler...\tCTRL+C"), _T(""), wxITEM_NORMAL);
- menuBar->Append (itemMenuAttach, _("Attach"));
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, false);
-
- wxMenu* itemMenu13 = new wxMenu;
- itemMenu13->Append (ID_MENUITEM2, _("About"), _T(""), wxITEM_NORMAL);
- menuBar->Append (itemMenu13, _("Help"));
- itemFrame1->SetMenuBar (menuBar);
-
- wxStatusBar* itemStatusBar2 = new wxStatusBar (itemFrame1, ID_STATUSBAR,
- wxST_SIZEGRIP | wxNO_BORDER);
- itemStatusBar2->SetFieldsCount (2);
- itemFrame1->SetStatusBar (itemStatusBar2);
- //end menu and statusbar
-
- //toolbar
- wxInitAllImageHandlers ();
- wxToolBar* tb1 = CreateToolBar (wxTB_FLAT | wxTB_HORIZONTAL, ID_TOOLBAR);
- tb1->SetToolBitmapSize (wxSize(32, 32));
-
- tb1->AddSeparator();
-
- wxBitmap itemtool2Bitmap (icons_path + _T("Icon_save.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool2BitmapDisabled (icons_path + _T("Icon_save_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_SAVE, _T(""), itemtool2Bitmap, itemtool2BitmapDisabled, wxITEM_NORMAL,
- _T(""), wxT("Save project"));
-
- wxBitmap itemtool3Bitmap (icons_path + _T("Icon_import.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool3BitmapDisabled (icons_path + _T("Icon_import_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_IMPORT, _T(""), itemtool3Bitmap, itemtool3BitmapDisabled, wxITEM_NORMAL,
- _T(""), wxT("Load Project"));
-
-#if 0
- wxBitmap itemtool4Bitmap (icons_path + _T("Icon_export.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool4BitmapDisabled (icons_path + _T ("Icon_export_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_EXPORT, _T(""), itemtool4Bitmap, itemtool4BitmapDisabled, wxITEM_NORMAL,
- _T(""), wxT("Export physics (currently not avaible)"));
-#endif
-
- tb1->AddSeparator();
-#if 0
- wxBitmap itemtool5Bitmap (icons_path + _T("Icon_move.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool5BitmapDisabled (icons_path + _T ("Icon_move_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_MOVE, _T(""), itemtool5Bitmap, itemtool5BitmapDisabled, wxITEM_NORMAL, _T(""),
- wxT("Move Object (currently not avaible)"));
-
- wxBitmap itemtool6Bitmap (icons_path + _T("Icon_rotate.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool6BitmapDisabled (icons_path + _T("Icon_rotate_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_ROTATE, _T(""), itemtool6Bitmap, itemtool6BitmapDisabled, wxITEM_NORMAL, _T(""),
- wxT("Rotate Object (currently not avaible)"));
-
- tb1->AddSeparator();
-
- wxBitmap itemtool7Bitmap (icons_path + _T ("Icon_movebody.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool7BitmapDisabled (icons_path + _T("Icon_movebody_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_MOVE_BODY, _T(""), itemtool7Bitmap, itemtool7BitmapDisabled,
- wxITEM_NORMAL, _T(""), wxT("Move rigid body (currently not avaible)"));
-
- wxBitmap itemtool8Bitmap (icons_path + _T("Icon_rotatebody.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool8BitmapDisabled (icons_path + _T("Icon_rotatebody_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_ROTATE_BODY, _T(""), itemtool8Bitmap, itemtool8BitmapDisabled, wxITEM_NORMAL,
- _T(""), wxT("Rotate rigid body (currently not avaible)"));
-
- tb1->AddSeparator();
-
- wxBitmap itemtool9Bitmap (icons_path + _T("Icon_rag.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool9BitmapDisabled (icons_path + _T("Icon_rag_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_CREATE_CHAR, _T(""), itemtool9Bitmap, itemtool9BitmapDisabled, wxITEM_NORMAL,
- _T(""), wxT("Create character from given model"));
-#endif
-
- wxBitmap itemtool10Bitmap (icons_path + _T("Icon_cube.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool10BitmapDisabled (icons_path + _T("Icon_cube_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_ATTACH_BOX_COLLIDER, _T(""), itemtool10Bitmap, itemtool10BitmapDisabled,
- wxITEM_NORMAL, _T(""), wxT("Attach box collider"));
-
- wxBitmap itemtool11Bitmap (icons_path + _T ("Icon_cilinder.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool11BitmapDisabled(icons_path + _T ("Icon_cilinder_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool(ID_TOOL_ATTACH_CAPSULE_COLLIDER, _T(""), itemtool11Bitmap, itemtool11BitmapDisabled,
- wxITEM_NORMAL, _T(""), wxT("Attach cilinder collider"));
-
- wxBitmap itemtool12Bitmap (icons_path + _T ("Icon_sphere.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool12BitmapDisabled (icons_path + _T("Icon_sphere_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_ATTACH_SPHERE_COLLIDER, _T(""), itemtool12Bitmap, itemtool12BitmapDisabled,
- wxITEM_NORMAL, _T(""), wxT("Attach sphere collider"));
-
-#if 0
- wxBitmap itemtool16Bitmap (icons_path + _T("Icon_animation.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool16BitmapDisabled (icons_path + _T("Icon_animation_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_ANIMATION, _T(""), itemtool16Bitmap, itemtool16BitmapDisabled, wxITEM_NORMAL,
- _T(""), wxT("Animation tool (not avaible yet)"));
-
- wxBitmap itemtool17Bitmap (icons_path + _T("Icon_force.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool17BitmapDisabled (icons_path + _T("Icon_force_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_FORCE, _T(""), itemtool17Bitmap, itemtool17BitmapDisabled, wxITEM_NORMAL,
- _T(""), wxT("Create force (not avaible yet)"));
-#endif
-
- wxBitmap itemtool18Bitmap (icons_path + _T("Icon_controler.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool18BitmapDisabled (icons_path + _T("Icon_controler_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool (ID_TOOL_CONTROLLER, _T(""),
- itemtool18Bitmap, itemtool18BitmapDisabled, wxITEM_NORMAL, _T(""), wxT("Attach controller"));
-
- tb1->AddSeparator();
-
-#if 0
- wxBitmap itemtool19Bitmap(icons_path + _T("Icon_camera.png"), wxBITMAP_TYPE_PNG);
- wxBitmap itemtool19BitmapDisabled(icons_path + _T("Icon_camera_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool(ID_TOOL_CAMERA, _T(""), itemtool19Bitmap, itemtool19BitmapDisabled, wxITEM_NORMAL, _T(""),
- wxT("Record (not avaible yet)"));
-
- tb1->AddSeparator();
-#endif
-
- itemMenuEdit->Enable (IA_MENUITEM_DELETE, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BODY, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BOX_COLLIDER, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_JOINT, false);
- itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER, false);
-
- tb1->Realize();
- itemFrame1->SetToolBar (tb1);
- //end toolbar
-
- sim_panel = new iaSimulationPanel (central_info, this, ID_SIMULATION_PANEL,
- wxDefaultPosition, wxSize(GetSize().x, 115), wxNO_BORDER | wxTAB_TRAVERSAL);
- sim_panel->SetBackgroundColour (wxColor (255, 255, 255));
- sim_panel->CreateControls ();
-
- //the tree
- objtree = new iaObjectTree (central_info, this, ID_OBJECTS_TREE_PANEL, wxDefaultPosition, wxSize(200, 63),
- wxNO_BORDER | wxTAB_TRAVERSAL, icons_path);
- objtree->SetBackgroundColour (wxColor (255, 255, 255));
-
- //3dview
- pnl_3dview = new wxPanel (this, ID_PANEL, wxDefaultPosition, wxSize(131, 63),
- wxSUNKEN_BORDER | wxTAB_TRAVERSAL);
- pnl_3dview->SetBackgroundColour(wxColour(0, 0, 128));
-
- //pnl right ->propgrid
- iaPropertyGrid* propEditor = new iaPropertyGrid (central_info, this, -1, wxPoint(3, 3),
- wxSize(131, 63), wxPG_BOLD_MODIFIED | wxPG_SPLITTER_AUTO_CENTER | wxPG_AUTO_SORT | wxTOP |
- wxTAB_TRAVERSAL| wxPG_BOOL_USE_CHECKBOX);
- propEditor->SetMarginColour (wxColor (122, 110, 90));
- propEditor->SetLineColour (wxColor (0,0,0));
- propEditor->SetCaptionBackgroundColour (wxColor (122, 110, 90));
- propEditor->SetCaptionForegroundColour (wxColor (0,0,0));
- //propEditor->SetCellBackgroundColour (wxColor (122, 110, 90));
-
- aui_mgr.AddPane (sim_panel, wxAuiPaneInfo ().Name (
- wxT ("pnl_bottom")).Caption (wxT ("Simulation")).Bottom());
-
- aui_mgr.AddPane(objtree, wxAuiPaneInfo ().Name (wxT ("objtree")).Caption (
- wxT ("Objects Tree")).Left());
-
- aui_mgr.AddPane (propEditor, wxAuiPaneInfo ().Name (wxT ("properties")).Caption (
- wxT ("Properties")).Right());
-
- aui_mgr.AddPane (pnl_3dview, wxCENTER);
-
- aui_mgr.Update ();
-
- return true;
-}
-
-bool iaMainFrame::ShowToolTips()
-{
- return true;
-}
-
-wxBitmap iaMainFrame::GetBitmapResource(const wxString& name)
-{
- // Bitmap retrieval
- ////@begin iaMainFrame bitmap retrieval
- wxUnusedVar(name);
- return wxNullBitmap;
- ////@end iaMainFrame bitmap retrieval
-}
-void iaMainFrame::OnShowColliders (wxCommandEvent& event)
-{
- central_info->Get3dView ()->Show (IA_OBJECT_TYPE_COLLIDER, event.IsChecked ());
-}
-void iaMainFrame::OnShowJoints (wxCommandEvent& event)
-{
- central_info->Get3dView ()->Show (IA_OBJECT_TYPE_JOINT, event.IsChecked ());
-}
-void iaMainFrame::OnShowBones (wxCommandEvent& event)
-{
- central_info->Get3dView ()->Show (IA_OBJECT_TYPE_BONE, event.IsChecked ());
-}
-void iaMainFrame::OnDrawWireFrame (wxCommandEvent& event)
-{
- central_info->Get3dView ()->DisplayWireframe (event.IsChecked ());
-}
-void iaMainFrame::OnShowBodies (wxCommandEvent& event)
-{
- central_info->Get3dView ()->Show (IA_OBJECT_TYPE_BODY, event.IsChecked ());
-}
-void iaMainFrame::OnShowCharacters (wxCommandEvent& event)
-{
- central_info->Get3dView ()->Show (IA_OBJECT_TYPE_CHARACTER, event.IsChecked ());
-}
-wxIcon iaMainFrame::GetIconResource(const wxString& name)
-{
- // Icon retrieval
- ////@begin iaMainFrame icon retrieval
- wxUnusedVar(name);
- return wxNullIcon;
- ////@end iaMainFrame icon retrieval
-}
-void iaMainFrame::OnLoadMenuItem ( wxCommandEvent& event )
-{
- //wxFileDialog ofd (m_mainfrm, "Load file", central_info->GetProjectPath ().c_str (), "", "*.*", wxOPEN);
- //if (ofd.ShowModal () == wxID_OK)
- //{
- // central_info->LoadObject (ofd.GetFilename ().c_str (),ofd.GetDirectory ().c_str ());
- //}
-}
-void iaMainFrame::OnDelete (wxCommandEvent& event)
-{
- central_info->GetObjectsInfo ()->DeleteSelected ();
-}
-void iaMainFrame::OnSaveMenuItem ( wxCommandEvent& event )
-{
- central_info->SaveProject ();
-}
-void iaMainFrame::OnLoadProjectMenuItem (wxCommandEvent& event)
-{
- wxFileDialog pfd (m_mainfrm, _T("Choose project file"),
- wxString (central_info->GetProjectPath ().c_str (), wxConvUTF8), _T(""), _T("*.iaprj"), wxOPEN);
- if (pfd.ShowModal () == wxID_OK)
- {
- central_info->LoadProject (pfd.GetFilename ().mb_str (), pfd.GetDirectory ().mb_str ());
- }
-}
-void iaMainFrame::OnAttachScriptedControllerMenuItem (wxCommandEvent& event)
-{
- OnAttachScriptedController (this);
-}
-void iaMainFrame::OnAttachJointMenuItem (wxCommandEvent& event)
-{
- OnAttachJoint ();
-}
-void iaMainFrame::OnAttachBodyMenuItem (wxCommandEvent& event)
-{
- OnAttachBody ();
-}
-void iaMainFrame::OnAttachCapsuleColliderMenuItem (wxCommandEvent& event)
-{
- OnAttachCapsuleCollider ();
-}
-void iaMainFrame::OnAttachSphereColliderMenuItem (wxCommandEvent& event)
-{
- OnAttachSphereCollider ();
-}
-void iaMainFrame::OnAttachBoxColliderMenuItem (wxCommandEvent& event)
-{
- OnAttachBoxCollider ();
-}
-void iaMainFrame::OnNewProjectMenuItem (wxCommandEvent& event)
-{
- wxFileDialog wfd (m_mainfrm, _T("Choose world file"),
- wxString (central_info->GetProjectPath ().c_str (), wxConvUTF8), _T(""), _T("*.*"), wxOPEN);
- if (wfd.ShowModal () == wxID_OK)
- {
- central_info->NewProject (wfd.GetFilename ().mb_str (),wfd.GetDirectory ().mb_str ());
- }
-}
-void iaMainFrame::OnExitMenuItem (wxCommandEvent& event)
-{
- m_mainfrm->Close();
-}
-void iaMainFrame::OnSaveAsMenuItem ( wxCommandEvent& event )
-{
- event.Skip();
-}
-void iaMainFrame::OnSize(wxSizeEvent& event)
-{
- if (m_mainfrm->pnl_3dview)
- {
- central_info->Get3dView ()->SetSize (m_mainfrm->pnl_3dview->GetClientSize().x,
- m_mainfrm->pnl_3dview->GetClientSize().y);
- }
- event.Skip();
-}
-
Deleted: trunk/src/apps/editor/gui/iaMainFrame.h
===================================================================
--- trunk/src/apps/editor/gui/iaMainFrame.h 2007-10-08 11:40:28 UTC (rev 342)
+++ trunk/src/apps/editor/gui/iaMainFrame.h 2007-10-08 11:59:12 UTC (rev 343)
@@ -1,185 +0,0 @@
-/*
-Copyright (C) 2005 - 2007 by Piotr Obrzut and Valentin Vit
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free
-Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-
-#ifndef _IA_MAINFRAME_H_
-#define _IA_MAINFRAME_H_
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "ia_mainframe.h"
-#endif
-
-
-#include <wx/statusbr.h>
-#include <wx/laywin.h>
-#include <wx/intl.h>
-
-#include "editor.h"
-#include "ia-tool/iaObjectsManager.h"
-#include "ia-tool/iaBaseObjectListener.h"
-#include <wx/aui/aui.h>
-
-
-
-////@begin control identifiers
-#define ID_FRAME 10000
-#define SYMBOL_IAMAINFRAME_STYLE wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE | wxHSCROLL | wxVSCROLL
-#define SYMBOL_IAMAINFRAME_TITLE _("iaMainFrame")
-#define SYMBOL_IAMAINFRAME_IDNAME ID_FRAME
-#define SYMBOL_IAMAINFRAME_SIZE wxSize(300, 300)
-#define SYMBOL_IAMAINFRAME_POSITION wxPoint(10, 10)
-#define ID_STATUSBAR 10001
-#define ID_PANEL 10002
-#define ID_MENUITEM1 10008
-#define ID_MENU 10006
-#define ID_MENUITEM 10007
-#define ID_MENUITEM2 10009
-#define ID_MENUITEM_SAVE 10010
-#define ID_MENUITEM_SAVE_AS 10011
-#define ID_MENUITEM_LOAD 10012
-#define ID_TOOLBAR 10004
-#define ID_PANEL 10002
-#define ID_SIMULATION_PANEL 10019
-#define ID_OBJECTS_TREE_PANEL 10020
-#define ID_PANEL7 10024
-#define ID_TOOLBAR2 10025
-//#define ID_MENUITEM_CREATE_RAGDOLL 10023
-#define ID_MENUITEM_NEW_PROJECT 10027
-#define ID_MENUITEM_LOAD_PROJECT 10028
-#define ID_MENUITEM_EXIT 10029
-#define ID_TOOL_SAVE 10032
-#define ID_TOOL_IMPORT 10033
-#define ID_TOOL_EXPORT 10034
-#define ID_TOOL_MOVE 10035
-#define ID_TOOL_ROTATE 10036
-#define ID_TOOL_MOVE_BODY 10037
-#define ID_TOOL_ROTATE_BODY 10038
-#define ID_TOOL_CREATE_CHAR 10039
-#define ID_TOOL_ATTACH_BOX_COLLIDER 10040
-#define ID_TOOL_ATTACH_CILINDER_COLLIDER 10041
-#define ID_TOOL_ATTACH_SPHERE_COLLIDER 10042
-#define ID_TOOL_ANIMATION 10043
-#define ID_TOOL_FORCE 10044
-#define ID_TOOL_CONTROLLER 10045
-#define ID_TOOL_CAMERA 10045
-#define ID_MENUITEM_DRAW_WIREFRAME 10046
-#define ID_MENUITEM_SHOW_COLLIDERS 10047
-#define ID_MENUITEM_SHOW_BONES 10048
-#define ID_MENUITEM_SHOW_JOINTS 10049
-#define ID_MENUITEM_SHOW_BODIES 10050
-#define ID_MENUITEM_SHOW_CHARACTERS 10051
-#define ID_TOOL_ATTACH_CAPSULE_COLLIDER 10052
-////@end control identifiers
-
-/*!
-* Compatibility
-*/
-
-#ifndef wxCLOSE_BOX
-#define wxCLOSE_BOX 0x1000
-#endif
-
-
-struct iEditorObjectsInfo;
-class iaMainFrame;
-class iaObjectTree;
-class ObjectToolbarGUI;
-class iaSimulationPanel;
-
-/*!
-* iaMainFrame class declaration
-*/
-
-class iaMainFrame : public wxFrame, public iaObjectsManager, public iaBaseObjectListener
-{
- DECLARE_CLASS( iaMainFrame )
-
-public:
-
- wxAuiManager aui_mgr;
- wxPanel *pnl_3dview;
- wxBoxSizer *bxSz3Dview;
- iaObjectTree *objtree;
- iaSimulationPanel *sim_panel;
-
- wxMenu *itemMenuAttach;
- wxMenu *itemMenuEdit;
-
- wxPanel *pnl_controler;
- wxPanel *pnl_tlb;
- wxToolBar * tlb_bottom;
-
- iaMainFrame ();
- ~iaMainFrame ();
- //iaMainFrame(iaDataSubject *data,iaCSApplication *csApp,wxWindow* parent, wxWindowID id = SYMBOL_IAMAINFRAME_IDNAME, const wxString& caption = SYMBOL_IAMAINFRAME_TITLE, const wxPoint& pos = SYMBOL_IAMAINFRAME_POSITION, const wxSize& size = SYMBOL_IAMAINFRAME_SIZE, long style = SYMBOL_IAMAINFRAME_STYLE );
- iaMainFrame (iEditorCentralInfo* info,wxWindow *parent, const wxWindowID id,
- const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
-
- bool Create (wxWindow* parent, wxWindowID id = SYMBOL_IAMAINFRAME_IDNAME,
- const wxString& caption = SYMBOL_IAMAINFRAME_TITLE,
- const wxPoint& pos = SYMBOL_IAMAINFRAME_POSITION,
- const wxSize& size = SYMBOL_IAMAINFRAME_SIZE, long style = SYMBOL_IAMAINFRAME_STYLE );
-
- /// Creates the controls and sizers
- bool CreateControls();
- void UpdatePane (wxWindow *wnd);
-
- wxBitmap GetBitmapResource (const wxString& name );
- wxIcon GetIconResource (const wxString& name );
- /// Should we show tooltips?
- static bool ShowToolTips ();
-
- //events
- //void OnMouse ( wxMouseEvent& event );
- void OnAttachScriptedControllerMenuItem (wxCommandEvent& event);
- void OnAttachJointMenuItem (wxCommandEvent& event);
- void OnAttachBodyMenuItem (wxCommandEvent& event);
- void OnAttachSphereColliderMenuItem (wxCommandEvent& event);
- void OnAttachCapsuleColliderMenuItem (wxCommandEvent& event);
- void OnAttachBoxColliderMenuItem (wxCommandEvent& event);
-
- void OnSize (wxSizeEvent& event);
-
- void OnSaveAsMenuItem (wxCommandEvent& event);
- void OnSaveMenuItem (wxCommandEvent& event);
- void OnLoadMenuItem (wxCommandEvent& event);
- //void OnCreateRagdollMenuItem (wxCommandEvent& event);
- void OnNewProjectMenuItem (wxCommandEvent& event);
- void OnLoadProjectMenuItem (wxCommandEvent& event);
- void OnExitMenuItem (wxCommandEvent& event);
- void OnDelete (wxCommandEvent& event);
- void OnSortByType (wxCommandEvent& event);
- void OnDrawWireFrame (wxCommandEvent& event);
- void OnShowColliders (wxCommandEvent& event);
- void OnShowJoints (wxCommandEvent& event);
- void OnShowBones (wxCommandEvent& event);
- void OnShowBodies (wxCommandEvent& event);
- void OnShowCharacters (wxCommandEvent& event);
-
- void ObjectSelected (iEditorObject *obj);
- void ObjectRemoved (iEditorObject *obj);
- void ObjectAdded (iEditorObject *obj);
- void ObjectChanged (iEditorObject *obj, iEditorObjectProperty* prop);
-
- DECLARE_EVENT_TABLE()
-};
-
-
-#endif
-// _IA_MAINFRAME_H_
-
Added: trunk/src/apps/editor/gui/widgets/iaMainFrame.cpp
===================================================================
--- trunk/src/apps/editor/gui/widgets/iaMainFrame.cpp (rev 0)
+++ trunk/src/apps/editor/gui/widgets/iaMainFrame.cpp 2007-10-08 11:59:12 UTC (rev 343)
@@ -0,0 +1,516 @@
+/*
+Copyright (C) 2005 - 2007 by Piotr Obrzut and Valentin Vit
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with this library; if not, write to the Free
+Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma implementation "ia_mainframe.h"
+#endif
+
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#include "wx/wx.h"
+#endif
+
+////@begin includes
+#include <cssysdef.h>
+#include "../iaCSApplication.h"
+
+#include <wx/dc.h>
+#include <wx/filedlg.h>
+#include <wx/laywin.h>
+
+#include "widgets/iaObjectTree.h"
+#include "widgets/iaPropertyGrid.h"
+#include "widgets/iaPropertySheet.h"
+#include "widgets/iaSimulationPanel.h"
+#include <string>
+
+#include "editor.h"
+#include "iaMainFrame.h"
+
+IMPLEMENT_CLASS(iaMainFrame, wxFrame)
+/*!
+* iaMainFrame event table definition
+*/
+BEGIN_EVENT_TABLE(iaMainFrame, wxFrame)
+//EVT_LEFT_DOWN(iaMainFrame::OnMouse)
+//EVT_LEFT_DCLICK(iaMainFrame::OnMouse)
+
+EVT_SIZE(iaMainFrame::OnSize)
+
+EVT_MENU(IA_MENUITEM_ATTACH_BODY, iaMainFrame::OnAttachBodyMenuItem)
+EVT_MENU(IA_MENUITEM_ATTACH_SPHERE_COLLIDER, iaMainFrame::OnAttachSphereColliderMenuItem)
+EVT_MENU(IA_MENUITEM_ATTACH_BOX_COLLIDER, iaMainFrame::OnAttachBoxColliderMenuItem)
+EVT_MENU(IA_MENUITEM_ATTACH_CAPSULE_COLLIDER, iaMainFrame::OnAttachCapsuleColliderMenuItem)
+EVT_MENU(IA_MENUITEM_ATTACH_JOINT, iaMainFrame::OnAttachJointMenuItem)
+EVT_MENU(ID_MENUITEM_LOAD, iaMainFrame::OnLoadMenuItem)
+EVT_MENU(ID_MENUITEM_SAVE, iaMainFrame::OnSaveMenuItem)
+EVT_MENU(ID_MENUITEM_NEW_PROJECT, iaMainFrame::OnNewProjectMenuItem)
+EVT_MENU(ID_MENUITEM_LOAD_PROJECT, iaMainFrame::OnLoadProjectMenuItem)
+EVT_MENU(ID_MENUITEM_SAVE_AS, iaMainFrame::OnSaveAsMenuItem)
+EVT_MENU(ID_MENUITEM_EXIT, iaMainFrame::OnExitMenuItem)
+EVT_MENU(IA_MENUITEM_DELETE, iaMainFrame::OnDelete)
+EVT_MENU(IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER, iaMainFrame::OnAttachScriptedControllerMenuItem)
+EVT_MENU(ID_MENUITEM_DRAW_WIREFRAME, iaMainFrame::OnDrawWireFrame)
+EVT_MENU(ID_MENUITEM_SHOW_COLLIDERS, iaMainFrame::OnShowColliders)
+EVT_MENU(ID_MENUITEM_SHOW_JOINTS, iaMainFrame::OnShowJoints)
+EVT_MENU(ID_MENUITEM_SHOW_BONES, iaMainFrame::OnShowBones)
+EVT_MENU(ID_MENUITEM_SHOW_BODIES, iaMainFrame::OnShowBodies)
+EVT_MENU(ID_MENUITEM_SHOW_CHARACTERS, iaMainFrame::OnShowCharacters)
+
+EVT_TOOL(ID_TOOL_ATTACH_CAPSULE_COLLIDER, iaMainFrame::OnAttachCapsuleColliderMenuItem)
+EVT_TOOL(ID_TOOL_ATTACH_BOX_COLLIDER, iaMainFrame::OnAttachBoxColliderMenuItem)
+EVT_TOOL(ID_TOOL_ATTACH_SPHERE_COLLIDER, iaMainFrame::OnAttachSphereColliderMenuItem)
+EVT_TOOL(ID_TOOL_CONTROLLER, iaMainFrame::OnAttachScriptedControllerMenuItem)
+EVT_TOOL(ID_TOOL_SAVE, iaMainFrame::OnSaveMenuItem)
+EVT_TOOL(ID_TOOL_IMPORT, iaMainFrame::OnLoadProjectMenuItem)
+
+END_EVENT_TABLE()
+
+iaMainFrame *m_mainfrm;
+
+iaMainFrame::~iaMainFrame()
+{
+ central_info->Get3dView ()->ShutDown ();
+ aui_mgr.UnInit();
+}
+
+iaMainFrame::iaMainFrame()
+{
+ m_mainfrm = this;
+}
+
+iaMainFrame::iaMainFrame(iEditorCentralInfo* info, wxWindow* parent,
+ const wxWindowID id, const wxString& title, const wxPoint& pos,
+ const wxSize& size, const long style)
+{
+ central_info = info;
+ m_mainfrm = this;
+ central_info->GetObjectsInfo ()->AddListener ((iaBaseObjectListener*)this);
+ SetMinSize(wxSize(400,300));
+}
+
+bool iaMainFrame::Create(wxWindow* parent, wxWindowID id, const wxString& caption,
+ const wxPoint& pos, const wxSize& size, long style)
+{
+ pnl_3dview = NULL;
+ wxFrame::Create (parent, id, caption, pos, size, style);
+
+ if (!CreateControls ())
+ return false;
+
+ pnl_3dview->SetFocus ();
+
+ Centre ();
+
+ return true;
+}
+
+void iaMainFrame::ObjectSelected (iEditorObject *obj)
+{
+ bool can_delete = true;
+ for (size_t i = 0; i < central_info->GetObjectsInfo ()->GetSelectedObjectsCount (); i++)
+ {
+ if (!central_info->GetObjectsInfo ()->GetSelectedObject (i)->CanBeDeleted ())
+ can_delete = false;
+ }
+ itemMenuEdit->Enable (IA_MENUITEM_DELETE, can_delete);
+
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BODY, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BOX_COLLIDER, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_JOINT, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER, false);
+
+ if (central_info->GetObjectsInfo ()->GetSelectedObjectsCount () == 1)
+ {
+ iEditorObject *obj = central_info->GetObjectsInfo ()->GetSelectedObject (0);
+ if (obj->CanAttach (IA_OBJECT_TYPE_BODY))
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BODY, true);
+ if (obj->CanAttach (IA_OBJECT_TYPE_COLLIDER))
+ {
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, true);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BOX_COLLIDER, true);
+ }
+ if (obj->CanAttach (IA_OBJECT_TYPE_CONTROLLER))
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER, true);
+
+ }else if(central_info->GetObjectsInfo ()->GetSelectedObjectsCount () == 2)
+ {
+ iEditorObject *obj1 = central_info->GetObjectsInfo ()->GetSelectedObject (0);
+ iEditorObject *obj2 = central_info->GetObjectsInfo ()->GetSelectedObject (1);
+ if (obj1->CanAttach (IA_OBJECT_TYPE_JOINT) && obj2->CanAttach (IA_OBJECT_TYPE_JOINT))
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_JOINT, true);
+ }
+
+}
+void iaMainFrame::ObjectRemoved (iEditorObject *obj)
+{
+}
+void iaMainFrame::UpdatePane (wxWindow *wnd)
+{
+ aui_mgr.GetPane (wnd).BestSize (wnd->GetSize ());
+ aui_mgr.InsertPane (wnd, aui_mgr.GetPane (wnd), wxAUI_INSERT_DOCK);
+ aui_mgr.Update ();
+}
+void iaMainFrame::ObjectAdded (iEditorObject *obj)
+{
+}
+void iaMainFrame::ObjectChanged (iEditorObject *obj, iEditorObjectProperty* prop)
+{
+}
+
+/*!
+* Control creation for ia_MainFrame
+*/
+bool iaMainFrame::CreateControls()
+{
+ aui_mgr.SetManagedWindow (this);
+
+ wxString icons_path = wxString (central_info->GetIconsPath ().c_str (), wxConvUTF8);
+ if (icons_path.Cmp (_T("")) == 0)
+ return false;
+
+ //menu and statusbar
+ iaMainFrame* itemFrame1 = this;
+
+ wxMenuBar* menuBar = new wxMenuBar;
+ wxMenu* itemMenu5 = new wxMenu;
+ itemMenu5->Append (ID_MENUITEM_NEW_PROJECT, _("New Project...\tCTRL+N"), _T(""), wxITEM_NORMAL);
+ itemMenu5->Append (ID_MENUITEM_LOAD_PROJECT, _("Load Project...\tCTRL+L"), _T(""), wxITEM_NORMAL);
+ //itemMenu5->Append (ID_MENUITEM_LOAD, _("Load..."), _T(""), wxITEM_NORMAL);
+ itemMenu5->Append (ID_MENUITEM_SAVE, _("Save Project\tCTRL+S"), _T(""), wxITEM_NORMAL);
+ //itemMenu5->Append (ID_MENUITEM_SAVE_AS, _("Save As..."), _T(""), wxITEM_NORMAL);
+ itemMenu5->Append(ID_MENUITEM_EXIT, _("Exit\tCTRL+X"), _T(""), wxITEM_NORMAL);
+ menuBar->Append(itemMenu5, _("File"));
+ itemMenuEdit = new wxMenu;
+ itemMenuEdit->Append (IA_MENUITEM_DELETE, _("Delete\tDel"), _T(""), wxITEM_NORMAL);
+ menuBar->Append(itemMenuEdit, _("Edit"));
+ wxMenu* itemMenuView = new wxMenu;
+ menuBar->Append(itemMenuView, _("View"));
+ itemMenuView->Append (ID_MENUITEM_DRAW_WIREFRAME, _("Draw wireframe"), _T(""), wxITEM_CHECK);
+ itemMenuView->Append (ID_MENUITEM_SHOW_BONES, _("Show Bones"), _T(""), wxITEM_CHECK);
+ itemMenuView->Check (ID_MENUITEM_SHOW_BONES, true);
+ itemMenuView->Append (ID_MENUITEM_SHOW_COLLIDERS, _("Show Colliders"), _T(""), wxITEM_CHECK);
+ itemMenuView->Check (ID_MENUITEM_SHOW_COLLIDERS, true);
+ itemMenuView->Append (ID_MENUITEM_SHOW_JOINTS, _("Show Joints"), _T(""), wxITEM_CHECK);
+ itemMenuView->Check (ID_MENUITEM_SHOW_JOINTS, true);
+ itemMenuView->Append (ID_MENUITEM_SHOW_BODIES, _("Show Bodies"), _T(""), wxITEM_CHECK);
+ itemMenuView->Check (ID_MENUITEM_SHOW_BODIES, true);
+ itemMenuView->Append (ID_MENUITEM_SHOW_CHARACTERS, _("Show Characters"), _T(""), wxITEM_CHECK);
+ itemMenuView->Check (ID_MENUITEM_SHOW_CHARACTERS, true);
+
+ itemMenuAttach = new wxMenu;
+ itemMenuAttach->Append (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, _("Attach Sphere Collider..."),
+ _T(""),wxITEM_NORMAL);
+ itemMenuAttach->Append (IA_MENUITEM_ATTACH_BOX_COLLIDER, _("Attach Box Collider..."),
+ _T(""),wxITEM_NORMAL);
+ itemMenuAttach->Append (IA_MENUITEM_ATTACH_BODY, _("Attach Body...\tCTRL+B"), _T(""), wxITEM_NORMAL);
+ itemMenuAttach->Append (IA_MENUITEM_ATTACH_JOINT, _("Attach Joint...\tCTRL+J"), _T(""), wxITEM_NORMAL);
+ itemMenuAttach->Append (IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER,
+ _("Attach Scripted Controler...\tCTRL+C"), _T(""), wxITEM_NORMAL);
+ menuBar->Append (itemMenuAttach, _("Attach"));
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, false);
+
+ wxMenu* itemMenu13 = new wxMenu;
+ itemMenu13->Append (ID_MENUITEM2, _("About"), _T(""), wxITEM_NORMAL);
+ menuBar->Append (itemMenu13, _("Help"));
+ itemFrame1->SetMenuBar (menuBar);
+
+ wxStatusBar* itemStatusBar2 = new wxStatusBar (itemFrame1, ID_STATUSBAR,
+ wxST_SIZEGRIP | wxNO_BORDER);
+ itemStatusBar2->SetFieldsCount (2);
+ itemFrame1->SetStatusBar (itemStatusBar2);
+ //end menu and statusbar
+
+ //toolbar
+ wxInitAllImageHandlers ();
+ wxToolBar* tb1 = CreateToolBar (wxTB_FLAT | wxTB_HORIZONTAL, ID_TOOLBAR);
+ tb1->SetToolBitmapSize (wxSize(32, 32));
+
+ tb1->AddSeparator();
+
+ wxBitmap itemtool2Bitmap (icons_path + _T("Icon_save.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool2BitmapDisabled (icons_path + _T("Icon_save_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_SAVE, _T(""), itemtool2Bitmap, itemtool2BitmapDisabled, wxITEM_NORMAL,
+ _T(""), wxT("Save project"));
+
+ wxBitmap itemtool3Bitmap (icons_path + _T("Icon_import.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool3BitmapDisabled (icons_path + _T("Icon_import_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_IMPORT, _T(""), itemtool3Bitmap, itemtool3BitmapDisabled, wxITEM_NORMAL,
+ _T(""), wxT("Load Project"));
+
+#if 0
+ wxBitmap itemtool4Bitmap (icons_path + _T("Icon_export.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool4BitmapDisabled (icons_path + _T ("Icon_export_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_EXPORT, _T(""), itemtool4Bitmap, itemtool4BitmapDisabled, wxITEM_NORMAL,
+ _T(""), wxT("Export physics (currently not avaible)"));
+#endif
+
+ tb1->AddSeparator();
+#if 0
+ wxBitmap itemtool5Bitmap (icons_path + _T("Icon_move.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool5BitmapDisabled (icons_path + _T ("Icon_move_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_MOVE, _T(""), itemtool5Bitmap, itemtool5BitmapDisabled, wxITEM_NORMAL, _T(""),
+ wxT("Move Object (currently not avaible)"));
+
+ wxBitmap itemtool6Bitmap (icons_path + _T("Icon_rotate.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool6BitmapDisabled (icons_path + _T("Icon_rotate_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_ROTATE, _T(""), itemtool6Bitmap, itemtool6BitmapDisabled, wxITEM_NORMAL, _T(""),
+ wxT("Rotate Object (currently not avaible)"));
+
+ tb1->AddSeparator();
+
+ wxBitmap itemtool7Bitmap (icons_path + _T ("Icon_movebody.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool7BitmapDisabled (icons_path + _T("Icon_movebody_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_MOVE_BODY, _T(""), itemtool7Bitmap, itemtool7BitmapDisabled,
+ wxITEM_NORMAL, _T(""), wxT("Move rigid body (currently not avaible)"));
+
+ wxBitmap itemtool8Bitmap (icons_path + _T("Icon_rotatebody.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool8BitmapDisabled (icons_path + _T("Icon_rotatebody_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_ROTATE_BODY, _T(""), itemtool8Bitmap, itemtool8BitmapDisabled, wxITEM_NORMAL,
+ _T(""), wxT("Rotate rigid body (currently not avaible)"));
+
+ tb1->AddSeparator();
+
+ wxBitmap itemtool9Bitmap (icons_path + _T("Icon_rag.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool9BitmapDisabled (icons_path + _T("Icon_rag_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_CREATE_CHAR, _T(""), itemtool9Bitmap, itemtool9BitmapDisabled, wxITEM_NORMAL,
+ _T(""), wxT("Create character from given model"));
+#endif
+
+ wxBitmap itemtool10Bitmap (icons_path + _T("Icon_cube.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool10BitmapDisabled (icons_path + _T("Icon_cube_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_ATTACH_BOX_COLLIDER, _T(""), itemtool10Bitmap, itemtool10BitmapDisabled,
+ wxITEM_NORMAL, _T(""), wxT("Attach box collider"));
+
+ wxBitmap itemtool11Bitmap (icons_path + _T ("Icon_cilinder.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool11BitmapDisabled(icons_path + _T ("Icon_cilinder_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool(ID_TOOL_ATTACH_CAPSULE_COLLIDER, _T(""), itemtool11Bitmap, itemtool11BitmapDisabled,
+ wxITEM_NORMAL, _T(""), wxT("Attach cilinder collider"));
+
+ wxBitmap itemtool12Bitmap (icons_path + _T ("Icon_sphere.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool12BitmapDisabled (icons_path + _T("Icon_sphere_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_ATTACH_SPHERE_COLLIDER, _T(""), itemtool12Bitmap, itemtool12BitmapDisabled,
+ wxITEM_NORMAL, _T(""), wxT("Attach sphere collider"));
+
+#if 0
+ wxBitmap itemtool16Bitmap (icons_path + _T("Icon_animation.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool16BitmapDisabled (icons_path + _T("Icon_animation_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_ANIMATION, _T(""), itemtool16Bitmap, itemtool16BitmapDisabled, wxITEM_NORMAL,
+ _T(""), wxT("Animation tool (not avaible yet)"));
+
+ wxBitmap itemtool17Bitmap (icons_path + _T("Icon_force.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool17BitmapDisabled (icons_path + _T("Icon_force_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_FORCE, _T(""), itemtool17Bitmap, itemtool17BitmapDisabled, wxITEM_NORMAL,
+ _T(""), wxT("Create force (not avaible yet)"));
+#endif
+
+ wxBitmap itemtool18Bitmap (icons_path + _T("Icon_controler.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool18BitmapDisabled (icons_path + _T("Icon_controler_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool (ID_TOOL_CONTROLLER, _T(""),
+ itemtool18Bitmap, itemtool18BitmapDisabled, wxITEM_NORMAL, _T(""), wxT("Attach controller"));
+
+ tb1->AddSeparator();
+
+#if 0
+ wxBitmap itemtool19Bitmap(icons_path + _T("Icon_camera.png"), wxBITMAP_TYPE_PNG);
+ wxBitmap itemtool19BitmapDisabled(icons_path + _T("Icon_camera_a.png"), wxBITMAP_TYPE_PNG);
+ tb1->AddTool(ID_TOOL_CAMERA, _T(""), itemtool19Bitmap, itemtool19BitmapDisabled, wxITEM_NORMAL, _T(""),
+ wxT("Record (not avaible yet)"));
+
+ tb1->AddSeparator();
+#endif
+
+ itemMenuEdit->Enable (IA_MENUITEM_DELETE, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BODY, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SPHERE_COLLIDER, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BOX_COLLIDER, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_JOINT, false);
+ itemMenuAttach->Enable (IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER, false);
+
+ tb1->Realize();
+ itemFrame1->SetToolBar (tb1);
+ //end toolbar
+
+ sim_panel = new iaSimulationPanel (central_info, this, ID_SIMULATION_PANEL,
+ wxDefaultPosition, wxSize(GetSize().x, 115), wxNO_BORDER | wxTAB_TRAVERSAL);
+ sim_panel->SetBackgroundColour (wxColor (255, 255, 255));
+ sim_panel->CreateControls ();
+
+ //the tree
+ objtree = new iaObjectTree (central_info, this, ID_OBJECTS_TREE_PANEL, wxDefaultPosition, wxSize(200, 63),
+ wxNO_BORDER | wxTAB_TRAVERSAL, icons_path);
+ objtree->SetBackgroundColour (wxColor (255, 255, 255));
+
+ //3dview
+ pnl_3dview = new wxPanel (this, ID_PANEL, wxDefaultPosition, wxSize(131, 63),
+ wxSUNKEN_BORDER | wxTAB_TRAVERSAL);
+ pnl_3dview->SetBackgroundColour(wxColour(0, 0, 128));
+
+ //pnl right ->propgrid
+ iaPropertyGrid* propEditor = new iaPropertyGrid (central_info, this, -1, wxPoint(3, 3),
+ wxSize(131, 63), wxPG_BOLD_MODIFIED | wxPG_SPLITTER_AUTO_CENTER | wxPG_AUTO_SORT | wxTOP |
+ wxTAB_TRAVERSAL| wxPG_BOOL_USE_CHECKBOX);
+ propEditor->SetMarginColour (wxColor (122, 110, 90));
+ propEditor->SetLineColour (wxColor (0,0,0));
+ propEditor->SetCaptionBackgroundColour (wxColor (122, 110, 90));
+ propEditor->SetCaptionForegroundColour (wxColor (0,0,0));
+ //propEditor->SetCellBackgroundColour (wxColor (122, 110, 90));
+
+ aui_mgr.AddPane (sim_panel, wxAuiPaneInfo ().Name (
+ wxT ("pnl_bottom")).Caption (wxT ("Simulation")).Bottom());
+
+ aui_mgr.AddPane(objtree, wxAuiPaneInfo ().Name (wxT ("objtree")).Caption (
+ wxT ("Objects Tree")).Left());
+
+ aui_mgr.AddPane (propEditor, wxAuiPaneInfo ().Name (wxT ("properties")).Caption (
+ wxT ("Properties")).Right());
+
+ aui_mgr.AddPane (pnl_3dview, wxCENTER);
+
+ aui_mgr.Update ();
+
+ return true;
+}
+
+bool iaMainFrame::ShowToolTips()
+{
+ return true;
+}
+
+wxBitmap iaMainFrame::GetBitmapResource(const wxString& name)
+{
+ // Bitmap retrieval
+ ////@begin iaMainFrame bitmap retrieval
+ wxUnusedVar(name);
+ return wxNullBitmap;
+ ////@end iaMainFrame bitmap retrieval
+}
+void iaMainFrame::OnShowColliders (wxCommandEvent& event)
+{
+ central_info->Get3dView ()->Show (IA_OBJECT_TYPE_COLLIDER, event.IsChecked ());
+}
+void iaMainFrame::OnShowJoints (wxCommandEvent& event)
+{
+ central_info->Get3dView ()->Show (IA_OBJECT_TYPE_JOINT, event.IsChecked ());
+}
+void iaMainFrame::OnShowBones (wxCommandEvent& event)
+{
+ central_info->Get3dView ()->Show (IA_OBJECT_TYPE_BONE, event.IsChecked ());
+}
+void iaMainFrame::OnDrawWireFrame (wxCommandEvent& event)
+{
+ central_info->Get3dView ()->DisplayWireframe (event.IsChecked ());
+}
+void iaMainFrame::OnShowBodies (wxCommandEvent& event)
+{
+ central_info->Get3dView ()->Show (IA_OBJECT_TYPE_BODY, event.IsChecked ());
+}
+void iaMainFrame::OnShowCharacters (wxCommandEvent& event)
+{
+ central_info->Get3dView ()->Show (IA_OBJECT_TYPE_CHARACTER, event.IsChecked ());
+}
+wxIcon iaMainFrame::GetIconResource(const wxString& name)
+{
+ // Icon retrieval
+ ////@begin iaMainFrame icon retrieval
+ wxUnusedVar(name);
+ return wxNullIcon;
+ ////@end iaMainFrame icon retrieval
+}
+void iaMainFrame::OnLoadMenuItem ( wxCommandEvent& event )
+{
+ //wxFileDialog ofd (m_mainfrm, "Load file", central_info->GetProjectPath ().c_str (), "", "*.*", wxOPEN);
+ //if (ofd.ShowModal () == wxID_OK)
+ //{
+ // central_info->LoadObject (ofd.GetFilename ().c_str (),ofd.GetDirectory ().c_str ());
+ //}
+}
+void iaMainFrame::OnDelete (wxCommandEvent& event)
+{
+ central_info->GetObjectsInfo ()->DeleteSelected ();
+}
+void iaMainFrame::OnSaveMenuItem ( wxCommandEvent& event )
+{
+ central_info->SaveProject ();
+}
+void iaMainFrame::OnLoadProjectMenuItem (wxCommandEvent& event)
+{
+ wxFileDialog pfd (m_mainfrm, _T("Choose project file"),
+ wxString (central_info->GetProjectPath ().c_str (), wxConvUTF8), _T(""), _T("*.iaprj"), wxOPEN);
+ if (pfd.ShowModal () == wxID_OK)
+ {
+ central_info->LoadProject (pfd.GetFilename ().mb_str (), pfd.GetDirectory ().mb_str ());
+ }
+}
+void iaMainFrame::OnAttachScriptedControllerMenuItem (wxCommandEvent& event)
+{
+ OnAttachScriptedController (this);
+}
+void iaMainFrame::OnAttachJointMenuItem (wxCommandEvent& event)
+{
+ OnAttachJoint ();
+}
+void iaMainFrame::OnAttachBodyMenuItem (wxCommandEvent& event)
+{
+ OnAttachBody ();
+}
+void iaMainFrame::OnAttachCapsuleColliderMenuItem (wxCommandEvent& event)
+{
+ OnAttachCapsuleCollider ();
+}
+void iaMainFrame::OnAttachSphereColliderMenuItem (wxCommandEvent& event)
+{
+ OnAttachSphereCollider ();
+}
+void iaMainFrame::OnAttachBoxColliderMenuItem (wxCommandEvent& event)
+{
+ OnAttachBoxCollider ();
+}
+void iaMainFrame::OnNewProjectMenuItem (wxCommandEvent& event)
+{
+ wxFileDialog wfd (m_mainfrm, _T("Choose world file"),
+ wxString (central_info->GetProjectPath ().c_str (), wxConvUTF8), _T(""), _T("*.*"), wxOPEN);
+ if (wfd.ShowModal () == wxID_OK)
+ {
+ central_info->NewProject (wfd.GetFilename ().mb_str (),wfd.GetDirectory ().mb_str ());
+ }
+}
+void iaMainFrame::OnExitMenuItem (wxCommandEvent& event)
+{
+ m_mainfrm->Close();
+}
+void iaMainFrame::OnSaveAsMenuItem ( wxCommandEvent& event )
+{
+ event.Skip();
+}
+void iaMainFrame::OnSize(wxSizeEvent& event)
+{
+ if (m_mainfrm->pnl_3dview)
+ {
+ central_info->Get3dView ()->SetSize (m_mainfrm->pnl_3dview->GetClientSize().x,
+ m_mainfrm->pnl_3dview->GetClientSize().y);
+ }
+ event.Skip();
+}
+
Added: trunk/src/apps/editor/gui/widgets/iaMainFrame.h
===================================================================
--- trunk/src/apps/editor/gui/widgets/iaMainFrame.h (rev 0)
+++ trunk/src/apps/editor/gui/widgets/iaMainFrame.h 2007-10-08 11:59:12 UTC (rev 343)
@@ -0,0 +1,185 @@
+/*
+Copyright (C) 2005 - 2007 by Piotr Obrzut and Valentin Vit
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with this library; if not, write to the Free
+Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+
+#ifndef _IA_MAINFRAME_H_
+#define _IA_MAINFRAME_H_
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "ia_mainframe.h"
+#endif
+
+
+#include <wx/statusbr.h>
+#include <wx/laywin.h>
+#include <wx/intl.h>
+
+#include "editor.h"
+#include "iaObjectsManager.h"
+#include "ia-tool/iaBaseObjectListener.h"
+#include <wx/aui/aui.h>
+
+
+
+////@begin control identifiers
+#define ID_FRAME 10000
+#define SYMBOL_IAMAINFRAME_STYLE wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE | wxHSCROLL | wxVSCROLL
+#define SYMBOL_IAMAINFRAME_TITLE _("iaMainFrame")
+#define SYMBOL_IAMAINFRAME_IDNAME ID_FRAME
+#define SYMBOL_IAMAINFRAME_SIZE wxSize(300, 300)
+#define SYMBOL_IAMAINFRAME_POSITION wxPoint(10, 10)
+#define ID_STATUSBAR 10001
+#define ID_PANEL 10002
+#define ID_MENUITEM1 10008
+#define ID_MENU 10006
+#define ID_MENUITEM 10007
+#define ID_MENUITEM2 10009
+#define ID_MENUITEM_SAVE 10010
+#define ID_MENUITEM_SAVE_AS 10011
+#define ID_MENUITEM_LOAD 10012
+#define ID_TOOLBAR 10004
+#define ID_PANEL 10002
+#define ID_SIMULATION_PANEL 10019
+#define ID_OBJECTS_TREE_PANEL 10020
+#define ID_PANEL7 10024
+#define ID_TOOLBAR2 10025
+//#define ID_MENUITEM_CREATE_RAGDOLL 10023
+#define ID_MENUITEM_NEW_PROJECT 10027
+#define ID_MENUITEM_LOAD_PROJECT 10028
+#define ID_MENUITEM_EXIT 10029
+#define ID_TOOL_SAVE 10032
+#define ID_TOOL_IMPORT 10033
+#define ID_TOOL_EXPORT 10034
+#define ID_TOOL_MOVE 10035
+#define ID_TOOL_ROTATE 10036
+#define ID_TOOL_MOVE_BODY 10037
+#define ID_TOOL_ROTATE_BODY 10038
+#define ID_TOOL_CREATE_CHAR 10039
+#define ID_TOOL_ATTACH_BOX_COLLIDER 10040
+#define ID_TOOL_ATTACH_CILINDER_COLLIDER 10041
+#define ID_TOOL_ATTACH_SPHERE_COLLIDER 10042
+#define ID_TOOL_ANIMATION 10043
+#define ID_TOOL_FORCE 10044
+#define ID_TOOL_CONTROLLER 10045
+#define ID_TOOL_CAMERA 10045
+#define ID_MENUITEM_DRAW_WIREFRAME 10046
+#define ID_MENUITEM_SHOW_COLLIDERS 10047
+#define ID_MENUITEM_SHOW_BONES 10048
+#define ID_MENUITEM_SHOW_JOINTS 10049
+#define ID_MENUITEM_SHOW_BODIES 10050
+#define ID_MENUITEM_SHOW_CHARACTERS 10051
+#define ID_TOOL_ATTACH_CAPSULE_COLLIDER 10052
+////@end control identifiers
+
+/*!
+* Compatibility
+*/
+
+#ifndef wxCLOSE_BOX
+#define wxCLOSE_BOX 0x1000
+#endif
+
+
+struct iEditorObjectsInfo;
+class iaMainFrame;
+class iaObjectTree;
+class ObjectToolbarGUI;
+class iaSimulationPanel;
+
+/*!
+* iaMainFrame class declaration
+*/
+
+class iaMainFrame : public wxFrame, public iaObjectsManager, public iaBaseObjectListener
+{
+ DECLARE_CLASS( iaMainFrame )
+
+public:
+
+ wxAuiManager aui_mgr;
+ wxPanel *pnl_3dview;
+ wxBoxSizer *bxSz3Dview;
+ iaObjectTree *objtree;
+ iaSimulationPanel *sim_panel;
+
+ wxMenu *itemMenuAttach;
+ wxMenu *itemMenuEdit;
+
+ wxPanel *pnl_controler;
+ wxPanel *pnl_tlb;
+ wxToolBar * tlb_bottom;
+
+ iaMainFrame ();
+ ~iaMainFrame ();
+ //iaMainFrame(iaDataSubject *data,iaCSApplication *csApp,wxWindow* parent, wxWindowID id = SYMBOL_IAMAINFRAME_IDNAME, const wxString& caption = SYMBOL_IAMAINFRAME_TITLE, const wxPoint& pos = SYMBOL_IAMAINFRAME_POSITION, const wxSize& size = SYMBOL_IAMAINFRAME_SIZE, long style = SYMBOL_IAMAINFRAME_STYLE );
+ iaMainFrame (iEditorCentralInfo* info,wxWindow *parent, const wxWindowID id,
+ const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
+
+ bool Create (wxWindow* parent, wxWindowID id = SYMBOL_IAMAINFRAME_IDNAME,
+ const wxString& caption = SYMBOL_IAMAINFRAME_TITLE,
+ const wxPoint& pos = SYMBOL_IAMAINFRAME_POSITION,
+ const wxSize& size = SYMBOL_IAMAINFRAME_SIZE, long style = SYMBOL_IAMAINFRAME_STYLE );
+
+ /// Creates the controls and sizers
+ bool CreateControls();
+ void UpdatePane (wxWindow *wnd);
+
+ wxBitmap GetBitmapResource (const wxString& name );
+ wxIcon GetIconResource (const wxString& name );
+ /// Should we show tooltips?
+ static bool ShowToolTips ();
+
+ //events
+ //void OnMouse ( wxMouseEvent& event );
+ void OnAttachScriptedControllerMenuItem (wxCommandEvent& event);
+ void OnAttachJointMenuItem (wxCommandEvent& event);
+ void OnAttachBodyMenuItem (wxCommandEvent& event);
+ void OnAttachSphereColliderMenuItem (wxCommandEvent& event);
+ void OnAttachCapsuleColliderMenuItem (wxCommandEvent& event);
+ void OnAttachBoxColliderMenuItem (wxCommandEvent& event);
+
+ void OnSize (wxSizeEvent& event);
+
+ void OnSaveAsMenuItem (wxCommandEvent& event);
+ void OnSaveMenuItem (wxCommandEvent& event);
+ void OnLoadMenuItem (wxCommandEvent& event);
+ //void OnCreateRagdollMenuItem (wxCommandEvent& event);
+ void OnNewProjectMenuItem (wxCommandEvent& event);
+ void OnLoadProjectMenuItem (wxCommandEvent& event);
+ void OnExitMenuItem (wxCommandEvent& event);
+ void OnDelete (wxCommandEvent& event);
+ void OnSortByType (wxCommandEvent& event);
+ void OnDrawWireFrame (wxCommandEvent& event);
+ void OnShowColliders (wxCommandEvent& event);
+ void OnShowJoints (wxCommandEvent& event);
+ void OnShowBones (wxCommandEvent& event);
+ void OnShowBodies (wxCommandEvent& event);
+ void OnShowCharacters (wxCommandEvent& event);
+
+ void ObjectSelected (iEditorObject *obj);
+ void ObjectRemoved (iEditorObject *obj);
+ void ObjectAdded (iEditorObject *obj);
+ void ObjectChanged (iEditorObject *obj, iEditorObjectProperty* prop);
+
+ DECLARE_EVENT_TABLE()
+};
+
+
+#endif
+// _IA_MAINFRAME_H_
+
Modified: trunk/src/apps/editor/gui/widgets/iaObjectTree.h
===================================================================
--- trunk/src/apps/editor/gui/widgets/iaObjectTree.h 2007-10-08 11:40:28 UTC (rev 342)
+++ trunk/src/apps/editor/gui/widgets/iaObjectTree.h 2007-10-08 11:59:12 UTC (rev 343)
@@ -19,7 +19,7 @@
#include "wx/wx.h"
#include <wx/treectrl.h>
#include <csutil/hash.h>
-#include "ia-tool/iaObjectsManager.h"
+#include "iaObjectsManager.h"
#include "ia-tool/iaBaseObjectListener.h"
#include "editor.h"
Added: trunk/src/apps/editor/gui/widgets/iaObjectsManager.h
===================================================================
--- trunk/src/apps/editor/gui/widgets/iaObjectsManager.h (rev 0)
+++ trunk/src/apps/editor/gui/widgets/iaObjectsManager.h 2007-10-08 11:59:12 UTC (rev 343)
@@ -0,0 +1,144 @@
+/*
+Copyright (C) 2007 by Piotr Obrzut
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+
+#ifndef _IA_OBJ_MANAGER_H_
+#define _IA_OBJ_MANAGER_H_
+
+
+#include <wx/statusbr.h>
+#include <wx/laywin.h>
+#include <wx/intl.h>
+
+#include "editor.h"
+
+////@begin control identifiers
+#define IA_MENUITEM_ATTACH_BODY 0
+#define IA_MENUITEM_ATTACH_JOINT 2
+#define IA_MENUITEM_ATTACH_SPHERE_COLLIDER 3
+#define IA_MENUITEM_ATTACH_BOX_COLLIDER 4
+#define IA_MENUITEM_DELETE 5
+#define ID_MENUITEM_SORT_BY_TYPE 6
+#define IA_MENUITEM_ATTACH_SCRIPTED_CONTROLLER 7
+#define IA_MENUITEM_ATTACH_CAPSULE_COLLIDER 8
+#define IA_MENUITEM_HIDE 9
+#define IA_MENUITEM_SHOW 10
+#define IA_MENUITEM_GROUP 11
+#define IA_MENUITEM_SAVE_ANIMATION 12
+////@end control identifiers
+
+/*!
+* Compatibility
+*/
+
+#ifndef wxCLOSE_BOX
+#define wxCLOSE_BOX 0x1000
+#endif
+
+
+struct iEditorObjectsInfo;
+class iaMainFrame;
+class iaObjectTree;
+class ObjectToolbarGUI;
+//class wxFrameManager;
+
+#include <wx/filedlg.h>
+#include <iScriptController.h>
+#include "iPcDynamicsSystem.h"
+#include "iPcCharacter.h"
+
+class iaObjectsManager : public iEditorObjectsListener
+{
+protected:
+
+ iEditorCentralInfo *central_info;
+
+public:
+
+ iaObjectsManager () : central_info (0) {;}
+
+ void OnSaveAnimation (wxWindow *parent)
+ {
+ wxFileDialog ofd (parent, _T ("Export character animation"),
+ wxString (central_info->GetProjectPath ().c_str (), wxConvUTF8), _T(""), _T("*.*"), wxSAVE);
+ if (ofd.ShowModal () == wxID_OK)
+ {
+ csRef<iPcCharacter> character = scfQueryInterface <iPcCharacter> (
+ central_info->GetObjectsInfo ()->GetSelectedObject (0));
+
+ central_info->GetObjectsInfo ()->ExportAnimation (character,
+ character->GetOutputAnimation (),
+ ofd.GetDirectory ().mb_str (),
+ ofd.GetFilename ().mb_str ());
+ }
+ }
+ void OnAttachScriptedController (wxWindow *parent)
+ {
+ wxFileDialog ofd (parent, _T ("Select script file"),
+ wxString (central_info->GetProjectPath ().c_str (), wxConvUTF8), _T (""), _T ("*.iascr"), wxOPEN);
...
[truncated message content] |
|
From: <ob...@us...> - 2007-10-08 11:40:25
|
Revision: 342
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=342&view=rev
Author: obi666
Date: 2007-10-08 04:40:28 -0700 (Mon, 08 Oct 2007)
Log Message:
-----------
Applied r341 from trunk.
Modified Paths:
--------------
branches/release/V0.2/src/apps/editor/gui/iaMainFrame.cpp
branches/release/V0.2/src/apps/editor/gui/iaMainFrame.h
Modified: branches/release/V0.2/src/apps/editor/gui/iaMainFrame.cpp
===================================================================
--- branches/release/V0.2/src/apps/editor/gui/iaMainFrame.cpp 2007-10-08 11:37:23 UTC (rev 341)
+++ branches/release/V0.2/src/apps/editor/gui/iaMainFrame.cpp 2007-10-08 11:40:28 UTC (rev 342)
@@ -65,8 +65,8 @@
EVT_MENU(IA_MENUITEM_ATTACH_BODY, iaMainFrame::OnAttachBodyMenuItem)
EVT_MENU(IA_MENUITEM_ATTACH_SPHERE_COLLIDER, iaMainFrame::OnAttachSphereColliderMenuItem)
EVT_MENU(IA_MENUITEM_ATTACH_BOX_COLLIDER, iaMainFrame::OnAttachBoxColliderMenuItem)
+EVT_MENU(IA_MENUITEM_ATTACH_CAPSULE_COLLIDER, iaMainFrame::OnAttachCapsuleColliderMenuItem)
EVT_MENU(IA_MENUITEM_ATTACH_JOINT, iaMainFrame::OnAttachJointMenuItem)
-//EVT_MENU(ID_MENUITEM_CREATE_RAGDOLL, iaMainFrame::OnCreateRagdollMenuItem)
EVT_MENU(ID_MENUITEM_LOAD, iaMainFrame::OnLoadMenuItem)
EVT_MENU(ID_MENUITEM_SAVE, iaMainFrame::OnSaveMenuItem)
EVT_MENU(ID_MENUITEM_NEW_PROJECT, iaMainFrame::OnNewProjectMenuItem)
@@ -82,10 +82,10 @@
EVT_MENU(ID_MENUITEM_SHOW_BODIES, iaMainFrame::OnShowBodies)
EVT_MENU(ID_MENUITEM_SHOW_CHARACTERS, iaMainFrame::OnShowCharacters)
+EVT_TOOL(ID_TOOL_ATTACH_CAPSULE_COLLIDER, iaMainFrame::OnAttachCapsuleColliderMenuItem)
EVT_TOOL(ID_TOOL_ATTACH_BOX_COLLIDER, iaMainFrame::OnAttachBoxColliderMenuItem)
EVT_TOOL(ID_TOOL_ATTACH_SPHERE_COLLIDER, iaMainFrame::OnAttachSphereColliderMenuItem)
EVT_TOOL(ID_TOOL_CONTROLLER, iaMainFrame::OnAttachScriptedControllerMenuItem)
-//EVT_TOOL(ID_TOOL_CREATE_CHAR, iaMainFrame::OnCreateRagdollMenuItem)
EVT_TOOL(ID_TOOL_SAVE, iaMainFrame::OnSaveMenuItem)
EVT_TOOL(ID_TOOL_IMPORT, iaMainFrame::OnLoadProjectMenuItem)
@@ -264,13 +264,15 @@
tb1->AddTool (ID_TOOL_IMPORT, _T(""), itemtool3Bitmap, itemtool3BitmapDisabled, wxITEM_NORMAL,
_T(""), wxT("Load Project"));
+#if 0
wxBitmap itemtool4Bitmap (icons_path + _T("Icon_export.png"), wxBITMAP_TYPE_PNG);
wxBitmap itemtool4BitmapDisabled (icons_path + _T ("Icon_export_a.png"), wxBITMAP_TYPE_PNG);
tb1->AddTool (ID_TOOL_EXPORT, _T(""), itemtool4Bitmap, itemtool4BitmapDisabled, wxITEM_NORMAL,
_T(""), wxT("Export physics (currently not avaible)"));
+#endif
tb1->AddSeparator();
-
+#if 0
wxBitmap itemtool5Bitmap (icons_path + _T("Icon_move.png"), wxBITMAP_TYPE_PNG);
wxBitmap itemtool5BitmapDisabled (icons_path + _T ("Icon_move_a.png"), wxBITMAP_TYPE_PNG);
tb1->AddTool (ID_TOOL_MOVE, _T(""), itemtool5Bitmap, itemtool5BitmapDisabled, wxITEM_NORMAL, _T(""),
@@ -299,6 +301,7 @@
wxBitmap itemtool9BitmapDisabled (icons_path + _T("Icon_rag_a.png"), wxBITMAP_TYPE_PNG);
tb1->AddTool (ID_TOOL_CREATE_CHAR, _T(""), itemtool9Bitmap, itemtool9BitmapDisabled, wxITEM_NORMAL,
_T(""), wxT("Create character from given model"));
+#endif
wxBitmap itemtool10Bitmap (icons_path + _T("Icon_cube.png"), wxBITMAP_TYPE_PNG);
wxBitmap itemtool10BitmapDisabled (icons_path + _T("Icon_cube_a.png"), wxBITMAP_TYPE_PNG);
@@ -307,15 +310,15 @@
wxBitmap itemtool11Bitmap (icons_path + _T ("Icon_cilinder.png"), wxBITMAP_TYPE_PNG);
wxBitmap itemtool11BitmapDisabled(icons_path + _T ("Icon_cilinder_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool(ID_TOOL_ATTACH_CILINDER_COLLIDER, _T(""), itemtool11Bitmap, itemtool11BitmapDisabled,
- wxITEM_NORMAL, _T(""), wxT("Attach cilinder collider (currently not avaible)"));
+ tb1->AddTool(ID_TOOL_ATTACH_CAPSULE_COLLIDER, _T(""), itemtool11Bitmap, itemtool11BitmapDisabled,
+ wxITEM_NORMAL, _T(""), wxT("Attach cilinder collider"));
-
wxBitmap itemtool12Bitmap (icons_path + _T ("Icon_sphere.png"), wxBITMAP_TYPE_PNG);
wxBitmap itemtool12BitmapDisabled (icons_path + _T("Icon_sphere_a.png"), wxBITMAP_TYPE_PNG);
tb1->AddTool (ID_TOOL_ATTACH_SPHERE_COLLIDER, _T(""), itemtool12Bitmap, itemtool12BitmapDisabled,
wxITEM_NORMAL, _T(""), wxT("Attach sphere collider"));
+#if 0
wxBitmap itemtool16Bitmap (icons_path + _T("Icon_animation.png"), wxBITMAP_TYPE_PNG);
wxBitmap itemtool16BitmapDisabled (icons_path + _T("Icon_animation_a.png"), wxBITMAP_TYPE_PNG);
tb1->AddTool (ID_TOOL_ANIMATION, _T(""), itemtool16Bitmap, itemtool16BitmapDisabled, wxITEM_NORMAL,
@@ -325,6 +328,7 @@
wxBitmap itemtool17BitmapDisabled (icons_path + _T("Icon_force_a.png"), wxBITMAP_TYPE_PNG);
tb1->AddTool (ID_TOOL_FORCE, _T(""), itemtool17Bitmap, itemtool17BitmapDisabled, wxITEM_NORMAL,
_T(""), wxT("Create force (not avaible yet)"));
+#endif
wxBitmap itemtool18Bitmap (icons_path + _T("Icon_controler.png"), wxBITMAP_TYPE_PNG);
wxBitmap itemtool18BitmapDisabled (icons_path + _T("Icon_controler_a.png"), wxBITMAP_TYPE_PNG);
@@ -333,12 +337,14 @@
tb1->AddSeparator();
+#if 0
wxBitmap itemtool19Bitmap(icons_path + _T("Icon_camera.png"), wxBITMAP_TYPE_PNG);
wxBitmap itemtool19BitmapDisabled(icons_path + _T("Icon_camera_a.png"), wxBITMAP_TYPE_PNG);
tb1->AddTool(ID_TOOL_CAMERA, _T(""), itemtool19Bitmap, itemtool19BitmapDisabled, wxITEM_NORMAL, _T(""),
wxT("Record (not avaible yet)"));
tb1->AddSeparator();
+#endif
itemMenuEdit->Enable (IA_MENUITEM_DELETE, false);
itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BODY, false);
@@ -474,6 +480,10 @@
{
OnAttachBody ();
}
+void iaMainFrame::OnAttachCapsuleColliderMenuItem (wxCommandEvent& event)
+{
+ OnAttachCapsuleCollider ();
+}
void iaMainFrame::OnAttachSphereColliderMenuItem (wxCommandEvent& event)
{
OnAttachSphereCollider ();
@@ -509,3 +519,4 @@
event.Skip();
}
+
Modified: branches/release/V0.2/src/apps/editor/gui/iaMainFrame.h
===================================================================
--- branches/release/V0.2/src/apps/editor/gui/iaMainFrame.h 2007-10-08 11:37:23 UTC (rev 341)
+++ branches/release/V0.2/src/apps/editor/gui/iaMainFrame.h 2007-10-08 11:40:28 UTC (rev 342)
@@ -83,6 +83,7 @@
#define ID_MENUITEM_SHOW_JOINTS 10049
#define ID_MENUITEM_SHOW_BODIES 10050
#define ID_MENUITEM_SHOW_CHARACTERS 10051
+#define ID_TOOL_ATTACH_CAPSULE_COLLIDER 10052
////@end control identifiers
/*!
@@ -149,6 +150,7 @@
void OnAttachJointMenuItem (wxCommandEvent& event);
void OnAttachBodyMenuItem (wxCommandEvent& event);
void OnAttachSphereColliderMenuItem (wxCommandEvent& event);
+ void OnAttachCapsuleColliderMenuItem (wxCommandEvent& event);
void OnAttachBoxColliderMenuItem (wxCommandEvent& event);
void OnSize (wxSizeEvent& event);
@@ -181,3 +183,4 @@
#endif
// _IA_MAINFRAME_H_
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ob...@us...> - 2007-10-08 11:37:24
|
Revision: 341
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=341&view=rev
Author: obi666
Date: 2007-10-08 04:37:23 -0700 (Mon, 08 Oct 2007)
Log Message:
-----------
Deactivated unused gui options.
Modified Paths:
--------------
trunk/src/apps/editor/gui/iaMainFrame.cpp
trunk/src/apps/editor/gui/iaMainFrame.h
Modified: trunk/src/apps/editor/gui/iaMainFrame.cpp
===================================================================
--- trunk/src/apps/editor/gui/iaMainFrame.cpp 2007-10-07 13:46:03 UTC (rev 340)
+++ trunk/src/apps/editor/gui/iaMainFrame.cpp 2007-10-08 11:37:23 UTC (rev 341)
@@ -65,8 +65,8 @@
EVT_MENU(IA_MENUITEM_ATTACH_BODY, iaMainFrame::OnAttachBodyMenuItem)
EVT_MENU(IA_MENUITEM_ATTACH_SPHERE_COLLIDER, iaMainFrame::OnAttachSphereColliderMenuItem)
EVT_MENU(IA_MENUITEM_ATTACH_BOX_COLLIDER, iaMainFrame::OnAttachBoxColliderMenuItem)
+EVT_MENU(IA_MENUITEM_ATTACH_CAPSULE_COLLIDER, iaMainFrame::OnAttachCapsuleColliderMenuItem)
EVT_MENU(IA_MENUITEM_ATTACH_JOINT, iaMainFrame::OnAttachJointMenuItem)
-//EVT_MENU(ID_MENUITEM_CREATE_RAGDOLL, iaMainFrame::OnCreateRagdollMenuItem)
EVT_MENU(ID_MENUITEM_LOAD, iaMainFrame::OnLoadMenuItem)
EVT_MENU(ID_MENUITEM_SAVE, iaMainFrame::OnSaveMenuItem)
EVT_MENU(ID_MENUITEM_NEW_PROJECT, iaMainFrame::OnNewProjectMenuItem)
@@ -82,10 +82,10 @@
EVT_MENU(ID_MENUITEM_SHOW_BODIES, iaMainFrame::OnShowBodies)
EVT_MENU(ID_MENUITEM_SHOW_CHARACTERS, iaMainFrame::OnShowCharacters)
+EVT_TOOL(ID_TOOL_ATTACH_CAPSULE_COLLIDER, iaMainFrame::OnAttachCapsuleColliderMenuItem)
EVT_TOOL(ID_TOOL_ATTACH_BOX_COLLIDER, iaMainFrame::OnAttachBoxColliderMenuItem)
EVT_TOOL(ID_TOOL_ATTACH_SPHERE_COLLIDER, iaMainFrame::OnAttachSphereColliderMenuItem)
EVT_TOOL(ID_TOOL_CONTROLLER, iaMainFrame::OnAttachScriptedControllerMenuItem)
-//EVT_TOOL(ID_TOOL_CREATE_CHAR, iaMainFrame::OnCreateRagdollMenuItem)
EVT_TOOL(ID_TOOL_SAVE, iaMainFrame::OnSaveMenuItem)
EVT_TOOL(ID_TOOL_IMPORT, iaMainFrame::OnLoadProjectMenuItem)
@@ -264,13 +264,15 @@
tb1->AddTool (ID_TOOL_IMPORT, _T(""), itemtool3Bitmap, itemtool3BitmapDisabled, wxITEM_NORMAL,
_T(""), wxT("Load Project"));
+#if 0
wxBitmap itemtool4Bitmap (icons_path + _T("Icon_export.png"), wxBITMAP_TYPE_PNG);
wxBitmap itemtool4BitmapDisabled (icons_path + _T ("Icon_export_a.png"), wxBITMAP_TYPE_PNG);
tb1->AddTool (ID_TOOL_EXPORT, _T(""), itemtool4Bitmap, itemtool4BitmapDisabled, wxITEM_NORMAL,
_T(""), wxT("Export physics (currently not avaible)"));
+#endif
tb1->AddSeparator();
-
+#if 0
wxBitmap itemtool5Bitmap (icons_path + _T("Icon_move.png"), wxBITMAP_TYPE_PNG);
wxBitmap itemtool5BitmapDisabled (icons_path + _T ("Icon_move_a.png"), wxBITMAP_TYPE_PNG);
tb1->AddTool (ID_TOOL_MOVE, _T(""), itemtool5Bitmap, itemtool5BitmapDisabled, wxITEM_NORMAL, _T(""),
@@ -299,6 +301,7 @@
wxBitmap itemtool9BitmapDisabled (icons_path + _T("Icon_rag_a.png"), wxBITMAP_TYPE_PNG);
tb1->AddTool (ID_TOOL_CREATE_CHAR, _T(""), itemtool9Bitmap, itemtool9BitmapDisabled, wxITEM_NORMAL,
_T(""), wxT("Create character from given model"));
+#endif
wxBitmap itemtool10Bitmap (icons_path + _T("Icon_cube.png"), wxBITMAP_TYPE_PNG);
wxBitmap itemtool10BitmapDisabled (icons_path + _T("Icon_cube_a.png"), wxBITMAP_TYPE_PNG);
@@ -307,15 +310,15 @@
wxBitmap itemtool11Bitmap (icons_path + _T ("Icon_cilinder.png"), wxBITMAP_TYPE_PNG);
wxBitmap itemtool11BitmapDisabled(icons_path + _T ("Icon_cilinder_a.png"), wxBITMAP_TYPE_PNG);
- tb1->AddTool(ID_TOOL_ATTACH_CILINDER_COLLIDER, _T(""), itemtool11Bitmap, itemtool11BitmapDisabled,
- wxITEM_NORMAL, _T(""), wxT("Attach cilinder collider (currently not avaible)"));
+ tb1->AddTool(ID_TOOL_ATTACH_CAPSULE_COLLIDER, _T(""), itemtool11Bitmap, itemtool11BitmapDisabled,
+ wxITEM_NORMAL, _T(""), wxT("Attach cilinder collider"));
-
wxBitmap itemtool12Bitmap (icons_path + _T ("Icon_sphere.png"), wxBITMAP_TYPE_PNG);
wxBitmap itemtool12BitmapDisabled (icons_path + _T("Icon_sphere_a.png"), wxBITMAP_TYPE_PNG);
tb1->AddTool (ID_TOOL_ATTACH_SPHERE_COLLIDER, _T(""), itemtool12Bitmap, itemtool12BitmapDisabled,
wxITEM_NORMAL, _T(""), wxT("Attach sphere collider"));
+#if 0
wxBitmap itemtool16Bitmap (icons_path + _T("Icon_animation.png"), wxBITMAP_TYPE_PNG);
wxBitmap itemtool16BitmapDisabled (icons_path + _T("Icon_animation_a.png"), wxBITMAP_TYPE_PNG);
tb1->AddTool (ID_TOOL_ANIMATION, _T(""), itemtool16Bitmap, itemtool16BitmapDisabled, wxITEM_NORMAL,
@@ -325,6 +328,7 @@
wxBitmap itemtool17BitmapDisabled (icons_path + _T("Icon_force_a.png"), wxBITMAP_TYPE_PNG);
tb1->AddTool (ID_TOOL_FORCE, _T(""), itemtool17Bitmap, itemtool17BitmapDisabled, wxITEM_NORMAL,
_T(""), wxT("Create force (not avaible yet)"));
+#endif
wxBitmap itemtool18Bitmap (icons_path + _T("Icon_controler.png"), wxBITMAP_TYPE_PNG);
wxBitmap itemtool18BitmapDisabled (icons_path + _T("Icon_controler_a.png"), wxBITMAP_TYPE_PNG);
@@ -333,12 +337,14 @@
tb1->AddSeparator();
+#if 0
wxBitmap itemtool19Bitmap(icons_path + _T("Icon_camera.png"), wxBITMAP_TYPE_PNG);
wxBitmap itemtool19BitmapDisabled(icons_path + _T("Icon_camera_a.png"), wxBITMAP_TYPE_PNG);
tb1->AddTool(ID_TOOL_CAMERA, _T(""), itemtool19Bitmap, itemtool19BitmapDisabled, wxITEM_NORMAL, _T(""),
wxT("Record (not avaible yet)"));
tb1->AddSeparator();
+#endif
itemMenuEdit->Enable (IA_MENUITEM_DELETE, false);
itemMenuAttach->Enable (IA_MENUITEM_ATTACH_BODY, false);
@@ -474,6 +480,10 @@
{
OnAttachBody ();
}
+void iaMainFrame::OnAttachCapsuleColliderMenuItem (wxCommandEvent& event)
+{
+ OnAttachCapsuleCollider ();
+}
void iaMainFrame::OnAttachSphereColliderMenuItem (wxCommandEvent& event)
{
OnAttachSphereCollider ();
Modified: trunk/src/apps/editor/gui/iaMainFrame.h
===================================================================
--- trunk/src/apps/editor/gui/iaMainFrame.h 2007-10-07 13:46:03 UTC (rev 340)
+++ trunk/src/apps/editor/gui/iaMainFrame.h 2007-10-08 11:37:23 UTC (rev 341)
@@ -83,6 +83,7 @@
#define ID_MENUITEM_SHOW_JOINTS 10049
#define ID_MENUITEM_SHOW_BODIES 10050
#define ID_MENUITEM_SHOW_CHARACTERS 10051
+#define ID_TOOL_ATTACH_CAPSULE_COLLIDER 10052
////@end control identifiers
/*!
@@ -149,6 +150,7 @@
void OnAttachJointMenuItem (wxCommandEvent& event);
void OnAttachBodyMenuItem (wxCommandEvent& event);
void OnAttachSphereColliderMenuItem (wxCommandEvent& event);
+ void OnAttachCapsuleColliderMenuItem (wxCommandEvent& event);
void OnAttachBoxColliderMenuItem (wxCommandEvent& event);
void OnSize (wxSizeEvent& event);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ob...@us...> - 2007-10-07 13:46:01
|
Revision: 340
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=340&view=rev
Author: obi666
Date: 2007-10-07 06:46:03 -0700 (Sun, 07 Oct 2007)
Log Message:
-----------
Applied r335-339 from trunk.
Modified Paths:
--------------
branches/release/V0.2/src/apps/editor/gui/gui_common.h
branches/release/V0.2/src/apps/editor/gui/widgets/iaSimulationPanel.cpp
branches/release/V0.2/src/apps/editor/gui/widgets/iaSimulationPanel.h
branches/release/V0.2/src/apps/editor/gui/widgets/iaTimeLineCtrl.cpp
branches/release/V0.2/src/apps/editor/gui/widgets/iaTimeLineCtrl.h
branches/release/V0.2/src/apps/editor/gui/widgets/iaTrackCtrl.cpp
branches/release/V0.2/src/apps/editor/iaCSApplication.cpp
branches/release/V0.2/src/plugins/dynamics/ode_dynamics/body.cpp
Modified: branches/release/V0.2/src/apps/editor/gui/gui_common.h
===================================================================
--- branches/release/V0.2/src/apps/editor/gui/gui_common.h 2007-10-07 13:28:09 UTC (rev 339)
+++ branches/release/V0.2/src/apps/editor/gui/gui_common.h 2007-10-07 13:46:03 UTC (rev 340)
@@ -22,10 +22,6 @@
#include <wx/dnd.h>
#include "editor.h"
-#define TIMELINE_UNIT_POS 8 //position of first unit on timeline
-#define TIMELINE_UNIT_SCALE 100.0
-#define PROGRESS_2_UNITS(progress) (progress / TIMELINE_UNIT_SCALE) * TIMELINE_UNIT_POS
-#define UNITS_2_PROGRESS(units) units * TIMELINE_UNIT_SCALE / TIMELINE_UNIT_POS
#define BUTTON_SIZE 32
#define TIMELINE_OFFSET 7*BUTTON_SIZE
Modified: branches/release/V0.2/src/apps/editor/gui/widgets/iaSimulationPanel.cpp
===================================================================
--- branches/release/V0.2/src/apps/editor/gui/widgets/iaSimulationPanel.cpp 2007-10-07 13:28:09 UTC (rev 339)
+++ branches/release/V0.2/src/apps/editor/gui/widgets/iaSimulationPanel.cpp 2007-10-07 13:46:03 UTC (rev 340)
@@ -38,6 +38,8 @@
IMPLEMENT_DYNAMIC_CLASS(iaSimulationPanel, wxPanel)
+iaSimulationPanel *iaSimulationPanel::m_pInstance = 0;
+
iaSimulationPanel::iaSimulationPanel (iEditorCentralInfo *central_info, iaMainFrame* parent, wxWindowID id,
const wxPoint& pos, const wxSize& size, long style)
: wxPanel (parent, id, pos, size, style)
@@ -47,6 +49,7 @@
play_forward_pressed = false;
play_backward_pressed = false;
simulate_pressed = false;
+ m_pInstance = this;
SetMinSize (wxSize (BUTTON_SIZE, BUTTON_SIZE));
}
void iaSimulationPanel::OnSize (wxSizeEvent& event)
Modified: branches/release/V0.2/src/apps/editor/gui/widgets/iaSimulationPanel.h
===================================================================
--- branches/release/V0.2/src/apps/editor/gui/widgets/iaSimulationPanel.h 2007-10-07 13:28:09 UTC (rev 339)
+++ branches/release/V0.2/src/apps/editor/gui/widgets/iaSimulationPanel.h 2007-10-07 13:46:03 UTC (rev 340)
@@ -52,6 +52,7 @@
};
void CreateControls ();
+ iaTimeLineCtrl *GetTimeLineCtrl () {return time_line_ctrl;}
//events
void OnLastFrameClick (wxCommandEvent& event);
@@ -63,6 +64,9 @@
void OnStepBackwardClick (wxCommandEvent& event);
void OnSize (wxSizeEvent& event);
+ /// singleton instance access
+ static iaSimulationPanel* instance () {return m_pInstance;}
+
DECLARE_DYNAMIC_CLASS(iaSimulationPanel)
private:
@@ -71,6 +75,7 @@
iaSimulationTracksCtrl *tracks_ctrl;
iEditorCentralInfo *central_info;
iaMainFrame *parent;
+ static iaSimulationPanel *m_pInstance;
//Buttons
wxBitmapButton *item_bitmap_button_step_forward;
Modified: branches/release/V0.2/src/apps/editor/gui/widgets/iaTimeLineCtrl.cpp
===================================================================
--- branches/release/V0.2/src/apps/editor/gui/widgets/iaTimeLineCtrl.cpp 2007-10-07 13:28:09 UTC (rev 339)
+++ branches/release/V0.2/src/apps/editor/gui/widgets/iaTimeLineCtrl.cpp 2007-10-07 13:46:03 UTC (rev 340)
@@ -65,22 +65,23 @@
wxWindow(parent, id, pos, size, style, name)
{
iaTimeLineCtrl::central_info = central_info;
- scale = 10;
+ timeline_font = new wxFont (10, wxMODERN, wxNORMAL, wxBOLD);
central_info->Get3dView ()->AddProgressListener (this);
central_info->GetObjectsInfo ()->AddListener (this);
wxString icons_path = wxString (central_info->GetIconsPath ().c_str (), wxConvUTF8);
- timeline_bitmap = wxBitmap (icons_path + _T("Icon_timeline.png"),
- wxBITMAP_TYPE_PNG);
timeline_ptr_bitmap = wxBitmap (icons_path + _T("Icon_timeline_pointer.png"), wxBITMAP_TYPE_PNG);
timeline_anim_ptr_pos = 0;
timeline_sim_ptr_pos = 0;
+ unit_size = 8;
+ unit_value = 100;
}
iaTimeLineCtrl::~iaTimeLineCtrl()
{
+ delete timeline_font;
}
void iaTimeLineCtrl::ObjectAdded (iEditorObject *obj)
{
@@ -96,19 +97,32 @@
PrepareDC (pdc);
DrawToDC (&pdc);
}
-int iaTimeLineCtrl::ScaleProgress (csTicks progress)
-{
- return (progress / TIMELINE_UNIT_SCALE) * TIMELINE_UNIT_POS;
-}
void iaTimeLineCtrl::SimulationStarted ()
{
timeline_sim_ptr_pos = 0;
Refresh ();
}
+void iaTimeLineCtrl::Rescale ()
+{
+ //first try to shrink space between units
+ unit_size -= 1;
+
+ //if we can't shrink the space more, we will rescale labels itself
+ if (unit_size < 5)
+ {
+ unit_size = 8;
+ unit_value *= 2;
+ }
+}
void iaTimeLineCtrl::SimulatorProgressChanged (csTicks progress)
{
int prev_pos = timeline_sim_ptr_pos;
- timeline_sim_ptr_pos = ScaleProgress (progress);
+ timeline_sim_ptr_pos = GetUnitPos (GetUnit (progress));
+ if (timeline_sim_ptr_pos > GetSize ().x - 20)
+ {
+ Rescale ();
+ timeline_sim_ptr_pos = GetUnitPos (GetUnit (progress));
+ }
if (prev_pos == timeline_sim_ptr_pos)
return;
@@ -124,11 +138,18 @@
memdc.SetBackground (wxBrush(GetBackgroundColour(), wxSOLID));
memdc.Clear();
- size_t b_cnt = GetSize ().x / timeline_bitmap.GetWidth () + 1;
- for (size_t i = 0; i < b_cnt; i++)
+ memdc.SetPen (*wxBLACK_PEN);
+ memdc.SetBrush (*wxBLACK_BRUSH);
+ int b_cnt = GetSize ().x / unit_size / 10 + 1;
+ for (int i = 0; i < b_cnt; i++)
{
- memdc.DrawBitmap (timeline_bitmap, TIMELINE_START + i * timeline_bitmap.GetWidth (),
- TIMELINE_YPOS, false);
+ int curr_scale = i * 10;
+ int curr_scale_pos = GetUnitPos (curr_scale);
+ memdc.DrawRectangle (curr_scale_pos, GetSize ().y - 18, 2, 18);
+ for (size_t i = 0; i < 10; i++)
+ {
+ memdc.DrawRectangle (GetUnitPos (curr_scale++), GetSize ().y - 5, 2, 5);
+ }
}
memdc.DrawBitmap (timeline_ptr_bitmap, timeline_anim_ptr_pos,
GetSize ().y - timeline_ptr_bitmap.GetHeight (), true);
@@ -136,9 +157,27 @@
memdc.SetBrush (wxBrush(wxColor (223, 211, 195, 125), wxCROSSDIAG_HATCH));
memdc.DrawRectangle (0,0, timeline_sim_ptr_pos, GetSize ().y);
+ memdc.SetFont(*timeline_font);
+ memdc.SetTextForeground (wxColor (122, 110, 90));
+ for (int i = 0; i < b_cnt; i++)
+ {
+ wxString label;
+ label.sprintf ("%d", GetUnitValue (i * 10));
+ memdc.DrawText (label, GetUnitPos (i * 10) - timeline_font->GetPointSize () * label.Length () / 2 -
+ timeline_font->GetPointSize () / 4, 0);
+ }
+
memdc.SelectObject (wxNullBitmap);
dc->DrawBitmap (dummy_bitmap, 0, 0);
}
+int iaTimeLineCtrl::GetPosValue (int pos)
+{
+ return (pos - TIMELINE_START) / unit_size * unit_value;
+}
+int iaTimeLineCtrl::GetUnitPos (int i)
+{
+ return TIMELINE_START + i * unit_size;
+}
void iaTimeLineCtrl::AnimationLockChanged (bool lock)
{
if (lock)
@@ -151,7 +190,7 @@
void iaTimeLineCtrl::AnimationProgressChanged (csTicks progress)
{
int prev_pos = timeline_anim_ptr_pos;
- timeline_anim_ptr_pos = ScaleProgress (progress);
+ timeline_anim_ptr_pos = GetUnitPos (GetUnit (progress));
if (prev_pos == timeline_anim_ptr_pos)
return;
wxClientDC cdc (this);
Modified: branches/release/V0.2/src/apps/editor/gui/widgets/iaTimeLineCtrl.h
===================================================================
--- branches/release/V0.2/src/apps/editor/gui/widgets/iaTimeLineCtrl.h 2007-10-07 13:28:09 UTC (rev 339)
+++ branches/release/V0.2/src/apps/editor/gui/widgets/iaTimeLineCtrl.h 2007-10-07 13:46:03 UTC (rev 340)
@@ -22,6 +22,7 @@
struct iEditorCentralInfo;
#include "ia-tool/iaBaseObjectListener.h"
+#include "iPcDynamicsSystem.h"
// When drag_count reaches 0, process drag message
@@ -60,17 +61,25 @@
// Events
void OnPaint (wxPaintEvent& event);
+ int GetProgressSize (int progress) {return GetUnit (progress) * unit_size;}
+ int GetPosValue (int pos);
+
protected:
- int ScaleProgress (csTicks progress);
+ int GetUnitPos (int i);
+ float GetUnit (int value) {return value / (float)unit_value;}
+ int GetUnitValue (int i) {return i * unit_value;}
+
+ /// Rescale timeline
+ void Rescale ();
iEditorCentralInfo *central_info;
- wxBitmap timeline_bitmap;
+ wxFont *timeline_font;
wxBitmap timeline_ptr_bitmap;
int timeline_anim_ptr_pos;
int timeline_sim_ptr_pos;
- //value of first 10 units on timeline
- int scale;
+ int unit_value; //value of one unit on timeline
+ int unit_size; //size of one unit on timeline
DECLARE_EVENT_TABLE()
};
Modified: branches/release/V0.2/src/apps/editor/gui/widgets/iaTrackCtrl.cpp
===================================================================
--- branches/release/V0.2/src/apps/editor/gui/widgets/iaTrackCtrl.cpp 2007-10-07 13:28:09 UTC (rev 339)
+++ branches/release/V0.2/src/apps/editor/gui/widgets/iaTrackCtrl.cpp 2007-10-07 13:46:03 UTC (rev 340)
@@ -43,6 +43,8 @@
#include <wx/dcgraph.h>
#include "../gui_common.h"
#include "iaTrackCtrl.h"
+#include "iaTimeLineCtrl.h"
+#include "iaSimulationPanel.h"
#include "iPcCharacter.h"
#include "iPcAnimation.h"
@@ -74,7 +76,6 @@
{
iaEventCtrl::central_info = central_info;
iaEventCtrl::track_event = track_event;
- SetSize(PROGRESS_2_UNITS(track_event->GetDuration ()), size.y);
}
iaEventCtrl::~iaEventCtrl()
@@ -83,8 +84,9 @@
void iaEventCtrl::OnSize (wxSizeEvent& event)
{
central_info->Get3dView ()->Lock (true);
- csTicks duration = UNITS_2_PROGRESS (event.GetSize ().x);
- csTicks start = UNITS_2_PROGRESS (GetPosition ().x);
+ iaTimeLineCtrl *timelineCtrl = iaSimulationPanel::instance ()->GetTimeLineCtrl ();
+ csTicks duration = timelineCtrl->GetPosValue (event.GetSize ().x);
+ csTicks start = timelineCtrl->GetPosValue (GetPosition ().x);
track_event->SetDuration (duration);
track_event->SetStart (start);
@@ -196,12 +198,14 @@
void iaTrackCtrl::PutObject (iEditorObject *obj, wxCoord x, wxCoord y)
{
central_info->Get3dView ()->Lock (true);
+ iaTimeLineCtrl *timeLineCtrl = iaSimulationPanel::instance ()->GetTimeLineCtrl ();
- csTicks start = UNITS_2_PROGRESS (x);
+ csTicks start = timeLineCtrl->GetPosValue (x);
iTrackEvent *event = track->PutOnTrack (obj);
event->SetStart (start);
iaEventCtrl *event_ctrl = new iaEventCtrl (central_info, event, this, -1,
- wxPoint (x, 0), wxSize (0, GetSize ().y));
+ wxPoint (x, 0), wxSize (timeLineCtrl->GetProgressSize (event->GetDuration ()), GetSize ().y));
+
switch (obj->GetObjectType ())
{
case IA_OBJECT_TYPE_ANIMATION:
@@ -274,7 +278,7 @@
void iaCharacterTracksCtrl::Expand ()
{
collapsed = false;
- SetSize (GetSize ().x, (1 + tracks.GetSize ()) * (size_t)track_size);
+ SetSize (GetSize ().x, (int) ((1 + tracks.GetSize ()) * track_size));
for (size_t i = 0; i < tracks.GetSize (); i++)
{
tracks[i]->Show (true);
@@ -283,10 +287,10 @@
void iaCharacterTracksCtrl::AddTrack (const wxColor& color, iTrack *track)
{
iaTrackCtrl *track_ctrl = new iaTrackCtrl (central_info, track,
- this, -1, wxPoint (0, (tracks.GetSize () + 1) * track_size), wxSize (GetSize ().x, track_size));
+ this, -1, wxPoint (0, (int) ((tracks.GetSize () + 1) * track_size)), wxSize (GetSize ().x, track_size));
track_ctrl->SetBackgroundColour (color);
tracks.Push (track_ctrl);
- SetSize (GetSize ().x, (tracks.GetSize () + 1) * track_size);
+ SetSize (GetSize ().x, (int) ((tracks.GetSize () + 1) * track_size));
}
bool iaCharacterTracksCtrl::CreateControls (int track_size)
{
Modified: branches/release/V0.2/src/apps/editor/iaCSApplication.cpp
===================================================================
--- branches/release/V0.2/src/apps/editor/iaCSApplication.cpp 2007-10-07 13:28:09 UTC (rev 339)
+++ branches/release/V0.2/src/apps/editor/iaCSApplication.cpp 2007-10-07 13:46:03 UTC (rev 340)
@@ -669,7 +669,6 @@
}
bool iaCSApplication::Open ()
{
- printf ("iaCSApplication::Open ()\n");
//Setup the wx windows 3d View
wxwin = scfQueryInterface<iWxWindow>(g2d);
if (!wxwin)
Modified: branches/release/V0.2/src/plugins/dynamics/ode_dynamics/body.cpp
===================================================================
--- branches/release/V0.2/src/plugins/dynamics/ode_dynamics/body.cpp 2007-10-07 13:28:09 UTC (rev 339)
+++ branches/release/V0.2/src/plugins/dynamics/ode_dynamics/body.cpp 2007-10-07 13:46:03 UTC (rev 340)
@@ -288,5 +288,5 @@
bool celPc_iaRigidBody::PerformAction(csStringID actionId, iCelParameterBlock* params)
{
return false;
-}
-
+}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ob...@us...> - 2007-10-07 13:28:07
|
Revision: 339
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=339&view=rev
Author: obi666
Date: 2007-10-07 06:28:09 -0700 (Sun, 07 Oct 2007)
Log Message:
-----------
Added rescaling feature for time-line.
Modified Paths:
--------------
trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.cpp
trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.h
Modified: trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.cpp
===================================================================
--- trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.cpp 2007-10-06 14:51:49 UTC (rev 338)
+++ trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.cpp 2007-10-07 13:28:09 UTC (rev 339)
@@ -102,10 +102,27 @@
timeline_sim_ptr_pos = 0;
Refresh ();
}
+void iaTimeLineCtrl::Rescale ()
+{
+ //first try to shrink space between units
+ unit_size -= 1;
+
+ //if we can't shrink the space more, we will rescale labels itself
+ if (unit_size < 5)
+ {
+ unit_size = 8;
+ unit_value *= 2;
+ }
+}
void iaTimeLineCtrl::SimulatorProgressChanged (csTicks progress)
{
int prev_pos = timeline_sim_ptr_pos;
timeline_sim_ptr_pos = GetUnitPos (GetUnit (progress));
+ if (timeline_sim_ptr_pos > GetSize ().x - 20)
+ {
+ Rescale ();
+ timeline_sim_ptr_pos = GetUnitPos (GetUnit (progress));
+ }
if (prev_pos == timeline_sim_ptr_pos)
return;
Modified: trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.h
===================================================================
--- trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.h 2007-10-06 14:51:49 UTC (rev 338)
+++ trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.h 2007-10-07 13:28:09 UTC (rev 339)
@@ -67,8 +67,11 @@
protected:
int GetUnitPos (int i);
- int GetUnit (int value) {return value / unit_value;}
+ float GetUnit (int value) {return value / (float)unit_value;}
int GetUnitValue (int i) {return i * unit_value;}
+
+ /// Rescale timeline
+ void Rescale ();
iEditorCentralInfo *central_info;
wxFont *timeline_font;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ob...@us...> - 2007-10-06 14:51:55
|
Revision: 338
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=338&view=rev
Author: obi666
Date: 2007-10-06 07:51:49 -0700 (Sat, 06 Oct 2007)
Log Message:
-----------
Cleaned leftover debugging code.
Modified Paths:
--------------
trunk/src/apps/editor/iaCSApplication.cpp
trunk/src/plugins/dynamics/ode_dynamics/body.cpp
Modified: trunk/src/apps/editor/iaCSApplication.cpp
===================================================================
--- trunk/src/apps/editor/iaCSApplication.cpp 2007-10-06 14:43:33 UTC (rev 337)
+++ trunk/src/apps/editor/iaCSApplication.cpp 2007-10-06 14:51:49 UTC (rev 338)
@@ -669,7 +669,6 @@
}
bool iaCSApplication::Open ()
{
- printf ("iaCSApplication::Open ()\n");
//Setup the wx windows 3d View
wxwin = scfQueryInterface<iWxWindow>(g2d);
if (!wxwin)
Modified: trunk/src/plugins/dynamics/ode_dynamics/body.cpp
===================================================================
--- trunk/src/plugins/dynamics/ode_dynamics/body.cpp 2007-10-06 14:43:33 UTC (rev 337)
+++ trunk/src/plugins/dynamics/ode_dynamics/body.cpp 2007-10-06 14:51:49 UTC (rev 338)
@@ -288,5 +288,5 @@
bool celPc_iaRigidBody::PerformAction(csStringID actionId, iCelParameterBlock* params)
{
return false;
-}
-
+}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ob...@us...> - 2007-10-06 14:43:29
|
Revision: 337
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=337&view=rev
Author: obi666
Date: 2007-10-06 07:43:33 -0700 (Sat, 06 Oct 2007)
Log Message:
-----------
Cleaning in time-line control pixels<->units<->values conversions.
Modified Paths:
--------------
trunk/src/apps/editor/gui/gui_common.h
trunk/src/apps/editor/gui/widgets/iaSimulationPanel.cpp
trunk/src/apps/editor/gui/widgets/iaSimulationPanel.h
trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.cpp
trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.h
trunk/src/apps/editor/gui/widgets/iaTrackCtrl.cpp
Modified: trunk/src/apps/editor/gui/gui_common.h
===================================================================
--- trunk/src/apps/editor/gui/gui_common.h 2007-10-06 12:58:56 UTC (rev 336)
+++ trunk/src/apps/editor/gui/gui_common.h 2007-10-06 14:43:33 UTC (rev 337)
@@ -22,10 +22,6 @@
#include <wx/dnd.h>
#include "editor.h"
-#define TIMELINE_UNIT_POS 8 //position of first unit on timeline
-#define TIMELINE_UNIT_SCALE 100.0
-#define PROGRESS_2_UNITS(progress) (progress / TIMELINE_UNIT_SCALE) * TIMELINE_UNIT_POS
-#define UNITS_2_PROGRESS(units) units * TIMELINE_UNIT_SCALE / TIMELINE_UNIT_POS
#define BUTTON_SIZE 32
#define TIMELINE_OFFSET 7*BUTTON_SIZE
Modified: trunk/src/apps/editor/gui/widgets/iaSimulationPanel.cpp
===================================================================
--- trunk/src/apps/editor/gui/widgets/iaSimulationPanel.cpp 2007-10-06 12:58:56 UTC (rev 336)
+++ trunk/src/apps/editor/gui/widgets/iaSimulationPanel.cpp 2007-10-06 14:43:33 UTC (rev 337)
@@ -38,6 +38,8 @@
IMPLEMENT_DYNAMIC_CLASS(iaSimulationPanel, wxPanel)
+iaSimulationPanel *iaSimulationPanel::m_pInstance = 0;
+
iaSimulationPanel::iaSimulationPanel (iEditorCentralInfo *central_info, iaMainFrame* parent, wxWindowID id,
const wxPoint& pos, const wxSize& size, long style)
: wxPanel (parent, id, pos, size, style)
@@ -47,6 +49,7 @@
play_forward_pressed = false;
play_backward_pressed = false;
simulate_pressed = false;
+ m_pInstance = this;
SetMinSize (wxSize (BUTTON_SIZE, BUTTON_SIZE));
}
void iaSimulationPanel::OnSize (wxSizeEvent& event)
Modified: trunk/src/apps/editor/gui/widgets/iaSimulationPanel.h
===================================================================
--- trunk/src/apps/editor/gui/widgets/iaSimulationPanel.h 2007-10-06 12:58:56 UTC (rev 336)
+++ trunk/src/apps/editor/gui/widgets/iaSimulationPanel.h 2007-10-06 14:43:33 UTC (rev 337)
@@ -52,6 +52,7 @@
};
void CreateControls ();
+ iaTimeLineCtrl *GetTimeLineCtrl () {return time_line_ctrl;}
//events
void OnLastFrameClick (wxCommandEvent& event);
@@ -63,6 +64,9 @@
void OnStepBackwardClick (wxCommandEvent& event);
void OnSize (wxSizeEvent& event);
+ /// singleton instance access
+ static iaSimulationPanel* instance () {return m_pInstance;}
+
DECLARE_DYNAMIC_CLASS(iaSimulationPanel)
private:
@@ -71,6 +75,7 @@
iaSimulationTracksCtrl *tracks_ctrl;
iEditorCentralInfo *central_info;
iaMainFrame *parent;
+ static iaSimulationPanel *m_pInstance;
//Buttons
wxBitmapButton *item_bitmap_button_step_forward;
Modified: trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.cpp
===================================================================
--- trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.cpp 2007-10-06 12:58:56 UTC (rev 336)
+++ trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.cpp 2007-10-06 14:43:33 UTC (rev 337)
@@ -76,7 +76,7 @@
timeline_anim_ptr_pos = 0;
timeline_sim_ptr_pos = 0;
unit_size = 8;
- unit_value = 1;
+ unit_value = 100;
}
iaTimeLineCtrl::~iaTimeLineCtrl()
@@ -97,10 +97,6 @@
PrepareDC (pdc);
DrawToDC (&pdc);
}
-int iaTimeLineCtrl::ScaleProgress (csTicks progress)
-{
- return (progress / TIMELINE_UNIT_SCALE) * TIMELINE_UNIT_POS;
-}
void iaTimeLineCtrl::SimulationStarted ()
{
timeline_sim_ptr_pos = 0;
@@ -109,7 +105,7 @@
void iaTimeLineCtrl::SimulatorProgressChanged (csTicks progress)
{
int prev_pos = timeline_sim_ptr_pos;
- timeline_sim_ptr_pos = ScaleProgress (progress);
+ timeline_sim_ptr_pos = GetUnitPos (GetUnit (progress));
if (prev_pos == timeline_sim_ptr_pos)
return;
@@ -131,11 +127,11 @@
for (int i = 0; i < b_cnt; i++)
{
int curr_scale = i * 10;
- int curr_scale_pos = GetScalePos (curr_scale);
+ int curr_scale_pos = GetUnitPos (curr_scale);
memdc.DrawRectangle (curr_scale_pos, GetSize ().y - 18, 2, 18);
for (size_t i = 0; i < 10; i++)
{
- memdc.DrawRectangle (GetScalePos (curr_scale++), GetSize ().y - 5, 2, 5);
+ memdc.DrawRectangle (GetUnitPos (curr_scale++), GetSize ().y - 5, 2, 5);
}
}
memdc.DrawBitmap (timeline_ptr_bitmap, timeline_anim_ptr_pos,
@@ -149,16 +145,20 @@
for (int i = 0; i < b_cnt; i++)
{
wxString label;
- label.sprintf ("%d", GetScaleValue (i * 10));
- memdc.DrawText (label, GetScalePos (i * 10) - timeline_font->GetPointSize () * label.Length () / 2 -
+ label.sprintf ("%d", GetUnitValue (i * 10));
+ memdc.DrawText (label, GetUnitPos (i * 10) - timeline_font->GetPointSize () * label.Length () / 2 -
timeline_font->GetPointSize () / 4, 0);
}
memdc.SelectObject (wxNullBitmap);
dc->DrawBitmap (dummy_bitmap, 0, 0);
}
-int iaTimeLineCtrl::GetScalePos (int i)
+int iaTimeLineCtrl::GetPosValue (int pos)
{
+ return (pos - TIMELINE_START) / unit_size * unit_value;
+}
+int iaTimeLineCtrl::GetUnitPos (int i)
+{
return TIMELINE_START + i * unit_size;
}
void iaTimeLineCtrl::AnimationLockChanged (bool lock)
@@ -173,7 +173,7 @@
void iaTimeLineCtrl::AnimationProgressChanged (csTicks progress)
{
int prev_pos = timeline_anim_ptr_pos;
- timeline_anim_ptr_pos = ScaleProgress (progress);
+ timeline_anim_ptr_pos = GetUnitPos (GetUnit (progress));
if (prev_pos == timeline_anim_ptr_pos)
return;
wxClientDC cdc (this);
Modified: trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.h
===================================================================
--- trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.h 2007-10-06 12:58:56 UTC (rev 336)
+++ trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.h 2007-10-06 14:43:33 UTC (rev 337)
@@ -22,6 +22,7 @@
struct iEditorCentralInfo;
#include "ia-tool/iaBaseObjectListener.h"
+#include "iPcDynamicsSystem.h"
// When drag_count reaches 0, process drag message
@@ -60,11 +61,14 @@
// Events
void OnPaint (wxPaintEvent& event);
+ int GetProgressSize (int progress) {return GetUnit (progress) * unit_size;}
+ int GetPosValue (int pos);
+
protected:
- int ScaleProgress (csTicks progress);
- int GetScaleValue (int i) {return i * unit_value;}
- int GetScalePos (int i);
+ int GetUnitPos (int i);
+ int GetUnit (int value) {return value / unit_value;}
+ int GetUnitValue (int i) {return i * unit_value;}
iEditorCentralInfo *central_info;
wxFont *timeline_font;
Modified: trunk/src/apps/editor/gui/widgets/iaTrackCtrl.cpp
===================================================================
--- trunk/src/apps/editor/gui/widgets/iaTrackCtrl.cpp 2007-10-06 12:58:56 UTC (rev 336)
+++ trunk/src/apps/editor/gui/widgets/iaTrackCtrl.cpp 2007-10-06 14:43:33 UTC (rev 337)
@@ -43,6 +43,8 @@
#include <wx/dcgraph.h>
#include "../gui_common.h"
#include "iaTrackCtrl.h"
+#include "iaTimeLineCtrl.h"
+#include "iaSimulationPanel.h"
#include "iPcCharacter.h"
#include "iPcAnimation.h"
@@ -74,7 +76,6 @@
{
iaEventCtrl::central_info = central_info;
iaEventCtrl::track_event = track_event;
- SetSize(PROGRESS_2_UNITS(track_event->GetDuration ()), size.y);
}
iaEventCtrl::~iaEventCtrl()
@@ -83,8 +84,9 @@
void iaEventCtrl::OnSize (wxSizeEvent& event)
{
central_info->Get3dView ()->Lock (true);
- csTicks duration = UNITS_2_PROGRESS (event.GetSize ().x);
- csTicks start = UNITS_2_PROGRESS (GetPosition ().x);
+ iaTimeLineCtrl *timelineCtrl = iaSimulationPanel::instance ()->GetTimeLineCtrl ();
+ csTicks duration = timelineCtrl->GetPosValue (event.GetSize ().x);
+ csTicks start = timelineCtrl->GetPosValue (GetPosition ().x);
track_event->SetDuration (duration);
track_event->SetStart (start);
@@ -196,12 +198,14 @@
void iaTrackCtrl::PutObject (iEditorObject *obj, wxCoord x, wxCoord y)
{
central_info->Get3dView ()->Lock (true);
+ iaTimeLineCtrl *timeLineCtrl = iaSimulationPanel::instance ()->GetTimeLineCtrl ();
- csTicks start = UNITS_2_PROGRESS (x);
+ csTicks start = timeLineCtrl->GetPosValue (x);
iTrackEvent *event = track->PutOnTrack (obj);
event->SetStart (start);
iaEventCtrl *event_ctrl = new iaEventCtrl (central_info, event, this, -1,
- wxPoint (x, 0), wxSize (0, GetSize ().y));
+ wxPoint (x, 0), wxSize (timeLineCtrl->GetProgressSize (event->GetDuration ()), GetSize ().y));
+
switch (obj->GetObjectType ())
{
case IA_OBJECT_TYPE_ANIMATION:
@@ -274,7 +278,7 @@
void iaCharacterTracksCtrl::Expand ()
{
collapsed = false;
- SetSize (GetSize ().x, (1 + tracks.GetSize ()) * (size_t)track_size);
+ SetSize (GetSize ().x, (int) ((1 + tracks.GetSize ()) * track_size));
for (size_t i = 0; i < tracks.GetSize (); i++)
{
tracks[i]->Show (true);
@@ -283,10 +287,10 @@
void iaCharacterTracksCtrl::AddTrack (const wxColor& color, iTrack *track)
{
iaTrackCtrl *track_ctrl = new iaTrackCtrl (central_info, track,
- this, -1, wxPoint (0, (tracks.GetSize () + 1) * track_size), wxSize (GetSize ().x, track_size));
+ this, -1, wxPoint (0, (int) ((tracks.GetSize () + 1) * track_size)), wxSize (GetSize ().x, track_size));
track_ctrl->SetBackgroundColour (color);
tracks.Push (track_ctrl);
- SetSize (GetSize ().x, (tracks.GetSize () + 1) * track_size);
+ SetSize (GetSize ().x, (int) ((tracks.GetSize () + 1) * track_size));
}
bool iaCharacterTracksCtrl::CreateControls (int track_size)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ob...@us...> - 2007-10-06 12:58:52
|
Revision: 336
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=336&view=rev
Author: obi666
Date: 2007-10-06 05:58:56 -0700 (Sat, 06 Oct 2007)
Log Message:
-----------
Improved time-line scale visualization.
Modified Paths:
--------------
trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.cpp
trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.h
Removed Paths:
-------------
trunk/data/gui/icons/Icon_timeline.png
Deleted: trunk/data/gui/icons/Icon_timeline.png
===================================================================
(Binary files differ)
Modified: trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.cpp
===================================================================
--- trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.cpp 2007-10-06 12:10:23 UTC (rev 335)
+++ trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.cpp 2007-10-06 12:58:56 UTC (rev 336)
@@ -65,7 +65,6 @@
wxWindow(parent, id, pos, size, style, name)
{
iaTimeLineCtrl::central_info = central_info;
- scale = 10;
timeline_font = new wxFont (10, wxMODERN, wxNORMAL, wxBOLD);
central_info->Get3dView ()->AddProgressListener (this);
@@ -73,11 +72,11 @@
wxString icons_path = wxString (central_info->GetIconsPath ().c_str (), wxConvUTF8);
- timeline_bitmap = wxBitmap (icons_path + _T("Icon_timeline.png"),
- wxBITMAP_TYPE_PNG);
timeline_ptr_bitmap = wxBitmap (icons_path + _T("Icon_timeline_pointer.png"), wxBITMAP_TYPE_PNG);
timeline_anim_ptr_pos = 0;
timeline_sim_ptr_pos = 0;
+ unit_size = 8;
+ unit_value = 1;
}
iaTimeLineCtrl::~iaTimeLineCtrl()
@@ -126,11 +125,18 @@
memdc.SetBackground (wxBrush(GetBackgroundColour(), wxSOLID));
memdc.Clear();
- int b_cnt = GetSize ().x / timeline_bitmap.GetWidth () + 1;
+ memdc.SetPen (*wxBLACK_PEN);
+ memdc.SetBrush (*wxBLACK_BRUSH);
+ int b_cnt = GetSize ().x / unit_size / 10 + 1;
for (int i = 0; i < b_cnt; i++)
{
- memdc.DrawBitmap (timeline_bitmap, TIMELINE_START + i * timeline_bitmap.GetWidth (),
- TIMELINE_YPOS, false);
+ int curr_scale = i * 10;
+ int curr_scale_pos = GetScalePos (curr_scale);
+ memdc.DrawRectangle (curr_scale_pos, GetSize ().y - 18, 2, 18);
+ for (size_t i = 0; i < 10; i++)
+ {
+ memdc.DrawRectangle (GetScalePos (curr_scale++), GetSize ().y - 5, 2, 5);
+ }
}
memdc.DrawBitmap (timeline_ptr_bitmap, timeline_anim_ptr_pos,
GetSize ().y - timeline_ptr_bitmap.GetHeight (), true);
@@ -143,14 +149,18 @@
for (int i = 0; i < b_cnt; i++)
{
wxString label;
- label.sprintf ("%d", GetScale (i));
- memdc.DrawText (label, TIMELINE_START + i * timeline_bitmap.GetWidth ()
- - timeline_font->GetPointSize () * label.Length () / 2 - timeline_font->GetPointSize () / 4, 0);
+ label.sprintf ("%d", GetScaleValue (i * 10));
+ memdc.DrawText (label, GetScalePos (i * 10) - timeline_font->GetPointSize () * label.Length () / 2 -
+ timeline_font->GetPointSize () / 4, 0);
}
memdc.SelectObject (wxNullBitmap);
dc->DrawBitmap (dummy_bitmap, 0, 0);
}
+int iaTimeLineCtrl::GetScalePos (int i)
+{
+ return TIMELINE_START + i * unit_size;
+}
void iaTimeLineCtrl::AnimationLockChanged (bool lock)
{
if (lock)
Modified: trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.h
===================================================================
--- trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.h 2007-10-06 12:10:23 UTC (rev 335)
+++ trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.h 2007-10-06 12:58:56 UTC (rev 336)
@@ -63,15 +63,16 @@
protected:
int ScaleProgress (csTicks progress);
- int GetScale (int i) {return i * scale;}
+ int GetScaleValue (int i) {return i * unit_value;}
+ int GetScalePos (int i);
iEditorCentralInfo *central_info;
wxFont *timeline_font;
- wxBitmap timeline_bitmap;
wxBitmap timeline_ptr_bitmap;
int timeline_anim_ptr_pos;
int timeline_sim_ptr_pos;
- int scale; //value of first 10 units on timeline
+ int unit_value; //value of one unit on timeline
+ int unit_size; //size of one unit on timeline
DECLARE_EVENT_TABLE()
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ob...@us...> - 2007-10-06 12:10:19
|
Revision: 335
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=335&view=rev
Author: obi666
Date: 2007-10-06 05:10:23 -0700 (Sat, 06 Oct 2007)
Log Message:
-----------
Added scale labels on time-line.
Modified Paths:
--------------
trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.cpp
trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.h
Modified: trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.cpp
===================================================================
--- trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.cpp 2007-10-02 12:01:30 UTC (rev 334)
+++ trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.cpp 2007-10-06 12:10:23 UTC (rev 335)
@@ -66,6 +66,7 @@
{
iaTimeLineCtrl::central_info = central_info;
scale = 10;
+ timeline_font = new wxFont (10, wxMODERN, wxNORMAL, wxBOLD);
central_info->Get3dView ()->AddProgressListener (this);
central_info->GetObjectsInfo ()->AddListener (this);
@@ -81,6 +82,7 @@
iaTimeLineCtrl::~iaTimeLineCtrl()
{
+ delete timeline_font;
}
void iaTimeLineCtrl::ObjectAdded (iEditorObject *obj)
{
@@ -124,8 +126,8 @@
memdc.SetBackground (wxBrush(GetBackgroundColour(), wxSOLID));
memdc.Clear();
- size_t b_cnt = GetSize ().x / timeline_bitmap.GetWidth () + 1;
- for (size_t i = 0; i < b_cnt; i++)
+ int b_cnt = GetSize ().x / timeline_bitmap.GetWidth () + 1;
+ for (int i = 0; i < b_cnt; i++)
{
memdc.DrawBitmap (timeline_bitmap, TIMELINE_START + i * timeline_bitmap.GetWidth (),
TIMELINE_YPOS, false);
@@ -136,6 +138,16 @@
memdc.SetBrush (wxBrush(wxColor (223, 211, 195, 125), wxCROSSDIAG_HATCH));
memdc.DrawRectangle (0,0, timeline_sim_ptr_pos, GetSize ().y);
+ memdc.SetFont(*timeline_font);
+ memdc.SetTextForeground (wxColor (122, 110, 90));
+ for (int i = 0; i < b_cnt; i++)
+ {
+ wxString label;
+ label.sprintf ("%d", GetScale (i));
+ memdc.DrawText (label, TIMELINE_START + i * timeline_bitmap.GetWidth ()
+ - timeline_font->GetPointSize () * label.Length () / 2 - timeline_font->GetPointSize () / 4, 0);
+ }
+
memdc.SelectObject (wxNullBitmap);
dc->DrawBitmap (dummy_bitmap, 0, 0);
}
Modified: trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.h
===================================================================
--- trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.h 2007-10-02 12:01:30 UTC (rev 334)
+++ trunk/src/apps/editor/gui/widgets/iaTimeLineCtrl.h 2007-10-06 12:10:23 UTC (rev 335)
@@ -63,14 +63,15 @@
protected:
int ScaleProgress (csTicks progress);
+ int GetScale (int i) {return i * scale;}
iEditorCentralInfo *central_info;
+ wxFont *timeline_font;
wxBitmap timeline_bitmap;
wxBitmap timeline_ptr_bitmap;
int timeline_anim_ptr_pos;
int timeline_sim_ptr_pos;
- //value of first 10 units on timeline
- int scale;
+ int scale; //value of first 10 units on timeline
DECLARE_EVENT_TABLE()
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ob...@us...> - 2007-10-02 12:10:30
|
Revision: 334
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=334&view=rev
Author: obi666
Date: 2007-10-02 05:01:30 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
- Code updated to cs trunk version.
Modified Paths:
--------------
trunk/src/plugins/dynamics/ode_dynamics/ode_simulation.cpp
trunk/src/plugins/dynamics/ode_dynamics/ode_simulation.h
Modified: trunk/src/plugins/dynamics/ode_dynamics/ode_simulation.cpp
===================================================================
--- trunk/src/plugins/dynamics/ode_dynamics/ode_simulation.cpp 2007-10-01 12:18:14 UTC (rev 333)
+++ trunk/src/plugins/dynamics/ode_dynamics/ode_simulation.cpp 2007-10-02 12:01:30 UTC (rev 334)
@@ -190,7 +190,7 @@
if (!dyn)
{
csRef<iPluginManager> plugmgr = csQueryRegistry<iPluginManager>(object_reg);
- dyn = CS_LOAD_PLUGIN(plugmgr, "crystalspace.dynamics.ode", iDynamics);
+ dyn = csLoadPlugin<iDynamics> (plugmgr, "crystalspace.dynamics.ode");
if (dyn)
object_reg->Register(dyn, "iDynamics");
else
Modified: trunk/src/plugins/dynamics/ode_dynamics/ode_simulation.h
===================================================================
--- trunk/src/plugins/dynamics/ode_dynamics/ode_simulation.h 2007-10-01 12:18:14 UTC (rev 333)
+++ trunk/src/plugins/dynamics/ode_dynamics/ode_simulation.h 2007-10-02 12:01:30 UTC (rev 334)
@@ -119,5 +119,5 @@
}
} * scfiCelTimerListener;
};
-#endif
-
+#endif
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ob...@us...> - 2007-10-01 12:18:11
|
Revision: 333
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=333&view=rev
Author: obi666
Date: 2007-10-01 05:18:14 -0700 (Mon, 01 Oct 2007)
Log Message:
-----------
Created main branch.
Added Paths:
-----------
trunk/
Copied: trunk (from rev 332, branches/release/V0.2)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ob...@us...> - 2007-10-01 12:16:56
|
Revision: 332
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=332&view=rev
Author: obi666
Date: 2007-10-01 05:16:59 -0700 (Mon, 01 Oct 2007)
Log Message:
-----------
ups
Removed Paths:
-------------
branches/release/V0.2/branches/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ob...@us...> - 2007-10-01 11:54:21
|
Revision: 331
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=331&view=rev
Author: obi666
Date: 2007-10-01 04:54:24 -0700 (Mon, 01 Oct 2007)
Log Message:
-----------
Cleaning on root path.
Removed Paths:
-------------
Jamfile.in
Jamrules
autogen.sh
config.h.in
configure
configure.ac
data/
doc/
mk/
msvc/
src/
vfs.cfg
Deleted: Jamfile.in
===================================================================
--- Jamfile.in 2007-10-01 11:47:18 UTC (rev 330)
+++ Jamfile.in 2007-10-01 11:54:24 UTC (rev 331)
@@ -1,122 +0,0 @@
-TOP ?= "@top_srcdir@" ;
-BUILDTOP ?= "@top_builddir@" ;
-
-SubDir TOP ;
-
-IncludeDir ;
-IncludeDir src ;
-IncludeDir src include ;
-IncludeDir $(BUILDTOP) : : literal transient ;
-
-CleanDir clean :
- out ;
-Clean distclean :
- aclocal.m4
- config.h
- config.h.in~
- config.log
- config.status
- config.status.lineno
- config.cache
- configure.lineno
- Jamconfig
- Jamfile ;
-CleanDir distclean :
- autom4te.cache ;
-Depends distclean : clean ;
-
-Clean maintainerclean :
- config.h.in
- configure ;
-Depends maintainerclean : distclean ;
-
-Help distclean : "Remove built targets and configuration" ;
-Help maintainerclean :
- "Remove built targets, configuration, and generated files." ;
-
-# Set up subdirectories into which the different generated project for
-# different go.
-MsvcGenSubDir TOP msvc : common ;
-MsvcGenSubDir TOP msvc 7 : 7 ;
-MsvcGenSubDir TOP msvc 71 : 71 ;
-MsvcGenSubDir TOP msvc 8 : 8 ;
-MsvcGenTemplateDir TOP mk msvcgen ;
-
-# Customize the build configurations to contain some defines required by
-# CrystalSpace. NOTE: The file with the customization options is assumed
-# to reside in mk/msvcgen/.
-MsvcGenVariable customize : custom.cslib ;
-
-# Set up the workspace we want msvcgen to synthesize.
-MsvcGenWorkspace iaeditor ;
-
-local hash = "\$" ;
-MsvcGenConfig CRYSTAL.AVAILABLE : yes ;
-MsvcGenConfig CRYSTAL.DEFINES ;
-MsvcGenConfig CRYSTAL.CFLAGS ;
-MsvcGenConfig CRYSTAL.LFLAGS ;
-MsvcGenConfig CRYSTAL.LIBS : "libcrystalspace.lib" ;
-MsvcGenConfig CRYSTAL.LIBS.DEBUG : "libcrystalspace_d.lib" ;
-MsvcGenConfig CRYSTAL.INCDIRS :
- [ ConcatDirs .. .. .. CS include ]
- [ ConcatDirs .. .. .. CS include csutil win32 ]
- [ ConcatDirs "$(hash)(CRYSTAL)" include ]
- [ ConcatDirs "$(hash)(CRYSTAL)" include csutil win32 ] ;
-MsvcGenConfig CRYSTAL.LIBDIRS :
- [ ConcatDirs .. .. .. CS out release$(MSVC_VERSION) libs ]
- [ ConcatDirs .. .. .. CS libs csutil win32 libs ]
- [ ConcatDirs "$(hash)(CRYSTAL)" out release$(MSVC_VERSION) libs ]
- [ ConcatDirs "$(hash)(CRYSTAL)" libs csutil win32 libs ] ;
-MsvcGenConfig CRYSTAL.LIBDIRS.DEBUG :
- [ ConcatDirs .. .. .. CS out debug$(MSVC_VERSION) libs ]
- [ ConcatDirs .. .. .. CS libs csutil win32 libs ]
- [ ConcatDirs "$(hash)(CRYSTAL)" out debug$(MSVC_VERSION) libs ]
- [ ConcatDirs "$(hash)(CRYSTAL)" libs csutil win32 libs ] ;
-
-
-if $(CEL.DESIRED) = yes
-{
- MsvcGenConfig CEL.AVAILABLE : yes ;
- MsvcGenConfig CEL.DEFINES : USE_CEL ;
- MsvcGenConfig CEL.CFLAGS ;
- MsvcGenConfig CEL.LFLAGS ;
- MsvcGenConfig CEL.LIBS : "libceltool.lib" ;
- MsvcGenConfig CEL.LIBS.DEBUG : "libceltool_d.lib" ;
- MsvcGenConfig CEL.INCDIRS :
- [ ConcatDirs .. .. .. cel include ]
- [ ConcatDirs "$(hash)(CEL)" include ]
- [ ConcatDirs "$(hash)(CEL)" include cel ] ;
- MsvcGenConfig CEL.LIBDIRS :
- [ ConcatDirs .. .. .. cel out release libs ]
- [ ConcatDirs "$(hash)(CEL)" out release libs ]
- [ ConcatDirs "$(hash)(CEL)" libs ] ;
- MsvcGenConfig CEL.LIBDIRS.DEBUG :
- [ ConcatDirs .. .. .. cel out debug libs ]
- [ ConcatDirs "$(hash)(CEL)" out debug libs ]
- [ ConcatDirs "$(hash)(CEL)" libs ] ;
-}
-
-MsvcGenConfig WX.AVAILABLE : yes ;
-MsvcGenConfig WX.DEFINES : "wxUSE_GUI=1 WXUSINGDLL=1" ;
-MsvcGenConfig WX.LIBS : "wxbase28.lib wxmsw28_core.lib wxmsw28_gl.lib opengl32.lib wxmsw28_aui.lib" ;
-MsvcGenConfig WX.DEFINES.DEBUG : "wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;" ;
-MsvcGenConfig WX.CFLAGS : "" ;
-MsvcGenConfig WX.LFLAGS : "" ;
-MsvcGenConfig WX.LIBS.DEBUG : "wxbase28d.lib wxmsw28d_core.lib wxmsw28d_gl.lib opengl32.lib wxmsw28d_aui.lib" ;
-
-# Set project-specific compiler and linker options for msvcgen.
-#MsvcDefine MY_DEFINE : "my value" ;
-#MsvcDefine MY_RELEASE_DEFINE : "my release value" : release ;
-#MsvcDefine MY_DEBUG_DEFINE : "my debug value" : debug ;
-#MsvcCFlags : "/I \"my\\inc\\path\"" : release ;
-#MsvcCFlags : "/I \"my\\debuginc\\path\"" : debug ;
-#MsvcLFlags : "/libpath:\"my\\lib\\path\"" : release ;
-#MsvcLFlags : "/libpath:\"my\\debuglib\\path\"" : debug ;
-#MsvcGenConfig SUPERCOOL.AVAILABLE : yes ;
-#MsvcGenConfig SUPERCOOL.LIBS : supercool.lib ;
-#MsvcGenConfig SUPERCOOL.LIBS.DEBUG : supercooldebug.lib ;
-
-Description iaeditorall : "IAEditor and related plugins" ;
-RegisterCompileGroups iaeditorall ;
-
-SubInclude TOP src ;
Deleted: Jamrules
===================================================================
--- Jamrules 2007-10-01 11:47:18 UTC (rev 330)
+++ Jamrules 2007-10-01 11:54:24 UTC (rev 331)
@@ -1,21 +0,0 @@
-if ! $(BUILDTOP)
-{
-BUILDTOP = . ;
-}
-
-# Include configuration.
-JAMCONFIG ?= $(BUILDTOP)/Jamconfig ;
-include $(JAMCONFIG) ;
-
-# Set up compiler flags.
-# Unfortunately, we can not use FDefines here since Boost Jam does not have it,
-# and we have not yet included mk/jam/build.jam which provides an emulation
-# layer for Boost. We can not include build.jam earlier because these flags
-# need to be defined before build.jam is included. :-(
-COMPILER.CFLAGS = -Wall -Wno-unknown-pragmas ;
-COMPILER.CFLAGS.optimize = -O3 -fomit-frame-pointer -ffast-math ;
-COMPILER.CFLAGS.debug = -g3 -DCS_DEBUG ;
-COMPILER.CFLAGS.profile = -gp -O3 ;
-
-# Include CS build rules
-include $(TOP)/mk/jam/build.jam ;
Deleted: autogen.sh
===================================================================
--- autogen.sh 2007-10-01 11:47:18 UTC (rev 330)
+++ autogen.sh 2007-10-01 11:54:24 UTC (rev 331)
@@ -1,25 +0,0 @@
-#! /bin/sh
-
-if test ! -f configure.ac ; then
- echo "*** Please invoke this script from directory containing configure.ac."
- exit 1
-fi
-
-MACROFILE=aclocal.m4
-MACRODIR=mk/autoconf
-
-rm -f $MACROFILE
-for i in $MACRODIR/*.m4 ; do
- cat $i >> $MACROFILE
-done
-
-autoheader
-rc=$?
-
-if test $rc -eq 0; then
- autoconf
- rc=$?
-fi
-
-rm -f $MACROFILE
-exit $rc
Deleted: config.h.in
===================================================================
--- config.h.in 2007-10-01 11:47:18 UTC (rev 330)
+++ config.h.in 2007-10-01 11:54:24 UTC (rev 331)
@@ -1,85 +0,0 @@
-/* config.h.in. Generated from configure.ac by autoheader. */
-
-/* Define with path to CEL plugins. */
-#undef CEL_PLUGIN_DIR
-
-/* Define when compiling for MacOS/X */
-#undef CS_PLATFORM_MACOSX
-
-/* Define when compiling for Unix and Unix-like (i.e. MacOS/X) */
-#undef CS_PLATFORM_UNIX
-
-/* Define when compiling for Win32 */
-#undef CS_PLATFORM_WIN32
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#undef HAVE_ARPA_INET_H
-
-/* Define to 1 if you have the <elf.h> header file. */
-#undef HAVE_ELF_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <netdb.h> header file. */
-#undef HAVE_NETDB_H
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#undef HAVE_NETINET_IN_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#undef HAVE_SYS_IOCTL_H
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#undef HAVE_SYS_SOCKET_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the <winsock.h> header file. */
-#undef HAVE_WINSOCK_H
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define to enable CEL. */
-#undef USE_CEL
-
-/* Avoid problem caused by missing <Carbon/CarbonSound.h> */
-#undef __CARBONSOUND__
Deleted: configure
===================================================================
--- configure 2007-10-01 11:47:18 UTC (rev 330)
+++ configure 2007-10-01 11:54:24 UTC (rev 331)
@@ -1,19362 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for csextra 0.0.
-#
-# Report bugs to <jor...@gm...>.
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order. Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" "" $as_nl"
-
-# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
- *[\\/]* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
- ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
- as_myself=$0
-fi
-if test ! -f "$as_myself"; then
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
-do
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
-else
- as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
- }
- /^X\/\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\/\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-if test "x$CONFIG_SHELL" = x; then
- if (eval ":") 2>/dev/null; then
- as_have_required=yes
-else
- as_have_required=no
-fi
-
- if test $as_have_required = yes && (eval ":
-(as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=\$LINENO
- as_lineno_2=\$LINENO
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
- :
-else
- as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- case $as_dir in
- /*)
- for as_base in sh bash ksh sh5; do
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
- done;;
- esac
-done
-IFS=$as_save_IFS
-
-
- for as_shell in $as_candidate_shells $SHELL; do
- # Try only shells that exist, to save several forks.
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- { ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
- CONFIG_SHELL=$as_shell
- as_have_required=yes
- if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
- (exit $1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
- break
-fi
-
-fi
-
- done
-
- if test "x$CONFIG_SHELL" != x; then
- for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
- if test $as_have_required = no; then
- echo This script requires a shell more modern than all the
- echo shells that I found on your system. Please install a
- echo modern shell, or manually run the script under such a
- echo shell if you do have one.
- { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
- echo No shell found that supports shell functions.
- echo Please tell aut...@gn... about your system,
- echo including any error possibly output before this
- echo message
-}
-
-
-
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
- sed -n '
- p
- /[$]LINENO/=
- ' <$as_myself |
- sed '
- s/[$]LINENO.*/&-/
- t lineno
- b
- :lineno
- N
- :loop
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
- s/-\n.*//
- ' >$as_me.lineno &&
- chmod +x "$as_me.lineno" ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensitive to this).
- . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
- case `echo 'x\c'` in
- *c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
- esac;;
-*)
- ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
- rm -f conf$$.dir/conf$$.file
-else
- rm -f conf$$.dir
- mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
-else
- as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
- as_mkdir_p='mkdir -p'
-elif mkdirs . 2>/dev/null; then
- as_mkdir_p='mkdirs'
-else
- as_mkdir_p=''
-fi
-test -d ./-p && rmdir ./-p
-
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-
-exec 7<&0 </dev/null 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Identity of this package.
-PACKAGE_NAME='csextra'
-PACKAGE_TARNAME='csextra'
-PACKAGE_VERSION='0.0'
-PACKAGE_STRING='csextra 0.0'
-PACKAGE_BUGREPORT='jor...@gm...'
-
-ac_unique_file="mk/jam/build.jam"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-# include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-CXX
-CXXFLAGS
-ac_ct_CXX
-LD
-ac_ct_LD
-RANLIB
-WINDRES
-ac_ct_WINDRES
-DOXYGEN
-DOT
-ac_ct_DOT
-TEXI2DVI
-TEXI2PDF
-DVIPS
-DVIPDF
-MAKEINFO
-INSTALL
-LIBTOOL_TEST
-ac_ct_LIBTOOL_TEST
-LIBTOOL_PATH
-LIBTOOL
-ac_ct_LIBTOOL
-CS_LT_APPLE
-APPLE_LIBTOOL
-MKDIR
-MKDIRS
-PERL
-TTREE
-SWIG
-PKG_CONFIG
-ac_ct_PKG_CONFIG
-CONFIG_CPPUNIT
-ac_ct_CONFIG_CPPUNIT
-PYTHON
-CPP
-GREP
-EGREP
-CONFIG_VERSE
-ac_ct_CONFIG_VERSE
-CONFIG_QT_MT
-ac_ct_CONFIG_QT_MT
-CONFIG_JS
-ac_ct_CONFIG_JS
-CONFIG_WX
-ac_ct_CONFIG_WX
-CRYSTAL
-CRYSTAL_CONFIG_TOOL
-CEL
-CEL_CONFIG_TOOL
-OBJCOPY
-ac_ct_OBJCOPY
-CONFIG_BFD
-ac_ct_CONFIG_BFD
-LIBOBJS
-LTLIBOBJS'
-ac_subst_files=''
- ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CXX
-CXXFLAGS
-CCC
-CPP
-CRYSTAL
-CEL'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
- # If the previous option needs an argument, assign it.
- if test -n "$ac_prev"; then
- eval $ac_prev=\$ac_option
- ac_prev=
- continue
- fi
-
- case $ac_option in
- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *) ac_optarg=yes ;;
- esac
-
- # Accept the important Cygnus configure options, so we can diagnose typos.
-
- case $ac_dashdash$ac_option in
- --)
- ac_dashdash=yes ;;
-
- -bindir | --bindir | --bindi | --bind | --bin | --bi)
- ac_prev=bindir ;;
- -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
- bindir=$ac_optarg ;;
-
- -build | --build | --buil | --bui | --bu)
- ac_prev=build_alias ;;
- -build=* | --build=* | --buil=* | --bui=* | --bu=*)
- build_alias=$ac_optarg ;;
-
- -cache-file | --cache-file | --cache-fil | --cache-fi \
- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
- ac_prev=cache_file ;;
- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
- cache_file=$ac_optarg ;;
-
- --config-cache | -C)
- cache_file=config.cache ;;
-
- -datadir | --datadir | --datadi | --datad)
- ac_prev=datadir ;;
- -datadir=* | --datadir=* | --datadi=* | --datad=*)
- datadir=$ac_optarg ;;
-
- -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
- | --dataroo | --dataro | --datar)
- ac_prev=datarootdir ;;
- -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
- | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
- datarootdir=$ac_optarg ;;
-
- -disable-* | --disable-*)
- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
- eval enable_$ac_feature=no ;;
-
- -docdir | --docdir | --docdi | --doc | --do)
- ac_prev=docdir ;;
- -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
- docdir=$ac_optarg ;;
-
- -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
- ac_prev=dvidir ;;
- -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
- dvidir=$ac_optarg ;;
-
- -enable-* | --enable-*)
- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
- eval enable_$ac_feature=\$ac_optarg ;;
-
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
- | --exec | --exe | --ex)
- ac_prev=exec_prefix ;;
- -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
- | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
- | --exec=* | --exe=* | --ex=*)
- exec_prefix=$ac_optarg ;;
-
- -gas | --gas | --ga | --g)
- # Obsolete; use --with-gas.
- with_gas=yes ;;
-
- -help | --help | --hel | --he | -h)
- ac_init_help=long ;;
- -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
- ac_init_help=recursive ;;
- -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
- ac_init_help=short ;;
-
- -host | --host | --hos | --ho)
- ac_prev=host_alias ;;
- -host=* | --host=* | --hos=* | --ho=*)
- host_alias=$ac_optarg ;;
-
- -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
- ac_prev=htmldir ;;
- -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
- | --ht=*)
- htmldir=$ac_optarg ;;
-
- -includedir | --includedir | --includedi | --included | --include \
- | --includ | --inclu | --incl | --inc)
- ac_prev=includedir ;;
- -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
- | --includ=* | --inclu=* | --incl=* | --inc=*)
- includedir=$ac_optarg ;;
-
- -infodir | --infodir | --infodi | --infod | --info | --inf)
- ac_prev=infodir ;;
- -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
- infodir=$ac_optarg ;;
-
- -libdir | --libdir | --libdi | --libd)
- ac_prev=libdir ;;
- -libdir=* | --libdir=* | --libdi=* | --libd=*)
- libdir=$ac_optarg ;;
-
- -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
- | --libexe | --libex | --libe)
- ac_prev=libexecdir ;;
- -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
- | --libexe=* | --libex=* | --libe=*)
- libexecdir=$ac_optarg ;;
-
- -localedir | --localedir | --localedi | --localed | --locale)
- ac_prev=localedir ;;
- -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
- localedir=$ac_optarg ;;
-
- -localstatedir | --localstatedir | --localstatedi | --localstated \
- | --localstate | --localstat | --localsta | --localst | --locals)
- ac_prev=localstatedir ;;
- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
- | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
- localstatedir=$ac_optarg ;;
-
- -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
- ac_prev=mandir ;;
- -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
- mandir=$ac_optarg ;;
-
- -nfp | --nfp | --nf)
- # Obsolete; use --without-fp.
- with_fp=no ;;
-
- -no-create | --no-create | --no-creat | --no-crea | --no-cre \
- | --no-cr | --no-c | -n)
- no_create=yes ;;
-
- -no-recursion | --no-recursion | --no-recursio | --no-recursi \
- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
- no_recursion=yes ;;
-
- -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
- | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
- | --oldin | --oldi | --old | --ol | --o)
- ac_prev=oldincludedir ;;
- -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
- | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
- | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
- oldincludedir=$ac_optarg ;;
-
- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
- ac_prev=prefix ;;
- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
- prefix=$ac_optarg ;;
-
- -program-prefix | --program-prefix | --program-prefi | --program-pref \
- | --program-pre | --program-pr | --program-p)
- ac_prev=program_prefix ;;
- -program-prefix=* | --program-prefix=* | --program-prefi=* \
- | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
- program_prefix=$ac_optarg ;;
-
- -program-suffix | --program-suffix | --program-suffi | --program-suff \
- | --program-suf | --program-su | --program-s)
- ac_prev=program_suffix ;;
- -program-suffix=* | --program-suffix=* | --program-suffi=* \
- | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
- program_suffix=$ac_optarg ;;
-
- -program-transform-name | --program-transform-name \
- | --program-transform-nam | --program-transform-na \
- | --program-transform-n | --program-transform- \
- | --program-transform | --program-transfor \
- | --program-transfo | --program-transf \
- | --program-trans | --program-tran \
- | --progr-tra | --program-tr | --program-t)
- ac_prev=program_transform_name ;;
- -program-transform-name=* | --program-transform-name=* \
- | --program-transform-nam=* | --program-transform-na=* \
- | --program-transform-n=* | --program-transform-=* \
- | --program-transform=* | --program-transfor=* \
- | --program-transfo=* | --program-transf=* \
- | --program-trans=* | --program-tran=* \
- | --progr-tra=* | --program-tr=* | --program-t=*)
- program_transform_name=$ac_optarg ;;
-
- -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
- ac_prev=pdfdir ;;
- -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
- pdfdir=$ac_optarg ;;
-
- -psdir | --psdir | --psdi | --psd | --ps)
- ac_prev=psdir ;;
- -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
- psdir=$ac_optarg ;;
-
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- silent=yes ;;
-
- -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
- ac_prev=sbindir ;;
- -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
- | --sbi=* | --sb=*)
- sbindir=$ac_optarg ;;
-
- -sharedstatedir | --sharedstatedir | --sharedstatedi \
- | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
- | --sharedst | --shareds | --shared | --share | --shar \
- | --sha | --sh)
- ac_prev=sharedstatedir ;;
- -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
- | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
- | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
- | --sha=* | --sh=*)
- sharedstatedir=$ac_optarg ;;
-
- -site | --site | --sit)
- ac_prev=site ;;
- -site=* | --site=* | --sit=*)
- site=$ac_optarg ;;
-
- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
- ac_prev=srcdir ;;
- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
- srcdir=$ac_optarg ;;
-
- -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
- | --syscon | --sysco | --sysc | --sys | --sy)
- ac_prev=sysconfdir ;;
- -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
- | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
- sysconfdir=$ac_optarg ;;
-
- -target | --target | --targe | --targ | --tar | --ta | --t)
- ac_prev=target_alias ;;
- -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
- target_alias=$ac_optarg ;;
-
- -v | -verbose | --verbose | --verbos | --verbo | --verb)
- verbose=yes ;;
-
- -version | --version | --versio | --versi | --vers | -V)
- ac_init_version=: ;;
-
- -with-* | --with-*)
- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
- eval with_$ac_package=\$ac_optarg ;;
-
- -without-* | --without-*)
- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
- eval with_$ac_package=no ;;
-
- --x)
- # Obsolete; use --with-x.
- with_x=yes ;;
-
- -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
- | --x-incl | --x-inc | --x-in | --x-i)
- ac_prev=x_includes ;;
- -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
- | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
- x_includes=$ac_optarg ;;
-
- -x-libraries | --x-libraries | --x-librarie | --x-librari \
- | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
- ac_prev=x_libraries ;;
- -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
- | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
- x_libraries=$ac_optarg ;;
-
- -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; }
- ;;
-
- *=*)
- ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
- # Reject names that are not valid shell variable names.
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
- { (exit 1); exit 1; }; }
- eval $ac_envvar=\$ac_optarg
- export $ac_envvar ;;
-
- *)
- # FIXME: should be removed in autoconf 3.0.
- echo "$as_me: WARNING: you should use --build, --host, --target" >&2
- expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
- ;;
-
- esac
-done
-
-if test -n "$ac_prev"; then
- ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- { echo "$as_me: error: missing argument to $ac_option" >&2
- { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute directory names.
-for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
- datadir sysconfdir sharedstatedir localstatedir includedir \
- oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
-do
- eval ac_val=\$$ac_var
- case $ac_val in
- [\\/$]* | ?:[\\/]* ) continue;;
- NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
- esac
- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; }
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
- if test "x$build_alias" = x; then
- cross_compiling=maybe
- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used." >&2
- elif test "x$build_alias" != "x$host_alias"; then
- cross_compiling=yes
- fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- { echo "$as_me: error: Working directory cannot be determined" >&2
- { (exit 1); exit 1; }; }
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- { echo "$as_me: error: pwd does not report name of working directory" >&2
- { (exit 1); exit 1; }; }
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
- ac_srcdir_defaulted=yes
- # Try the directory containing this script, then the parent directory.
- ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- srcdir=$ac_confdir
- if test ! -r "$srcdir/$ac_unique_file"; then
- srcdir=..
- fi
-else
- ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
- test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
- { (exit 1); exit 1; }; }
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
- { (exit 1); exit 1; }; }
- pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
- srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
- eval ac_env_${ac_var}_set=\${${ac_var}+set}
- eval ac_env_${ac_var}_value=\$${ac_var}
- eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
- eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
- # Omit some internal or obsolete options to make the list less imposing.
- # This message is too long to be a string in the A/UX 3.1 sh.
- cat <<_ACEOF
-\`configure' configures csextra 0.0 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE. See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
- -h, --help display this help and exit
- --help=short display options specific to this package
- --help=recursive display the short help of all the included packages
- -V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking...' messages
- --cache-file=FILE cache test results in FILE [disabled]
- -C, --config-cache alias for \`--cache-file=config.cache'
- -n, --no-create do not create output files
- --srcdir=DIR find the sources in DIR [configure dir or \`..']
-
-Installation directories:
- --prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
- --bindir=DIR user executables [EPREFIX/bin]
- --sbindir=DIR system admin executables [EPREFIX/sbin]
- --libexecdir=DIR program executables [EPREFIX/libexec]
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
- --infodir=DIR info documentation [DATAROOTDIR/info]
- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
- --mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/csextra]
- --htmldir=DIR html documentation [DOCDIR]
- --dvidir=DIR dvi documentation [DOCDIR]
- --pdfdir=DIR pdf documentation [DOCDIR]
- --psdir=DIR ps documentation [DOCDIR]
-_ACEOF
-
- cat <<\_ACEOF
-
-System types:
- --build=BUILD configure for building on BUILD [guessed]
- --host=HOST cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
- case $ac_init_help in
- short | recursive ) echo "Configuration of csextra 0.0:";;
- esac
- cat <<\_ACEOF
-
-Optional Features:
- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-as-needed Utilize --as-needed linker flag, if supported by
- linker and if the used binutils version is recent
- enough to support it properly (default YES)
- --enable-cstest verify that the Crystal Space SDK is actually usable
- (default YES)
- --enable-celtest verify that the CEL SDK is actually usable (default
- YES)
- --enable-meta-info-embedding
- store plugin meta-information directly inside plugin
- modules if supported by platform; if disabled,
- meta-information is stored in stand-alone .csplugin
- files; this option is enabled by default for
- non-Unix platforms and on Unix platforms with
- ELF-format object files; it is disabled by default
- on Unix platforms if ELF is not available and the
- project uses a non-GPL-compatible license (such as
- LGPL) since the non-ELF Unix embedding technology
- requires the GPL-licensed libbfd library; if ELF is
- not available, enable this option on Unix only if
- you are certain you want a GPL-licensed library
- infecting your project
- --enable-debug build with debugging information (default NO)
-
-Optional Packages:
- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-cppunit=dir specify location of libcppunit if not detected
- automatically; searches dir/include, dir/lib, and
- dir
- --without-python do not use Python
- --with-verse=dir specify location of libverse if not detected
- automatically; searches dir/include, dir/lib, and
- dir
- --with-qt-mt=dir specify location of libqt-mt if not detected
- automatically; searches dir/include, dir/lib, and
- dir
- --with-js=dir specify location of libjs if not detected
- automatically; searches dir/include, dir/lib, and
- dir
- --with-wx=dir specify location of libwx if not detected
- automatically; searches dir/include, dir/lib, and
- dir
- --without-cs do not look for an installed Crystal Space SDK; this
- option is useful only if you need to perform routine
- maintenance tasks, such as generating project files
- or converting documentation, without having the
- Crystal Space SDK installed
- --with-cs-prefix=CRYSTAL_PREFIX
- specify location of Crystal Space installation; this
- is the \$prefix value used when installing the SDK
- --without-cel do not look for an installed Crystal Entity Layer
- SDK; this option is useful only if you need to
- perform routine maintenance tasks, such as
- generating project files or converting
- documentation, without having the CEL SDK installed
- --with-cel-prefix=CEL_PREFIX
- specify location of CEL installation; this is the
- \$prefix value used when installing the SDK
- --with-bfd=dir specify location of libbfd if not detected
- automatically; searches dir/include, dir/lib, and
- dir
-
-Some influential environment variables:
- CC C compiler command
- CFLAGS C compiler flags
- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
- nonstandard directory <lib dir>
- LIBS libraries to pass to the linker, e.g. -l<library>
- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
- you have headers in a nonstandard directory <include dir>
- CXX C++ compiler command
- CXXFLAGS C++ compiler flags
- CPP C preprocessor
- CRYSTAL Prefix where Crystal Space is installed
- CEL Prefix where CEL is installed
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to <jor...@gm...>.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
- # If there are subdirs, report their specific --help.
- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d "$ac_dir" || continue
- ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
- # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
- esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
- .) # We are building in place.
- ac_srcdir=.
- ac_top_srcdir=$ac_top_builddir_sub
- ac_abs_top_srcdir=$ac_pwd ;;
- [\\/]* | ?:[\\/]* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir
- ac_abs_top_srcdir=$srcdir ;;
- *) # Relative name.
- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_build_prefix$srcdir
- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
- cd "$ac_dir" || { ac_status=$?; continue; }
- # Check for guested configure.
- if test -f "$ac_srcdir/configure.gnu"; then
- echo &&
- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
- elif test -f "$ac_srcdir/configure"; then
- echo &&
- $SHELL "$ac_srcdir/configure" --help=recursive
- else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi || ac_status=$?
- cd "$ac_pwd" || { ac_status=$?; break; }
- done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
- cat <<\_ACEOF
-csextra configure 0.0
-generated by GNU Autoconf 2.61
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
- exit
-fi
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by csextra $as_me 0.0, which was
-generated by GNU Autoconf 2.61. Invocation command line was
-
- $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
-
-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- echo "PATH: $as_dir"
-done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
- for ac_arg
- do
- case $ac_arg in
- -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- continue ;;
- *\'*)
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- case $ac_pass in
- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
- 2)
- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
- if test $ac_must_keep_next = true; then
- ac_must_keep_next=false # Got value, back to normal.
- else
- case $ac_arg in
- *=* | --config-cache | -C | -disable-* | --disable-* \
- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
- | -with-* | --with-* | -without-* | --without-* | --x)
- case "$ac_configure_args0 " in
- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
- esac
- ;;
- -* ) ac_must_keep_next=true ;;
- esac
- fi
- ac_configure_args="$ac_configure_args '$ac_arg'"
- ;;
- esac
- done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log. We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
- # Save into config.log some information that might help in debugging.
- {
- echo
-
- cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
- echo
- # The following way of writing the cache mishandles newlines in values,
-(
- for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
- eval ac_val=\$$ac_var
- case $ac_val in #(
- *${as_nl}*)
- case $ac_var in #(
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
- esac
- case $ac_var in #(
- _ | IFS | as_nl) ;; #(
- *) $as_unset $ac_var ;;
- esac ;;
- esac
- done
- (set) 2>&1 |
- case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
- *${as_nl}ac_space=\ *)
- sed -n \
- "s/'\''/'\''\\\\'\'''\''/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
- ;; #(
- *)
- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
- esac |
- sort
-)
- echo
-
- cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
- echo
- for ac_var in $ac_subst_vars
- do
- eval ac_val=\$$ac_var
- case $ac_val in
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- esac
- echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
-
- if test -n "$ac_subst_files"; then
- cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
- echo
- for ac_var in $ac_subst_files
- do
- eval ac_val=\$$ac_var
- case $ac_val in
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- esac
- echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
- fi
-
- if test -s confdefs.h; then
- cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
- echo
- cat confdefs.h
- echo
- fi
- test "$ac_signal" != 0 &&
- echo "$as_me: caught signal $ac_signal"
- echo "$as_me: exit $exit_status"
- } >&5
- rm -f core *.core core.conftest.* &&
- rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
- exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -n "$CONFIG_SITE"; then
- set x "$CONFIG_SITE"
-elif test "x$prefix" != xNONE; then
- set x "$prefix/share/config.site" "$prefix/etc/config.site"
-else
- set x "$ac_default_prefix/share/config.site" \
- "$ac_default_prefix/etc/config.site"
-fi
-shift
-for ac_site_file
-do
- if test -r "$ac_site_file"; then
- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
- sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file"
- fi
-done
-
-if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
- case $cache_file in
- [\\/]* | ?:[\\/]* ) . "$cache_file";;
- *) . "./$cache_file";;
- esac
- fi
-else
- { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
- >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
- eval ac_old_set=\$ac_cv_env_${ac_var}_set
- eval ac_new_set=\$ac_env_${ac_var}_set
- eval ac_old_val=\$ac_cv_env_${ac_var}_value
- eval ac_new_val=\$ac_env_${ac_var}_value
- case $ac_old_set,$ac_new_set in
- set,)
- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo ...
[truncated message content] |
