Re: [Crystal-cvs] SF.net SVN: crystal:[39227] CSEditing/trunk

Did you copy a bit too much from the CS tree for this commit? In
particular, there should be no need for "jam install" to install the
Autoconf and Jam support files since they are merely copies of the
ones already installed by CS. Moreover, is it overkill to copy CS's
entire custom MSVC configuration? Was the MSVC configuration provided
by jamtemplate insufficient in some fashion?

-- ES


On Thu, Mar 21, 2013 at 1:26 PM,  <[email protected]> wrote:
> Revision: 39227
>           http://sourceforge.net/p/crystal/code/39227
> Author:   kickvb
> Date:     2013-03-21 17:26:07 +0000 (Thu, 21 Mar 2013)
> Log Message:
> -----------
> CSEditing: More work on the MSVC generation.
>
> Modified Paths:
> --------------
>     CSEditing/trunk/Jamfile.in
>
> Added Paths:
> -----------
>     CSEditing/trunk/mk/Jamfile
>     CSEditing/trunk/mk/autoconf/Jamfile
>     CSEditing/trunk/mk/jam/Jamfile
>     CSEditing/trunk/mk/msvc10/
>     CSEditing/trunk/mk/msvc8/
>     CSEditing/trunk/mk/msvc9/
>     CSEditing/trunk/mk/msvcgen/Jamfile
>     CSEditing/trunk/mk/msvcgen/config.jam
>     CSEditing/trunk/mk/msvcgen/custom2.cslib
>     CSEditing/trunk/mk/msvcgen/workspaces.jam
>
> Modified: CSEditing/trunk/Jamfile.in
> ===================================================================
> --- CSEditing/trunk/Jamfile.in  2013-03-21 17:25:09 UTC (rev 39226)
> +++ CSEditing/trunk/Jamfile.in  2013-03-21 17:26:07 UTC (rev 39227)
> @@ -33,79 +33,9 @@
>  Help maintainerclean :
>      "Remove built targets, configuration, and generated files." ;
>
> -# Set up subdirectories into which the different generated project for
> -# different go.
> -MsvcGenSubDir TOP mk msvc : common ;
> -MsvcGenSubDir TOP mk msvc 8 : 8 ;
> -MsvcGenSubDir TOP mk msvc 9 : 9 ;
> -MsvcGenSubDir TOP mk msvc 10 : 10 ;
> -MsvcGenTemplateDir TOP mk msvcgen ;
> +# msvcgen setup must occur before compile group registration.
> +SubInclude TOP mk ;
>
> -# 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 CSEditing ;
> -
> -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 win32libs include ]
> -  [ ConcatDirs "$(hash)(CRYSTAL)" include ]
> -  [ ConcatDirs "$(hash)(CRYSTAL)" win32libs include ] ;
> -MsvcGenConfig CRYSTAL.LIBDIRS :
> -  [ ConcatDirs .. .. .. CS out release$(MSVC_VERSION) libs ]
> -  [ ConcatDirs .. .. .. CS win32libs lib ]
> -  [ ConcatDirs "$(hash)(CRYSTAL)" out release$(MSVC_VERSION) libs ]
> -  [ ConcatDirs "$(hash)(CRYSTAL)" win32libs lib ] ;
> -MsvcGenConfig CRYSTAL.LIBDIRS.DEBUG :
> -  [ ConcatDirs .. .. .. CS out debug$(MSVC_VERSION) libs ]
> -  [ ConcatDirs .. .. .. CS win32libs lib ]
> -  [ ConcatDirs "$(hash)(CRYSTAL)" out debug$(MSVC_VERSION) libs ]
> -  [ ConcatDirs "$(hash)(CRYSTAL)" win32libs lib ] ;
> -
> -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$(MSVC_VERSION) libs ]
> -    [ ConcatDirs "$(hash)(CEL)" out release$(MSVC_VERSION) libs ]
> -    [ ConcatDirs "$(hash)(CEL)" libs ] ;
> -  MsvcGenConfig CEL.LIBDIRS.DEBUG :
> -    [ ConcatDirs .. .. .. cel out debug$(MSVC_VERSION) libs ]
> -    [ ConcatDirs "$(hash)(CEL)" out debug$(MSVC_VERSION) libs ]
> -    [ ConcatDirs "$(hash)(CEL)" libs ] ;
> -}
> -
> -# 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 ;
> -
>  # Process subdirectories.  NOTE: Unfortunately, Jam rules are presently
>  # order-sensitive; Library targets must be seen by Jam before Application and
>  # Plugin targets, thus ordering of these SubInclude invocations is dictated by
>
> Added: CSEditing/trunk/mk/Jamfile
> ===================================================================
> --- CSEditing/trunk/mk/Jamfile                          (rev 0)
> +++ CSEditing/trunk/mk/Jamfile  2013-03-21 17:26:07 UTC (rev 39227)
> @@ -0,0 +1,5 @@
> +SubDir TOP mk ;
> +
> +SubInclude TOP mk autoconf ;
> +SubInclude TOP mk jam ;
> +SubInclude TOP mk msvcgen ;
>
>
> Property changes on: CSEditing/trunk/mk/Jamfile
> ___________________________________________________________________
> Added: svn:mime-type
> ## -0,0 +1 ##
> +text/plain
> \ No newline at end of property
> Added: svn:eol-style
> ## -0,0 +1 ##
> +native
> \ No newline at end of property
> Added: CSEditing/trunk/mk/autoconf/Jamfile
> ===================================================================
> --- CSEditing/trunk/mk/autoconf/Jamfile                         (rev 0)
> +++ CSEditing/trunk/mk/autoconf/Jamfile 2013-03-21 17:26:07 UTC (rev 39227)
> @@ -0,0 +1,3 @@
> +SubDir TOP mk autoconf ;
> +
> +InstallData [ Wildcard *.m4 config.* ] install-sh : build autoconf ;
>
>
> Property changes on: CSEditing/trunk/mk/autoconf/Jamfile
> ___________________________________________________________________
> Added: svn:mime-type
> ## -0,0 +1 ##
> +text/plain
> \ No newline at end of property
> Added: svn:eol-style
> ## -0,0 +1 ##
> +native
> \ No newline at end of property
> Added: CSEditing/trunk/mk/jam/Jamfile
> ===================================================================
> --- CSEditing/trunk/mk/jam/Jamfile                              (rev 0)
> +++ CSEditing/trunk/mk/jam/Jamfile      2013-03-21 17:26:07 UTC (rev 39227)
> @@ -0,0 +1,3 @@
> +SubDir TOP mk jam ;
> +
> +InstallData [ Wildcard *.jam ] : build jam ;
>
>
> Property changes on: CSEditing/trunk/mk/jam/Jamfile
> ___________________________________________________________________
> Added: svn:mime-type
> ## -0,0 +1 ##
> +text/plain
> \ No newline at end of property
> Added: svn:eol-style
> ## -0,0 +1 ##
> +native
> \ No newline at end of property
> Added: CSEditing/trunk/mk/msvcgen/Jamfile
> ===================================================================
> --- CSEditing/trunk/mk/msvcgen/Jamfile                          (rev 0)
> +++ CSEditing/trunk/mk/msvcgen/Jamfile  2013-03-21 17:26:07 UTC (rev 39227)
> @@ -0,0 +1,134 @@
> +#==============================================================================
> +# MSVC-specific customizations for msvcgen
> +# Copyright (C) 2004 by Eric Sunshine <[email protected]>
> +#
> +#    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 msvc8 : 8 ;
> +MsvcGenSubDir TOP mk msvc9 : 9 ;
> +MsvcGenSubDir TOP mk msvc10 : 10 ;
> +MsvcGenTemplateDir TOP mk msvcgen ;
> +
> +# 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.
> +# cs-win32libs >= 1.9_004 include dir
> +MsvcIncDirs : [ ConcatDirs .. .. winlibs x86 "include" ] : : x86 ;
> +MsvcIncDirs : [ ConcatDirs .. .. winlibs x64 "include" ] : : x64 ;
> +# include dir for previous versions
> +MsvcIncDirs : [ ConcatDirs .. .. win32libs "include" ] ;
> +# cs-win32libs >= 1.9_004 lib dir
> +MsvcLibDirs : [ ConcatDirs .. .. winlibs x86 lib ] : : x86 ;
> +MsvcLibDirs : [ ConcatDirs .. .. winlibs x64 lib ] : : x64 ;
> +# lib dir for previous versions
> +MsvcLibDirs : [ ConcatDirs .. .. win32libs lib ] ;
> +
> +#------------------------------------------------------------------------------
> +# 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 ;
>
>
> Property changes on: CSEditing/trunk/mk/msvcgen/Jamfile
> ___________________________________________________________________
> Added: svn:mime-type
> ## -0,0 +1 ##
> +text/plain
> \ No newline at end of property
> Added: svn:eol-style
> ## -0,0 +1 ##
> +native
> \ No newline at end of property
> Added: CSEditing/trunk/mk/msvcgen/config.jam
> ===================================================================
> --- CSEditing/trunk/mk/msvcgen/config.jam                               (rev 0)
> +++ CSEditing/trunk/mk/msvcgen/config.jam       2013-03-21 17:26:07 UTC (rev 39227)
> @@ -0,0 +1,116 @@
> +#==============================================================================
> +# 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 ;
> +ASSIMP.AVAILABLE = yes ;
> +ASSIMP.DEFINES = CS_ASSIMP_VERSION=3 ASSIMP_BUILD_NO_EXPORT ;
> +ASSIMP.LIBS.8 = assimp-vc8.lib ;
> +ASSIMP.LIBS.DEBUG.8 = assimp-vc8_d.lib ;
> +ASSIMP.LIBS.9 = assimp-vc9.lib ;
> +ASSIMP.LIBS.DEBUG.9 = assimp-vc9_d.lib ;
> +ASSIMP.LIBS.10 = assimp-vc10.lib ;
> +ASSIMP.LIBS.DEBUG.10 = assimp-vc10_d.lib ;
> +BULLET.AVAILABLE = yes ;
> +BULLET.CFLAGS.X86 = [ FIncludes "../../winlibs/x86/include/bullet" ] ;
> +BULLET.CFLAGS.X64 = [ FIncludes "../../winlibs/x64/include/bullet" ] ;
> +BULLET.LIBS.8 = bulletsoftbody-vc8.lib bulletcollision-vc8.lib bulletdynamics-vc8.lib bulletmath-vc8.lib ;
> +BULLET.LIBS.DEBUG.8 = bulletsoftbody-vc8_d.lib bulletcollision-vc8_d.lib bulletdynamics-vc8_d.lib bulletmath-vc8_d.lib ;
> +BULLET.LIBS.9 = bulletsoftbody-vc9.lib bulletcollision-vc9.lib bulletdynamics-vc9.lib bulletmath-vc9.lib ;
> +BULLET.LIBS.DEBUG.9 = bulletsoftbody-vc9_d.lib bulletcollision-vc9_d.lib bulletdynamics-vc9_d.lib bulletmath-vc9_d.lib ;
> +BULLET.LIBS.10 = bulletsoftbody-vc10.lib bulletcollision-vc10.lib bulletdynamics-vc10.lib bulletmath-vc10.lib ;
> +BULLET.LIBS.DEBUG.10 = bulletsoftbody-vc10_d.lib bulletcollision-vc10_d.lib bulletdynamics-vc10_d.lib bulletmath-vc10_d.lib ;
> +CAL3D.AVAILABLE = yes ;
> +CAL3D.DEFINES = CS_HAVE_CAL3D ;
> +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 ;
> +CAL3D.LIBS.10 = cal3d-vc10.lib ;
> +CAL3D.LIBS.DEBUG.10 = cal3d-vc10_d.lib ;
> +CEGUI.AVAILABLE = yes ;
> +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 ;
> +CEGUI.LIBS.10 = CEGUIBase-vc10.lib ;
> +CEGUI.LIBS.DEBUG.10 = CEGUIBase-vc10_d.lib ;
> +CG.AVAILABLE = yes ;
> +CG.LIBS = cg.lib cgGL.lib ;
> +DIRECTX8.AVAILABLE = yes ;
> +DIRECTX8.LIBS = dsound.lib dinput8.lib ;
> +FT2.AVAILABLE = yes ;
> +FT2.LIBS = freetype2.lib ;
> +GL.AVAILABLE = yes ;
> +GL.LIBS = opengl32.lib ;
> +JPEG.AVAILABLE = yes ;
> +JPEG.LIBS = libjpeg.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 ;
> +SPEEX.AVAILABLE = yes ;
> +SPEEX.LIBS = speex.lib ogg.lib ;
> +STL.AVAILABLE = yes ;
> +VORBISFILE.AVAILABLE = yes ;
> +VORBISFILE.LIBS = vorbisfile.lib vorbis.lib ogg.lib ;
> +WAVEOUT.AVAILABLE = yes ;
> +WAVEOUT.LIBS = winmm.lib ;
> +WX.AVAILABLE = yes ;
> +WX.DEFINES = wxUSE_GUI=1 WXUSINGDLL=1 UNICODE _UNICODE ;
> +WX.DEFINES.DEBUG = wxUSE_GUI=1 WXUSINGDLL=1 WXDEBUG=1 UNICODE _UNICODE ;
> +WX.LIBS.8 = wxbase29u-vc8.lib wxmsw29u_core-vc8.lib wxmsw29u_gl-vc8.lib wxmsw29u_xrc-vc8.lib wxmsw29u_html-vc8.lib wxbase29u_xml-vc8.lib wxmsw29u_adv-vc8.lib opengl32.lib ;
> +WX.LIBS.DEBUG.8 = wxbase29u-vc8_d.lib wxmsw29u_core-vc8_d.lib wxmsw29u_gl-vc8_d.lib wxmsw29u_xrc-vc8_d.lib wxbase29u_html-vc8_d.lib wxmsw29u_xml-vc8_d.lib wxmsw29u_adv-vc8_d.lib opengl32.lib ;
> +WX.LIBS.9 = wxbase29u-vc9.lib wxmsw29u_core-vc9.lib wxmsw29u_gl-vc9.lib wxmsw29u_xrc-vc9.lib wxmsw29u_html-vc9.lib wxbase29u_xml-vc9.lib wxmsw29u_adv-vc9.lib opengl32.lib ;
> +WX.LIBS.DEBUG.9 = wxbase29u-vc9_d.lib wxmsw29u_core-vc9_d.lib wxmsw29u_gl-vc9_d.lib wxmsw29u_xrc-vc9_d.lib wxmsw29u_html-vc9_d.lib wxbase29u_xml-vc9_d.lib wxmsw29u_adv-vc9_d.lib opengl32.lib ;
> +WX.LIBS.10 = wxbase29u-vc10.lib wxmsw29u_core-vc10.lib wxmsw29u_gl-vc10.lib wxmsw29u_xrc-vc10.lib wxmsw29u_html-vc10.lib wxbase29u_xml-vc10.lib wxmsw29u_adv-vc10.lib opengl32.lib ;
> +WX.LIBS.DEBUG.10 = wxbase29u-vc10_d.lib wxmsw29u_core-vc10_d.lib wxmsw29u_gl-vc10_d.lib wxmsw29u_xrc-vc10_d.lib wxmsw29u_html-vc10_d.lib wxbase29u_xml-vc10_d.lib wxmsw29u_adv-vc10_d.lib opengl32.lib ;
> +WX.AUI.AVAILABLE = yes ;
> +WX.AUI.LIBS.8 = wxmsw29u_aui-vc8.lib ;
> +WX.AUI.LIBS.DEBUG.8 = wxmsw29u_aui-vc8_d.lib ;
> +WX.AUI.LIBS.9 = wxmsw29u_aui-vc9.lib ;
> +WX.AUI.LIBS.DEBUG.9 = wxmsw29u_aui-vc9_d.lib ;
> +WX.AUI.LIBS.10 = wxmsw29u_aui-vc10.lib ;
> +WX.AUI.LIBS.DEBUG.10 = wxmsw29u_aui-vc10_d.lib ;
> +ZLIB.AVAILABLE = yes ;
> +ZLIB.LIBS = zlib.lib ;
>
>
> Property changes on: CSEditing/trunk/mk/msvcgen/config.jam
> ___________________________________________________________________
> Added: svn:mime-type
> ## -0,0 +1 ##
> +text/plain
> \ No newline at end of property
> Added: svn:eol-style
> ## -0,0 +1 ##
> +native
> \ No newline at end of property
> Added: CSEditing/trunk/mk/msvcgen/custom2.cslib
> ===================================================================
> --- CSEditing/trunk/mk/msvcgen/custom2.cslib                            (rev 0)
> +++ CSEditing/trunk/mk/msvcgen/custom2.cslib    2013-03-21 17:26:07 UTC (rev 39227)
> @@ -0,0 +1,67 @@
> +[% FILTER null;
> +#==============================================================================
> +# TemplateToolkit2 CrystalSpace customizations for MSVC project generation
> +# Copyright (C) 2004 by Eric Sunshine <[email protected]>
> +#
> +#    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
> +  });
> +# Likewise for ThreadChecker.
> +buildthreadcheck = {};
> +buildthreadcheck.import(builddebug);
> +buildthreadcheck.import({
> +    name => 'ThreadChecker',
> +    defines => builddebug.defines.merge(['CS_THREAD_CHECKER']),
> +    libs => builddebug.libs.merge(['libittnotify.lib']),
> +    priority => 600
> +  });
> +# Merge into the builds array
> +builds = builds.merge([buildmemtrack, buildreftrack, buildthreadcheck]);
> +
> +END %]
>
>
> Property changes on: CSEditing/trunk/mk/msvcgen/custom2.cslib
> ___________________________________________________________________
> Added: svn:mime-type
> ## -0,0 +1 ##
> +text/plain
> \ No newline at end of property
> Added: svn:eol-style
> ## -0,0 +1 ##
> +native
> \ No newline at end of property
> Added: CSEditing/trunk/mk/msvcgen/workspaces.jam
> ===================================================================
> --- CSEditing/trunk/mk/msvcgen/workspaces.jam                           (rev 0)
> +++ CSEditing/trunk/mk/msvcgen/workspaces.jam   2013-03-21 17:26:07 UTC (rev 39227)
> @@ -0,0 +1,40 @@
> +#==============================================================================
> +#
> +#    Automatic MSVC-compliant workspace and project generation component
> +#    Copyright (C) 2004 by Eric Sunshine <[email protected]>
> +#
> +#    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$)" 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$)" $(MSVC_CONVENIENCE_PROJECTS) py ;
>
>
> Property changes on: CSEditing/trunk/mk/msvcgen/workspaces.jam
> ___________________________________________________________________
> Added: svn:mime-type
> ## -0,0 +1 ##
> +text/plain
> \ No newline at end of property
> Added: svn:eol-style
> ## -0,0 +1 ##
> +native
> \ No newline at end of property
> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
>
>
> ------------------------------------------------------------------------------
> Everyone hates slow websites. So do we.
> Make your web apps faster with AppDynamics
> Download AppDynamics Lite for free today:
> http://p.sf.net/sfu/appdyn_d2d_mar
> _______________________________________________
> Crystal-cvs mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/crystal-cvs

------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar