Menu
▾
▴
[Iaeditor-commits] SF.net SVN: iaeditor: [354] trunk
|
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] |
