You can subscribe to this list here.
2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(128) |
Dec
(65) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2006 |
Jan
(48) |
Feb
(132) |
Mar
(95) |
Apr
(47) |
May
(54) |
Jun
(2) |
Jul
(57) |
Aug
(109) |
Sep
(131) |
Oct
(186) |
Nov
(105) |
Dec
(78) |
2007 |
Jan
(125) |
Feb
(105) |
Mar
(52) |
Apr
(104) |
May
(63) |
Jun
(116) |
Jul
(76) |
Aug
|
Sep
(18) |
Oct
(93) |
Nov
(110) |
Dec
(169) |
2008 |
Jan
(90) |
Feb
(64) |
Mar
(41) |
Apr
(23) |
May
(6) |
Jun
(18) |
Jul
(10) |
Aug
(61) |
Sep
(139) |
Oct
(50) |
Nov
(55) |
Dec
(2) |
2009 |
Jan
|
Feb
(1) |
Mar
(62) |
Apr
(22) |
May
(17) |
Jun
(19) |
Jul
(40) |
Aug
(21) |
Sep
|
Oct
(40) |
Nov
(23) |
Dec
|
2010 |
Jan
(14) |
Feb
(40) |
Mar
(9) |
Apr
(11) |
May
(19) |
Jun
(4) |
Jul
(10) |
Aug
(22) |
Sep
(15) |
Oct
|
Nov
(2) |
Dec
|
2011 |
Jan
(13) |
Feb
(10) |
Mar
|
Apr
(13) |
May
|
Jun
|
Jul
(2) |
Aug
(4) |
Sep
|
Oct
|
Nov
|
Dec
|
2012 |
Jan
|
Feb
|
Mar
|
Apr
(33) |
May
(20) |
Jun
|
Jul
(8) |
Aug
(7) |
Sep
(2) |
Oct
|
Nov
|
Dec
|
From: <br...@us...> - 2012-05-19 05:37:17
|
Revision: 4291 http://openvrml.svn.sourceforge.net/openvrml/?rev=4291&view=rev Author: braden Date: 2012-05-19 05:37:09 +0000 (Sat, 19 May 2012) Log Message: ----------- Updates for 0.18.9 release. Modified Paths: -------------- trunk/ChangeLog trunk/NEWS trunk/README trunk/configure.ac trunk/doc/Doxyfile trunk/src/Makefile.am trunk/src/libopenvrml/openvrml.rc trunk/src/libopenvrml/openvrml.vcxproj trunk/src/libopenvrml-gl/openvrml-gl.rc Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/0.18:3951,3955,3960,3994,4104,4110,4152,4234,4239 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/0.18:3951,3955,3960,3994,4104,4110,4152,4234,4239,4289 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2012-05-05 21:21:31 UTC (rev 4290) +++ trunk/ChangeLog 2012-05-19 05:37:09 UTC (rev 4291) @@ -1,3 +1,18 @@ +2012-05-05 Braden McDaniel <br...@en...> + + Updates for 0.18.9 release. + + * README + * NEWS + * configure.ac + * doc/Doxyfile + * src/libopenvrml/openvrml.rc + * src/libopenvrml/openvrml.vcproj + * src/libopenvrml-gl/openvrml-gl.rc + * src/Makefile.am + (LIBOPENVRML_LIBRARY_VERSION): Update to 10:1:1. + (LIBOPENVRML_GL_LIBRARY_VERSION): Update to 8:1:0. + 2012-05-01 Braden McDaniel <br...@en...> Suppress various warnings from the Microsoft compiler Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2012-05-05 21:21:31 UTC (rev 4290) +++ trunk/NEWS 2012-05-19 05:37:09 UTC (rev 4291) @@ -1,3 +1,9 @@ +Changes new in version 0.18.9, 5 May, 2012 +======================================================================== + +- Changes to build with Boost 1.47.0, XULRunner 12.0, and libpng 1.5. + + Changes new in version 0.18.8, 21 April, 2011 ======================================================================== Modified: trunk/README =================================================================== --- trunk/README 2012-05-05 21:21:31 UTC (rev 4290) +++ trunk/README 2012-05-19 05:37:09 UTC (rev 4291) @@ -1,7 +1,7 @@ OpenVRML library version 0.18.99 Copyright 1998, 1999, 2000 Chris Morley <cm...@ve...> -Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 - Braden McDaniel <br...@en...> +Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, + 2011, 2012 Braden McDaniel <br...@en...> Portions Copyright SGI and others Available from <http://openvrml.org> Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2012-05-05 21:21:31 UTC (rev 4290) +++ trunk/configure.ac 2012-05-19 05:37:09 UTC (rev 4291) @@ -1,6 +1,6 @@ AC_INIT([OpenVRML], [0.18.99], [ope...@li...]) AC_PREREQ([2.59]) -AC_COPYRIGHT([Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Braden McDaniel]) +AC_COPYRIGHT([Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Braden McDaniel]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_FILES([Makefile] [doc/Makefile] Modified: trunk/doc/Doxyfile =================================================================== --- trunk/doc/Doxyfile 2012-05-05 21:21:31 UTC (rev 4290) +++ trunk/doc/Doxyfile 2012-05-19 05:37:09 UTC (rev 4291) @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = OpenVRML -PROJECT_NUMBER = 0.18.8 +PROJECT_NUMBER = 0.18.9 PROJECT_BRIEF = PROJECT_LOGO = OUTPUT_DIRECTORY = Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2012-05-05 21:21:31 UTC (rev 4290) +++ trunk/src/Makefile.am 2012-05-19 05:37:09 UTC (rev 4291) @@ -47,8 +47,8 @@ libopenvrml/private.h \ openvrml-player/filechooserdialog.h -LIBOPENVRML_LIBRARY_VERSION = 10:0:1 -LIBOPENVRML_GL_LIBRARY_VERSION = 8:0:0 +LIBOPENVRML_LIBRARY_VERSION = 10:1:1 +LIBOPENVRML_GL_LIBRARY_VERSION = 8:1:0 # | | | # +------+ | +---+ # | | | Modified: trunk/src/libopenvrml/openvrml.rc =================================================================== --- trunk/src/libopenvrml/openvrml.rc 2012-05-05 21:21:31 UTC (rev 4290) +++ trunk/src/libopenvrml/openvrml.rc 2012-05-19 05:37:09 UTC (rev 4291) @@ -11,8 +11,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 9,5,1,0 - PRODUCTVERSION 0,18,7,0 + FILEVERSION 10,1,1,0 + PRODUCTVERSION 0,18,9,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -28,12 +28,12 @@ BLOCK "040904b0" BEGIN VALUE "FileDescription", "OpenVRML Library" - VALUE "FileVersion", "10, 0, 1, 0" + VALUE "FileVersion", "10, 1, 1, 0" VALUE "InternalName", "openvrml" - VALUE "LegalCopyright", "Copyright (C) 2011" + VALUE "LegalCopyright", "Copyright (C) 2012" VALUE "OriginalFilename", "openvrml.dll" VALUE "ProductName", "OpenVRML Library" - VALUE "ProductVersion", "0.18.8" + VALUE "ProductVersion", "0.18.9" END END BLOCK "VarFileInfo" Modified: trunk/src/libopenvrml/openvrml.vcxproj =================================================================== --- trunk/src/libopenvrml/openvrml.vcxproj 2012-05-05 21:21:31 UTC (rev 4290) +++ trunk/src/libopenvrml/openvrml.vcxproj 2012-05-19 05:37:09 UTC (rev 4291) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -65,7 +65,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.;..\local\libopenvrml-dl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.9";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>Default</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> @@ -91,7 +91,7 @@ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>.;..\local\libopenvrml-dl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.9";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <MultiProcessorCompilation>true</MultiProcessorCompilation> @@ -187,4 +187,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> \ No newline at end of file +</Project> Modified: trunk/src/libopenvrml-gl/openvrml-gl.rc =================================================================== --- trunk/src/libopenvrml-gl/openvrml-gl.rc 2012-05-05 21:21:31 UTC (rev 4290) +++ trunk/src/libopenvrml-gl/openvrml-gl.rc 2012-05-19 05:37:09 UTC (rev 4291) @@ -11,8 +11,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 8,0,0,0 - PRODUCTVERSION 0,18,7,0 + FILEVERSION 8,1,0,0 + PRODUCTVERSION 0,18,9,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -28,12 +28,12 @@ BLOCK "040904b0" BEGIN VALUE "FileDescription", "OpenVRML OpenGL Renderer Library" - VALUE "FileVersion", "8, 0, 0, 0" + VALUE "FileVersion", "8, 1, 0, 0" VALUE "InternalName", "openvrml-gl" VALUE "LegalCopyright", "Copyright (C) 2011" VALUE "OriginalFilename", "openvrml-gl.dll" VALUE "ProductName", "OpenVRML Library" - VALUE "ProductVersion", "0.18.8" + VALUE "ProductVersion", "0.18.9" END END BLOCK "VarFileInfo" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-05-05 22:14:37
|
Revision: 4290 http://openvrml.svn.sourceforge.net/openvrml/?rev=4290&view=rev Author: braden Date: 2012-05-05 21:21:31 +0000 (Sat, 05 May 2012) Log Message: ----------- Tagged 0.18.9 release. Added Paths: ----------- tags/0.18.9/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-05-05 21:14:57
|
Revision: 4289 http://openvrml.svn.sourceforge.net/openvrml/?rev=4289&view=rev Author: braden Date: 2012-05-05 21:14:51 +0000 (Sat, 05 May 2012) Log Message: ----------- Updates for 0.18.9 release. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/NEWS branches/0.18/README branches/0.18/configure.ac branches/0.18/doc/Doxyfile branches/0.18/src/Makefile.am branches/0.18/src/libopenvrml/openvrml.rc branches/0.18/src/libopenvrml/openvrml.vcxproj branches/0.18/src/libopenvrml-gl/openvrml-gl.rc Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2012-05-01 05:38:37 UTC (rev 4288) +++ branches/0.18/ChangeLog 2012-05-05 21:14:51 UTC (rev 4289) @@ -1,3 +1,18 @@ +2012-05-05 Braden McDaniel <br...@en...> + + Updates for 0.18.9 release. + + * README + * NEWS + * configure.ac + * doc/Doxyfile + * src/libopenvrml/openvrml.rc + * src/libopenvrml/openvrml.vcproj + * src/libopenvrml-gl/openvrml-gl.rc + * src/Makefile.am + (LIBOPENVRML_LIBRARY_VERSION): Update to 10:1:1. + (LIBOPENVRML_GL_LIBRARY_VERSION): Update to 8:1:0. + 2012-05-01 Braden McDaniel <br...@en...> Suppress various warnings from the Microsoft compiler Modified: branches/0.18/NEWS =================================================================== --- branches/0.18/NEWS 2012-05-01 05:38:37 UTC (rev 4288) +++ branches/0.18/NEWS 2012-05-05 21:14:51 UTC (rev 4289) @@ -1,3 +1,9 @@ +Changes new in version 0.18.9, 5 May, 2012 +======================================================================== + +- Changes to build with Boost 1.47.0, XULRunner 12.0, and libpng 1.5. + + Changes new in version 0.18.8, 21 April, 2011 ======================================================================== Modified: branches/0.18/README =================================================================== --- branches/0.18/README 2012-05-01 05:38:37 UTC (rev 4288) +++ branches/0.18/README 2012-05-05 21:14:51 UTC (rev 4289) @@ -1,7 +1,7 @@ -OpenVRML library version 0.18.8 +OpenVRML library version 0.18.9 Copyright 1998, 1999, 2000 Chris Morley <cm...@ve...> -Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 - Braden McDaniel <br...@en...> +Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, + 2011, 2012 Braden McDaniel <br...@en...> Portions Copyright SGI and others Available from <http://openvrml.org> Modified: branches/0.18/configure.ac =================================================================== --- branches/0.18/configure.ac 2012-05-01 05:38:37 UTC (rev 4288) +++ branches/0.18/configure.ac 2012-05-05 21:14:51 UTC (rev 4289) @@ -1,6 +1,6 @@ -AC_INIT([OpenVRML], [0.18.8], [ope...@li...]) +AC_INIT([OpenVRML], [0.18.9], [ope...@li...]) AC_PREREQ([2.59]) -AC_COPYRIGHT([Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Braden McDaniel]) +AC_COPYRIGHT([Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Braden McDaniel]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_FILES([Makefile] [doc/Makefile] Modified: branches/0.18/doc/Doxyfile =================================================================== --- branches/0.18/doc/Doxyfile 2012-05-01 05:38:37 UTC (rev 4288) +++ branches/0.18/doc/Doxyfile 2012-05-05 21:14:51 UTC (rev 4289) @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = OpenVRML -PROJECT_NUMBER = 0.18.8 +PROJECT_NUMBER = 0.18.9 PROJECT_BRIEF = PROJECT_LOGO = OUTPUT_DIRECTORY = Modified: branches/0.18/src/Makefile.am =================================================================== --- branches/0.18/src/Makefile.am 2012-05-01 05:38:37 UTC (rev 4288) +++ branches/0.18/src/Makefile.am 2012-05-05 21:14:51 UTC (rev 4289) @@ -47,8 +47,8 @@ libopenvrml/private.h \ openvrml-player/filechooserdialog.h -LIBOPENVRML_LIBRARY_VERSION = 10:0:1 -LIBOPENVRML_GL_LIBRARY_VERSION = 8:0:0 +LIBOPENVRML_LIBRARY_VERSION = 10:1:1 +LIBOPENVRML_GL_LIBRARY_VERSION = 8:1:0 # | | | # +------+ | +---+ # | | | Modified: branches/0.18/src/libopenvrml/openvrml.rc =================================================================== --- branches/0.18/src/libopenvrml/openvrml.rc 2012-05-01 05:38:37 UTC (rev 4288) +++ branches/0.18/src/libopenvrml/openvrml.rc 2012-05-05 21:14:51 UTC (rev 4289) @@ -11,8 +11,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 9,5,1,0 - PRODUCTVERSION 0,18,7,0 + FILEVERSION 10,1,1,0 + PRODUCTVERSION 0,18,9,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -28,12 +28,12 @@ BLOCK "040904b0" BEGIN VALUE "FileDescription", "OpenVRML Library" - VALUE "FileVersion", "10, 0, 1, 0" + VALUE "FileVersion", "10, 1, 1, 0" VALUE "InternalName", "openvrml" - VALUE "LegalCopyright", "Copyright (C) 2011" + VALUE "LegalCopyright", "Copyright (C) 2012" VALUE "OriginalFilename", "openvrml.dll" VALUE "ProductName", "OpenVRML Library" - VALUE "ProductVersion", "0.18.8" + VALUE "ProductVersion", "0.18.9" END END BLOCK "VarFileInfo" Modified: branches/0.18/src/libopenvrml/openvrml.vcxproj =================================================================== --- branches/0.18/src/libopenvrml/openvrml.vcxproj 2012-05-01 05:38:37 UTC (rev 4288) +++ branches/0.18/src/libopenvrml/openvrml.vcxproj 2012-05-05 21:14:51 UTC (rev 4289) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -65,7 +65,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.;..\local\libopenvrml-dl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.9";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>Default</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <MultiProcessorCompilation>true</MultiProcessorCompilation> @@ -91,7 +91,7 @@ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>.;..\local\libopenvrml-dl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.9";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <MultiProcessorCompilation>true</MultiProcessorCompilation> @@ -187,4 +187,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> \ No newline at end of file +</Project> Modified: branches/0.18/src/libopenvrml-gl/openvrml-gl.rc =================================================================== --- branches/0.18/src/libopenvrml-gl/openvrml-gl.rc 2012-05-01 05:38:37 UTC (rev 4288) +++ branches/0.18/src/libopenvrml-gl/openvrml-gl.rc 2012-05-05 21:14:51 UTC (rev 4289) @@ -11,8 +11,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 8,0,0,0 - PRODUCTVERSION 0,18,7,0 + FILEVERSION 8,1,0,0 + PRODUCTVERSION 0,18,9,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -28,12 +28,12 @@ BLOCK "040904b0" BEGIN VALUE "FileDescription", "OpenVRML OpenGL Renderer Library" - VALUE "FileVersion", "8, 0, 0, 0" + VALUE "FileVersion", "8, 1, 0, 0" VALUE "InternalName", "openvrml-gl" VALUE "LegalCopyright", "Copyright (C) 2011" VALUE "OriginalFilename", "openvrml-gl.dll" VALUE "ProductName", "OpenVRML Library" - VALUE "ProductVersion", "0.18.8" + VALUE "ProductVersion", "0.18.9" END END BLOCK "VarFileInfo" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-05-01 05:38:43
|
Revision: 4288 http://openvrml.svn.sourceforge.net/openvrml/?rev=4288&view=rev Author: braden Date: 2012-05-01 05:38:37 +0000 (Tue, 01 May 2012) Log Message: ----------- Suppress various warnings from the Microsoft compiler version 16.00.40219.01. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/libopenvrml/openvrml/basetypes.h branches/0.18/src/libopenvrml/openvrml/local/component.cpp branches/0.18/src/libopenvrml/openvrml/local/component.h branches/0.18/src/libopenvrml/openvrml/local/error.cpp branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml-gl/openvrml/gl/viewer.cpp Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/scene.cpp Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274,4276,4278,4280-4281,4283,4285 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274,4276,4278,4280-4281,4283,4285,4287 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2012-05-01 05:36:38 UTC (rev 4287) +++ branches/0.18/ChangeLog 2012-05-01 05:38:37 UTC (rev 4288) @@ -1,5 +1,17 @@ 2012-05-01 Braden McDaniel <br...@en...> + Suppress various warnings from the Microsoft compiler + version 16.00.40219.01. + + * src/libopenvrml/openvrml/basetypes.h + * src/libopenvrml/openvrml/scene.cpp + * src/libopenvrml/openvrml/local/component.cpp + * src/libopenvrml/openvrml/local/component.h + * src/libopenvrml/openvrml/local/error.cpp + * src/libopenvrml-gl/openvrml/gl/viewer.cpp + +2012-05-01 Braden McDaniel <br...@en...> + * src/local/libopenvrml-dl/openvrml/local/dl.cpp (foreachfile(const std::vector<boost::filesystem::path> &, int (*)(const std::string &, void *), void *)): Boost.Filesystem 3 Modified: branches/0.18/src/libopenvrml/openvrml/basetypes.h =================================================================== --- branches/0.18/src/libopenvrml/openvrml/basetypes.h 2012-05-01 05:36:38 UTC (rev 4287) +++ branches/0.18/src/libopenvrml/openvrml/basetypes.h 2012-05-01 05:38:37 UTC (rev 4288) @@ -69,7 +69,7 @@ inline const float & color::operator[](const std::size_t index) const OPENVRML_NOTHROW { - assert(index < 3); + assert(index < 3UL); return this->rgb[index]; } @@ -145,7 +145,7 @@ inline const float & color_rgba::operator[](const std::size_t index) const OPENVRML_NOTHROW { - assert(index < 4); + assert(index < 4ul); return this->rgba[index]; } @@ -240,7 +240,7 @@ inline const float & vec2f::operator[](const std::size_t index) const OPENVRML_NOTHROW { - assert(index < 2); + assert(index < 2ul); return this->vec[index]; } @@ -325,7 +325,7 @@ inline const double & vec2d::operator[](const std::size_t index) const OPENVRML_NOTHROW { - assert(index < 2); + assert(index < 2ul); return this->vec[index]; } @@ -425,7 +425,7 @@ inline const float & vec3f::operator[](const std::size_t index) const OPENVRML_NOTHROW { - assert(index < 3); + assert(index < 3ul); return this->vec[index]; } @@ -538,7 +538,7 @@ inline const double & vec3d::operator[](const std::size_t index) const OPENVRML_NOTHROW { - assert(index < 3); + assert(index < 3ul); return this->vec[index]; } @@ -644,7 +644,7 @@ inline const float & rotation::operator[](const std::size_t index) const OPENVRML_NOTHROW { - assert(index < 4); + assert(index < 4ul); return this->rot[index]; } @@ -734,13 +734,13 @@ inline float (&mat4f::operator[](std::size_t index) OPENVRML_NOTHROW)[4] { - assert(index < 4); + assert(index < 4ul); return this->mat[index]; } inline const float (&mat4f::operator[](std::size_t index) const OPENVRML_NOTHROW)[4] { - assert(index < 4); + assert(index < 4ul); return this->mat[index]; } @@ -813,13 +813,13 @@ inline const float & quatf::operator[](std::size_t index) const OPENVRML_NOTHROW { - assert(index < 4); + assert(index < 4ul); return this->quat[index]; } inline float & quatf::operator[](std::size_t index) OPENVRML_NOTHROW { - assert(index < 4); + assert(index < 4ul); return this->quat[index]; } Modified: branches/0.18/src/libopenvrml/openvrml/local/component.cpp =================================================================== --- branches/0.18/src/libopenvrml/openvrml/local/component.cpp 2012-05-01 05:36:38 UTC (rev 4287) +++ branches/0.18/src/libopenvrml/openvrml/local/component.cpp 2012-05-01 05:38:37 UTC (rev 4288) @@ -379,11 +379,11 @@ void openvrml::local::profile:: -add_component(const std::string & name, const int level) +add_component(const std::string & name, const size_t level) OPENVRML_THROW1(std::bad_alloc) { //get the existing/new support level - int & comp_level = components_[name]; + size_t & comp_level = components_[name]; //update the support level. comp_level = std::max(level, comp_level); Modified: branches/0.18/src/libopenvrml/openvrml/local/component.h =================================================================== --- branches/0.18/src/libopenvrml/openvrml/local/component.h 2012-05-01 05:36:38 UTC (rev 4287) +++ branches/0.18/src/libopenvrml/openvrml/local/component.h 2012-05-01 05:38:37 UTC (rev 4288) @@ -108,11 +108,11 @@ class OPENVRML_LOCAL profile { - typedef std::map<std::string, int> map_t; + typedef std::map<std::string, size_t> map_t; map_t components_; protected: - void add_component(const std::string & name, int level) + void add_component(const std::string & name, size_t level) OPENVRML_THROW1(std::bad_alloc); public: Modified: branches/0.18/src/libopenvrml/openvrml/local/error.cpp =================================================================== --- branches/0.18/src/libopenvrml/openvrml/local/error.cpp 2012-05-01 05:36:38 UTC (rev 4287) +++ branches/0.18/src/libopenvrml/openvrml/local/error.cpp 2012-05-01 05:38:37 UTC (rev 4288) @@ -25,7 +25,7 @@ void openvrml::local::throw_runtime_error_from_win32_system_error(LONG result) OPENVRML_THROW1(std::runtime_error) { - static const LPCVOID source; + static const LPCVOID source = 0; LPTSTR buf = 0; BOOST_SCOPE_EXIT((&buf)) { LocalFree(buf); @@ -33,10 +33,10 @@ FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, source, - result, + static_cast<DWORD>(result), LANG_USER_DEFAULT, - reinterpret_cast< LPTSTR >(&buf), - DWORD(0), + reinterpret_cast<LPTSTR>(&buf), + static_cast<DWORD>(0), 0); throw std::runtime_error(buf); Modified: branches/0.18/src/libopenvrml/openvrml/scene.cpp =================================================================== --- branches/0.18/src/libopenvrml/openvrml/scene.cpp 2012-05-01 05:36:38 UTC (rev 4287) +++ branches/0.18/src/libopenvrml/openvrml/scene.cpp 2012-05-01 05:38:37 UTC (rev 4288) @@ -423,7 +423,9 @@ const resource_istream::int_type c = this->in_->get(); if (c != resource_istream::traits_type::eof()) { data.push_back( - resource_istream::traits_type::to_char_type(c)); + static_cast<unsigned char>( + resource_istream::traits_type:: + to_char_type(c))); } else { break; } Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4287 Modified: branches/0.18/src/libopenvrml-gl/openvrml/gl/viewer.cpp =================================================================== --- branches/0.18/src/libopenvrml-gl/openvrml/gl/viewer.cpp 2012-05-01 05:36:38 UTC (rev 4287) +++ branches/0.18/src/libopenvrml-gl/openvrml/gl/viewer.cpp 2012-05-01 05:38:37 UTC (rev 4288) @@ -74,12 +74,6 @@ const double pi_4 = 0.78539816339744830962; const double inv_pi = 0.31830988618379067154; - template <typename Float> - OPENVRML_GL_LOCAL inline Float fabs(const Float f) - { - return f < 0.0 ? -f : f; - } - struct OPENVRML_GL_LOCAL fequal_t { template <typename Float> bool operator()(Float a, Float b) const @@ -2138,7 +2132,7 @@ GLdouble v[3]; // Mesa tesselator doesn;t like closed polys - size_t j = equalEndpts ? 1 : 0; + size_t j = equalEndpts ? 1ul : 0ul; for (; j < cs.size(); ++j) { v[0] = c[j + n].x(); v[1] = c[j + n].y(); @@ -2525,7 +2519,8 @@ spine_point->x(), spine_point->y(), spine_point->z(), 1.0); const vector<vec3f>::size_type spine_index = - std::distance(spine.begin(), spine_point); + static_cast<std::size_t>(std::distance(spine.begin(), + spine_point)); if (!orientation.empty()) { const vector<rotation>::size_type index = @@ -2704,8 +2699,8 @@ glBegin(GL_LINE_STRIP); if (!color.empty() && color_per_face) { const size_t color_index = !colorIndex.empty() - ? colorIndex.front() - : 0; + ? static_cast<std::size_t>(colorIndex.front()) + : 0ul; glColor3fv(&color[color_index][0]); } @@ -2720,7 +2715,7 @@ ? int32(colorIndex[nl]) : int32(nl); if (size_t(index) < color.size()) { - glColor3fv(&color[index][0]); + glColor3fv(&color[static_cast<std::size_t>(index)][0]); } } } else { @@ -2729,11 +2724,12 @@ ? colorIndex[i] : coordIndex[i]; if (size_t(index) < color.size()) { - glColor3fv(&color[index][0]); + glColor3fv(&color[static_cast<std::size_t>(index)][0]); } } if (size_t(coordIndex[i]) < coord.size()) { - glVertex3fv(&coord[coordIndex[i]][0]); + glVertex3fv( + &coord[static_cast<std::size_t>(coordIndex[i])][0]); } } } @@ -2887,10 +2883,12 @@ && s->coordIndex[i1] >= 0 && s->coordIndex[i1 + 1] >= 0 && s->coordIndex[i1 + 2] >= 0) { - N = indexFaceNormal(s->coordIndex[i1], - s->coordIndex[i1 + 1], - s->coordIndex[i1 + 2], - s->coord); + N = + indexFaceNormal( + static_cast<std::size_t>(s->coordIndex[i1]), + static_cast<std::size_t>(s->coordIndex[i1 + 1]), + static_cast<std::size_t>(s->coordIndex[i1 + 2]), + s->coord); // Flip normal if primitiv-orientation is clockwise if (!(s->mask & viewer::mask_ccw)) { N = -N; } @@ -2903,18 +2901,20 @@ if (s->coordIndex[i] >= 0) { // Per-vertex attributes - const size_t color_index = (i < s->colorIndex.size()) - ? s->colorIndex[i] - : s->coordIndex[i]; + const size_t color_index = + static_cast<std::size_t>( + (i < s->colorIndex.size()) ? s->colorIndex[i] + : s->coordIndex[i]); if (color_index < s->color.size() && (s->mask & viewer::mask_color_per_vertex)) { glColor3fv(&s->color[color_index][0]); } if (s->mask & viewer::mask_normal_per_vertex) { - const size_t normal_index = (i < s->normalIndex.size()) - ? s->normalIndex[i] - : s->coordIndex[i]; + const size_t normal_index = + static_cast<std::size_t>( + (i < s->normalIndex.size()) ? s->normalIndex[i] + : s->coordIndex[i]); if (normal_index < s->normal.size()) { glNormal3fv(&s->normal[normal_index][0]); } else { @@ -2922,17 +2922,21 @@ } } - const vec3f & v = s->coord[s->coordIndex[i]]; - const size_t tex_coord_index = (i < s->texCoordIndex.size()) - ? s->texCoordIndex[i] - : s->coordIndex[i]; + const vec3f & v = + s->coord[static_cast<std::size_t>(s->coordIndex[i])]; + const size_t tex_coord_index = + static_cast<std::size_t>( + (i < s->texCoordIndex.size()) ? s->texCoordIndex[i] + : s->coordIndex[i]); if (tex_coord_index < s->texCoord.size()) { glTexCoord2fv(&s->texCoord[tex_coord_index][0]); } else { float c0, c1; - c0 = (v[s->texAxes[0]] - s->texParams[0]) + c0 = (v[static_cast<std::size_t>(s->texAxes[0])] + - s->texParams[0]) * s->texParams[1]; - c1 = (v[s->texAxes[1]] - s->texParams[2]) + c1 = (v[static_cast<std::size_t>(s->texAxes[1])] + - s->texParams[2]) * s->texParams[3]; glTexCoord2f(c0, c1); } @@ -3011,11 +3015,14 @@ // while (coord_index[i + 1] != -1) { ++i; } } else if (coord_index[i] != -1) { - gluTessVertex(&tessobj, - const_cast<GLdouble *>( - vertices[coord_index[i]].coord), - &const_cast<vertex_data &>( - vertices[coord_index[i]])); + gluTessVertex( + &tessobj, + const_cast<GLdouble *>( + vertices[ + static_cast<std::size_t>(coord_index[i])].coord), + &const_cast<vertex_data &>( + vertices[ + static_cast<std::size_t>(coord_index[i])])); } else { gluTessEndContour(&tessobj); gluTessEndPolygon(&tessobj); @@ -3143,7 +3150,8 @@ ++i) { if (color_index[i] < 0) { continue; } if (!(size_t(coord_index[i]) < coord.size())) { continue; } - vertices[coord_index[i]].color = &color[color_index[i]]; + vertices[static_cast<std::size_t>(coord_index[i])].color = + &color[static_cast<std::size_t>(color_index[i])]; } } } @@ -3160,7 +3168,8 @@ ++i) { if (normal_index[i] < 0) { continue; } if (!(size_t(coord_index[i]) < coord.size())) { continue; } - vertices[coord_index[i]].normal = &normal[normal_index[i]]; + vertices[static_cast<std::size_t>(coord_index[i])].normal = + &normal[static_cast<std::size_t>(normal_index[i])]; } } } @@ -3176,8 +3185,10 @@ i < tex_coord_index.size(); ++i) { if (tex_coord_index[i] < 0) { continue; } - vertices[tex_coord_index[i]].tex_coord = - &tex_coord[tex_coord_index[i]]; + vertices[static_cast<std::size_t>(tex_coord_index[i])] + .tex_coord = + &tex_coord[static_cast<std::size_t>( + tex_coord_index[i])]; } } @@ -3698,7 +3709,7 @@ const texture_map_t::const_iterator texture = this->texture_map_.find(&n); if (texture != this->texture_map_.end()) { // Enable blending if needed. - const int32 comp = n.image().comp(); + const int32 comp = static_cast<int32>(n.image().comp()); if (this->blend && (comp == 2 || comp == 4)) { glEnable(GL_BLEND); } glBindTexture(GL_TEXTURE_2D, texture->second); return; @@ -3718,8 +3729,8 @@ if (width > max_texture_size) { width = max_texture_size; } if (height > max_texture_size) { height = max_texture_size; } - while (!power_of_2(width)) { --width; } - while (!power_of_2(height)) { --height; } + while (!power_of_2(static_cast<std::size_t>(width))) { --width; } + while (!power_of_2(static_cast<std::size_t>(height))) { --height; } vector<GLubyte> rescaled_pixels; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-05-01 05:36:45
|
Revision: 4287 http://openvrml.svn.sourceforge.net/openvrml/?rev=4287&view=rev Author: braden Date: 2012-05-01 05:36:38 +0000 (Tue, 01 May 2012) Log Message: ----------- Suppress various warnings from the Microsoft compiler version 16.00.40219.01. Modified Paths: -------------- trunk/ChangeLog trunk/src/libopenvrml/openvrml/basetypes.h trunk/src/libopenvrml/openvrml/local/component.cpp trunk/src/libopenvrml/openvrml/local/component.h trunk/src/libopenvrml/openvrml/local/error.cpp trunk/src/libopenvrml/openvrml/scene.cpp trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2012-05-01 05:30:48 UTC (rev 4286) +++ trunk/ChangeLog 2012-05-01 05:36:38 UTC (rev 4287) @@ -1,5 +1,17 @@ 2012-05-01 Braden McDaniel <br...@en...> + Suppress various warnings from the Microsoft compiler + version 16.00.40219.01. + + * src/libopenvrml/openvrml/basetypes.h + * src/libopenvrml/openvrml/scene.cpp + * src/libopenvrml/openvrml/local/component.cpp + * src/libopenvrml/openvrml/local/component.h + * src/libopenvrml/openvrml/local/error.cpp + * src/libopenvrml-gl/openvrml/gl/viewer.cpp + +2012-05-01 Braden McDaniel <br...@en...> + * src/local/libopenvrml-dl/openvrml/local/dl.cpp (foreachfile(const std::vector<boost::filesystem::path> &, int (*)(const std::string &, void *), void *)): Boost.Filesystem 3 Modified: trunk/src/libopenvrml/openvrml/basetypes.h =================================================================== --- trunk/src/libopenvrml/openvrml/basetypes.h 2012-05-01 05:30:48 UTC (rev 4286) +++ trunk/src/libopenvrml/openvrml/basetypes.h 2012-05-01 05:36:38 UTC (rev 4287) @@ -69,7 +69,7 @@ inline const float & color::operator[](const std::size_t index) const OPENVRML_NOTHROW { - assert(index < 3); + assert(index < 3UL); return this->rgb[index]; } @@ -145,7 +145,7 @@ inline const float & color_rgba::operator[](const std::size_t index) const OPENVRML_NOTHROW { - assert(index < 4); + assert(index < 4ul); return this->rgba[index]; } @@ -240,7 +240,7 @@ inline const float & vec2f::operator[](const std::size_t index) const OPENVRML_NOTHROW { - assert(index < 2); + assert(index < 2ul); return this->vec[index]; } @@ -325,7 +325,7 @@ inline const double & vec2d::operator[](const std::size_t index) const OPENVRML_NOTHROW { - assert(index < 2); + assert(index < 2ul); return this->vec[index]; } @@ -425,7 +425,7 @@ inline const float & vec3f::operator[](const std::size_t index) const OPENVRML_NOTHROW { - assert(index < 3); + assert(index < 3ul); return this->vec[index]; } @@ -538,7 +538,7 @@ inline const double & vec3d::operator[](const std::size_t index) const OPENVRML_NOTHROW { - assert(index < 3); + assert(index < 3ul); return this->vec[index]; } @@ -644,7 +644,7 @@ inline const float & rotation::operator[](const std::size_t index) const OPENVRML_NOTHROW { - assert(index < 4); + assert(index < 4ul); return this->rot[index]; } @@ -734,13 +734,13 @@ inline float (&mat4f::operator[](std::size_t index) OPENVRML_NOTHROW)[4] { - assert(index < 4); + assert(index < 4ul); return this->mat[index]; } inline const float (&mat4f::operator[](std::size_t index) const OPENVRML_NOTHROW)[4] { - assert(index < 4); + assert(index < 4ul); return this->mat[index]; } @@ -813,13 +813,13 @@ inline const float & quatf::operator[](std::size_t index) const OPENVRML_NOTHROW { - assert(index < 4); + assert(index < 4ul); return this->quat[index]; } inline float & quatf::operator[](std::size_t index) OPENVRML_NOTHROW { - assert(index < 4); + assert(index < 4ul); return this->quat[index]; } Modified: trunk/src/libopenvrml/openvrml/local/component.cpp =================================================================== --- trunk/src/libopenvrml/openvrml/local/component.cpp 2012-05-01 05:30:48 UTC (rev 4286) +++ trunk/src/libopenvrml/openvrml/local/component.cpp 2012-05-01 05:36:38 UTC (rev 4287) @@ -379,11 +379,11 @@ void openvrml::local::profile:: -add_component(const std::string & name, const int level) +add_component(const std::string & name, const size_t level) OPENVRML_THROW1(std::bad_alloc) { //get the existing/new support level - int & comp_level = components_[name]; + size_t & comp_level = components_[name]; //update the support level. comp_level = std::max(level, comp_level); Modified: trunk/src/libopenvrml/openvrml/local/component.h =================================================================== --- trunk/src/libopenvrml/openvrml/local/component.h 2012-05-01 05:30:48 UTC (rev 4286) +++ trunk/src/libopenvrml/openvrml/local/component.h 2012-05-01 05:36:38 UTC (rev 4287) @@ -108,11 +108,11 @@ class OPENVRML_LOCAL profile { - typedef std::map<std::string, int> map_t; + typedef std::map<std::string, size_t> map_t; map_t components_; protected: - void add_component(const std::string & name, int level) + void add_component(const std::string & name, size_t level) OPENVRML_THROW1(std::bad_alloc); public: Modified: trunk/src/libopenvrml/openvrml/local/error.cpp =================================================================== --- trunk/src/libopenvrml/openvrml/local/error.cpp 2012-05-01 05:30:48 UTC (rev 4286) +++ trunk/src/libopenvrml/openvrml/local/error.cpp 2012-05-01 05:36:38 UTC (rev 4287) @@ -25,7 +25,7 @@ void openvrml::local::throw_runtime_error_from_win32_system_error(LONG result) OPENVRML_THROW1(std::runtime_error) { - static const LPCVOID source; + static const LPCVOID source = 0; LPTSTR buf = 0; BOOST_SCOPE_EXIT((&buf)) { LocalFree(buf); @@ -33,10 +33,10 @@ FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, source, - result, + static_cast<DWORD>(result), LANG_USER_DEFAULT, - reinterpret_cast< LPTSTR >(&buf), - DWORD(0), + reinterpret_cast<LPTSTR>(&buf), + static_cast<DWORD>(0), 0); throw std::runtime_error(buf); Modified: trunk/src/libopenvrml/openvrml/scene.cpp =================================================================== --- trunk/src/libopenvrml/openvrml/scene.cpp 2012-05-01 05:30:48 UTC (rev 4286) +++ trunk/src/libopenvrml/openvrml/scene.cpp 2012-05-01 05:36:38 UTC (rev 4287) @@ -423,7 +423,9 @@ const resource_istream::int_type c = this->in_->get(); if (c != resource_istream::traits_type::eof()) { data.push_back( - resource_istream::traits_type::to_char_type(c)); + static_cast<unsigned char>( + resource_istream::traits_type:: + to_char_type(c))); } else { break; } Modified: trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp =================================================================== --- trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp 2012-05-01 05:30:48 UTC (rev 4286) +++ trunk/src/libopenvrml-gl/openvrml/gl/viewer.cpp 2012-05-01 05:36:38 UTC (rev 4287) @@ -74,12 +74,6 @@ const double pi_4 = 0.78539816339744830962; const double inv_pi = 0.31830988618379067154; - template <typename Float> - OPENVRML_GL_LOCAL inline Float fabs(const Float f) - { - return f < 0.0 ? -f : f; - } - struct OPENVRML_GL_LOCAL fequal_t { template <typename Float> bool operator()(Float a, Float b) const @@ -2138,7 +2132,7 @@ GLdouble v[3]; // Mesa tesselator doesn;t like closed polys - size_t j = equalEndpts ? 1 : 0; + size_t j = equalEndpts ? 1ul : 0ul; for (; j < cs.size(); ++j) { v[0] = c[j + n].x(); v[1] = c[j + n].y(); @@ -2525,7 +2519,8 @@ spine_point->x(), spine_point->y(), spine_point->z(), 1.0); const vector<vec3f>::size_type spine_index = - std::distance(spine.begin(), spine_point); + static_cast<std::size_t>(std::distance(spine.begin(), + spine_point)); if (!orientation.empty()) { const vector<rotation>::size_type index = @@ -2704,8 +2699,8 @@ glBegin(GL_LINE_STRIP); if (!color.empty() && color_per_face) { const size_t color_index = !colorIndex.empty() - ? colorIndex.front() - : 0; + ? static_cast<std::size_t>(colorIndex.front()) + : 0ul; glColor3fv(&color[color_index][0]); } @@ -2720,7 +2715,7 @@ ? int32(colorIndex[nl]) : int32(nl); if (size_t(index) < color.size()) { - glColor3fv(&color[index][0]); + glColor3fv(&color[static_cast<std::size_t>(index)][0]); } } } else { @@ -2729,11 +2724,12 @@ ? colorIndex[i] : coordIndex[i]; if (size_t(index) < color.size()) { - glColor3fv(&color[index][0]); + glColor3fv(&color[static_cast<std::size_t>(index)][0]); } } if (size_t(coordIndex[i]) < coord.size()) { - glVertex3fv(&coord[coordIndex[i]][0]); + glVertex3fv( + &coord[static_cast<std::size_t>(coordIndex[i])][0]); } } } @@ -2887,10 +2883,12 @@ && s->coordIndex[i1] >= 0 && s->coordIndex[i1 + 1] >= 0 && s->coordIndex[i1 + 2] >= 0) { - N = indexFaceNormal(s->coordIndex[i1], - s->coordIndex[i1 + 1], - s->coordIndex[i1 + 2], - s->coord); + N = + indexFaceNormal( + static_cast<std::size_t>(s->coordIndex[i1]), + static_cast<std::size_t>(s->coordIndex[i1 + 1]), + static_cast<std::size_t>(s->coordIndex[i1 + 2]), + s->coord); // Flip normal if primitiv-orientation is clockwise if (!(s->mask & viewer::mask_ccw)) { N = -N; } @@ -2903,18 +2901,20 @@ if (s->coordIndex[i] >= 0) { // Per-vertex attributes - const size_t color_index = (i < s->colorIndex.size()) - ? s->colorIndex[i] - : s->coordIndex[i]; + const size_t color_index = + static_cast<std::size_t>( + (i < s->colorIndex.size()) ? s->colorIndex[i] + : s->coordIndex[i]); if (color_index < s->color.size() && (s->mask & viewer::mask_color_per_vertex)) { glColor3fv(&s->color[color_index][0]); } if (s->mask & viewer::mask_normal_per_vertex) { - const size_t normal_index = (i < s->normalIndex.size()) - ? s->normalIndex[i] - : s->coordIndex[i]; + const size_t normal_index = + static_cast<std::size_t>( + (i < s->normalIndex.size()) ? s->normalIndex[i] + : s->coordIndex[i]); if (normal_index < s->normal.size()) { glNormal3fv(&s->normal[normal_index][0]); } else { @@ -2922,17 +2922,21 @@ } } - const vec3f & v = s->coord[s->coordIndex[i]]; - const size_t tex_coord_index = (i < s->texCoordIndex.size()) - ? s->texCoordIndex[i] - : s->coordIndex[i]; + const vec3f & v = + s->coord[static_cast<std::size_t>(s->coordIndex[i])]; + const size_t tex_coord_index = + static_cast<std::size_t>( + (i < s->texCoordIndex.size()) ? s->texCoordIndex[i] + : s->coordIndex[i]); if (tex_coord_index < s->texCoord.size()) { glTexCoord2fv(&s->texCoord[tex_coord_index][0]); } else { float c0, c1; - c0 = (v[s->texAxes[0]] - s->texParams[0]) + c0 = (v[static_cast<std::size_t>(s->texAxes[0])] + - s->texParams[0]) * s->texParams[1]; - c1 = (v[s->texAxes[1]] - s->texParams[2]) + c1 = (v[static_cast<std::size_t>(s->texAxes[1])] + - s->texParams[2]) * s->texParams[3]; glTexCoord2f(c0, c1); } @@ -3011,11 +3015,14 @@ // while (coord_index[i + 1] != -1) { ++i; } } else if (coord_index[i] != -1) { - gluTessVertex(&tessobj, - const_cast<GLdouble *>( - vertices[coord_index[i]].coord), - &const_cast<vertex_data &>( - vertices[coord_index[i]])); + gluTessVertex( + &tessobj, + const_cast<GLdouble *>( + vertices[ + static_cast<std::size_t>(coord_index[i])].coord), + &const_cast<vertex_data &>( + vertices[ + static_cast<std::size_t>(coord_index[i])])); } else { gluTessEndContour(&tessobj); gluTessEndPolygon(&tessobj); @@ -3143,7 +3150,8 @@ ++i) { if (color_index[i] < 0) { continue; } if (!(size_t(coord_index[i]) < coord.size())) { continue; } - vertices[coord_index[i]].color = &color[color_index[i]]; + vertices[static_cast<std::size_t>(coord_index[i])].color = + &color[static_cast<std::size_t>(color_index[i])]; } } } @@ -3160,7 +3168,8 @@ ++i) { if (normal_index[i] < 0) { continue; } if (!(size_t(coord_index[i]) < coord.size())) { continue; } - vertices[coord_index[i]].normal = &normal[normal_index[i]]; + vertices[static_cast<std::size_t>(coord_index[i])].normal = + &normal[static_cast<std::size_t>(normal_index[i])]; } } } @@ -3176,8 +3185,10 @@ i < tex_coord_index.size(); ++i) { if (tex_coord_index[i] < 0) { continue; } - vertices[tex_coord_index[i]].tex_coord = - &tex_coord[tex_coord_index[i]]; + vertices[static_cast<std::size_t>(tex_coord_index[i])] + .tex_coord = + &tex_coord[static_cast<std::size_t>( + tex_coord_index[i])]; } } @@ -3698,7 +3709,7 @@ const texture_map_t::const_iterator texture = this->texture_map_.find(&n); if (texture != this->texture_map_.end()) { // Enable blending if needed. - const int32 comp = n.image().comp(); + const int32 comp = static_cast<int32>(n.image().comp()); if (this->blend && (comp == 2 || comp == 4)) { glEnable(GL_BLEND); } glBindTexture(GL_TEXTURE_2D, texture->second); return; @@ -3718,8 +3729,8 @@ if (width > max_texture_size) { width = max_texture_size; } if (height > max_texture_size) { height = max_texture_size; } - while (!power_of_2(width)) { --width; } - while (!power_of_2(height)) { --height; } + while (!power_of_2(static_cast<std::size_t>(width))) { --width; } + while (!power_of_2(static_cast<std::size_t>(height))) { --height; } vector<GLubyte> rescaled_pixels; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-05-01 05:30:55
|
Revision: 4286 http://openvrml.svn.sourceforge.net/openvrml/?rev=4286&view=rev Author: braden Date: 2012-05-01 05:30:48 +0000 (Tue, 01 May 2012) Log Message: ----------- Boost.Filesystem 3 doesn't have path::external_file_string; use generic_string instead. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp Property Changed: ---------------- branches/0.18/ Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274,4276,4278,4280-4281,4283 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274,4276,4278,4280-4281,4283,4285 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2012-05-01 05:29:53 UTC (rev 4285) +++ branches/0.18/ChangeLog 2012-05-01 05:30:48 UTC (rev 4286) @@ -1,5 +1,13 @@ 2012-05-01 Braden McDaniel <br...@en...> + * src/local/libopenvrml-dl/openvrml/local/dl.cpp + (foreachfile(const std::vector<boost::filesystem::path> &, int + (*)(const std::string &, void *), void *)): Boost.Filesystem 3 + doesn't have path::external_file_string; use generic_string + instead. + +2012-05-01 Braden McDaniel <br...@en...> + * src/libopenvrml-gl/openvrml-gl.vcxproj: Generate openvrml-gl.lib into arch-specific subdirectory. Modified: branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp =================================================================== --- branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp 2012-05-01 05:29:53 UTC (rev 4285) +++ branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp 2012-05-01 05:30:48 UTC (rev 4286) @@ -75,7 +75,7 @@ for (directory_iterator entry(*dir); entry != directory_iterator(); ++entry) { - result = (func)(entry->path().external_file_string(), data); + result = (func)(entry->path().generic_string(), data); if (result != 0) { return result; } } } catch (boost::filesystem::filesystem_error &) {} @@ -144,7 +144,7 @@ reinterpret_cast<LPSTR>(&buf), buf_size, args); - assert(buf_chars != 0); // If FormatMessage failed, just give up. + assert(buf_chars != DWORD(0)); // If FormatMessage failed, just give up. const std::string buf_str(buf ? buf : ""); return buf_str; # else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-05-01 05:30:00
|
Revision: 4285 http://openvrml.svn.sourceforge.net/openvrml/?rev=4285&view=rev Author: braden Date: 2012-05-01 05:29:53 +0000 (Tue, 01 May 2012) Log Message: ----------- Boost.Filesystem 3 doesn't have path::external_file_string; use generic_string instead. Modified Paths: -------------- trunk/ChangeLog trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2012-05-01 05:16:04 UTC (rev 4284) +++ trunk/ChangeLog 2012-05-01 05:29:53 UTC (rev 4285) @@ -1,5 +1,13 @@ 2012-05-01 Braden McDaniel <br...@en...> + * src/local/libopenvrml-dl/openvrml/local/dl.cpp + (foreachfile(const std::vector<boost::filesystem::path> &, int + (*)(const std::string &, void *), void *)): Boost.Filesystem 3 + doesn't have path::external_file_string; use generic_string + instead. + +2012-05-01 Braden McDaniel <br...@en...> + * src/libopenvrml-gl/openvrml-gl.vcxproj: Generate openvrml-gl.lib into arch-specific subdirectory. Modified: trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp =================================================================== --- trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp 2012-05-01 05:16:04 UTC (rev 4284) +++ trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp 2012-05-01 05:29:53 UTC (rev 4285) @@ -75,7 +75,7 @@ for (directory_iterator entry(*dir); entry != directory_iterator(); ++entry) { - result = (func)(entry->path().external_file_string(), data); + result = (func)(entry->path().generic_string(), data); if (result != 0) { return result; } } } catch (boost::filesystem::filesystem_error &) {} @@ -144,7 +144,7 @@ reinterpret_cast<LPSTR>(&buf), buf_size, args); - assert(buf_chars != 0); // If FormatMessage failed, just give up. + assert(buf_chars != DWORD(0)); // If FormatMessage failed, just give up. const std::string buf_str(buf ? buf : ""); return buf_str; # else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-05-01 05:16:10
|
Revision: 4284 http://openvrml.svn.sourceforge.net/openvrml/?rev=4284&view=rev Author: braden Date: 2012-05-01 05:16:04 +0000 (Tue, 01 May 2012) Log Message: ----------- Generate openvrml-gl.lib into arch-specific subdirectory. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/libopenvrml-gl/openvrml-gl.vcxproj Property Changed: ---------------- branches/0.18/ Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274,4276,4278,4280-4281 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274,4276,4278,4280-4281,4283 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2012-05-01 05:14:52 UTC (rev 4283) +++ branches/0.18/ChangeLog 2012-05-01 05:16:04 UTC (rev 4284) @@ -1,5 +1,10 @@ 2012-05-01 Braden McDaniel <br...@en...> + * src/libopenvrml-gl/openvrml-gl.vcxproj: Generate openvrml-gl.lib + into arch-specific subdirectory. + +2012-05-01 Braden McDaniel <br...@en...> + Project file clean-up. Remove references to site-specific library directories; these should be set in user (site-specific) properties. Reorganize preprocessor symbol definitions to Modified: branches/0.18/src/libopenvrml-gl/openvrml-gl.vcxproj =================================================================== --- branches/0.18/src/libopenvrml-gl/openvrml-gl.vcxproj 2012-05-01 05:14:52 UTC (rev 4283) +++ branches/0.18/src/libopenvrml-gl/openvrml-gl.vcxproj 2012-05-01 05:16:04 UTC (rev 4284) @@ -72,7 +72,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>$(SolutionDir)$(Configuration)\lib\$(TargetName).lib</ImportLibrary> + <ImportLibrary>$(SolutionDir)$(Platform)\$(Configuration)\lib\$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -97,7 +97,7 @@ <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>$(SolutionDir)$(Configuration)\lib\$(TargetName).lib</ImportLibrary> + <ImportLibrary>$(SolutionDir)$(Platform)\$(Configuration)\lib\$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> <ItemGroup> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-05-01 05:15:00
|
Revision: 4283 http://openvrml.svn.sourceforge.net/openvrml/?rev=4283&view=rev Author: braden Date: 2012-05-01 05:14:52 +0000 (Tue, 01 May 2012) Log Message: ----------- Generate openvrml-gl.lib into arch-specific subdirectory. Modified Paths: -------------- trunk/ChangeLog trunk/src/libopenvrml-gl/openvrml-gl.vcxproj Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2012-05-01 05:06:12 UTC (rev 4282) +++ trunk/ChangeLog 2012-05-01 05:14:52 UTC (rev 4283) @@ -1,5 +1,10 @@ 2012-05-01 Braden McDaniel <br...@en...> + * src/libopenvrml-gl/openvrml-gl.vcxproj: Generate openvrml-gl.lib + into arch-specific subdirectory. + +2012-05-01 Braden McDaniel <br...@en...> + Project file clean-up. Remove references to site-specific library directories; these should be set in user (site-specific) properties. Reorganize preprocessor symbol definitions to Modified: trunk/src/libopenvrml-gl/openvrml-gl.vcxproj =================================================================== --- trunk/src/libopenvrml-gl/openvrml-gl.vcxproj 2012-05-01 05:06:12 UTC (rev 4282) +++ trunk/src/libopenvrml-gl/openvrml-gl.vcxproj 2012-05-01 05:14:52 UTC (rev 4283) @@ -72,7 +72,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>$(SolutionDir)$(Configuration)\lib\$(TargetName).lib</ImportLibrary> + <ImportLibrary>$(SolutionDir)$(Platform)\$(Configuration)\lib\$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -97,7 +97,7 @@ <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>$(SolutionDir)$(Configuration)\lib\$(TargetName).lib</ImportLibrary> + <ImportLibrary>$(SolutionDir)$(Platform)\$(Configuration)\lib\$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> <ItemGroup> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-05-01 05:06:20
|
Revision: 4282 http://openvrml.svn.sourceforge.net/openvrml/?rev=4282&view=rev Author: braden Date: 2012-05-01 05:06:12 +0000 (Tue, 01 May 2012) Log Message: ----------- Project file clean-up. Remove references to site-specific library directories; these should be set in user (site-specific) properties. Reorganize preprocessor symbol definitions to leverage commonality between Debug and Release configurations and remove unneeded definitions. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/examples/pretty-print.vcxproj branches/0.18/examples/sdl-viewer.vcxproj branches/0.18/src/libopenvrml/openvrml.vcxproj branches/0.18/src/libopenvrml-gl/openvrml-gl.vcxproj branches/0.18/src/local/libopenvrml-dl/openvrml-dl.vcxproj branches/0.18/src/node/vrml97/vrml97.vcxproj branches/0.18/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj branches/0.18/src/node/x3d-core/x3d-core.vcxproj branches/0.18/src/node/x3d-dis/x3d-dis.vcxproj branches/0.18/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj branches/0.18/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj branches/0.18/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj branches/0.18/src/node/x3d-geospatial/x3d-geospatial.vcxproj branches/0.18/src/node/x3d-grouping/x3d-grouping.vcxproj branches/0.18/src/node/x3d-h-anim/x3d-h-anim.vcxproj branches/0.18/src/node/x3d-interpolation/x3d-interpolation.vcxproj branches/0.18/src/node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj branches/0.18/src/node/x3d-networking/x3d-networking.vcxproj branches/0.18/src/node/x3d-nurbs/x3d-nurbs.vcxproj branches/0.18/src/node/x3d-rendering/x3d-rendering.vcxproj branches/0.18/src/node/x3d-shape/x3d-shape.vcxproj branches/0.18/src/node/x3d-texturing/x3d-texturing.vcxproj branches/0.18/src/script/javascript.vcxproj branches/0.18/tests/parse-vrml97.vcxproj branches/0.18/tests/parse-x3dvrml.vcxproj Property Changed: ---------------- branches/0.18/ Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274,4276,4278 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274,4276,4278,4280-4281 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2012-05-01 05:00:36 UTC (rev 4281) +++ branches/0.18/ChangeLog 2012-05-01 05:06:12 UTC (rev 4282) @@ -1,3 +1,37 @@ +2012-05-01 Braden McDaniel <br...@en...> + + Project file clean-up. Remove references to site-specific library + directories; these should be set in user (site-specific) + properties. Reorganize preprocessor symbol definitions to + leverage commonality between Debug and Release configurations and + remove unneeded definitions. + + * examples/pretty-print.vcxproj + * examples/sdl-viewer.vcxproj + * src/libopenvrml/openvrml.vcxproj + * src/libopenvrml-gl/openvrml-gl.vcxproj + * src/local/libopenvrml-dl/openvrml-dl.vcxproj + * src/node/vrml97/vrml97.vcxproj + * src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj + * src/node/x3d-core/x3d-core.vcxproj + * src/node/x3d-dis/x3d-dis.vcxproj + * src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj + * src/node/x3d-event-utilities/x3d-event-utilities.vcxproj + * src/node/x3d-geometry2d/x3d-geometry2d.vcxproj + * src/node/x3d-geospatial/x3d-geospatial.vcxproj + * src/node/x3d-grouping/x3d-grouping.vcxproj + * src/node/x3d-h-anim/x3d-h-anim.vcxproj + * src/node/x3d-interpolation/x3d-interpolation.vcxproj + * src/node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj + * src/node/x3d-networking/x3d-networking.vcxproj + * src/node/x3d-nurbs/x3d-nurbs.vcxproj + * src/node/x3d-rendering/x3d-rendering.vcxproj + * src/node/x3d-shape/x3d-shape.vcxproj + * src/node/x3d-texturing/x3d-texturing.vcxproj + * src/script/javascript.vcxproj + * tests/parse-vrml97.vcxproj + * tests/parse-x3dvrml.vcxproj + 2012-04-29 Braden McDaniel <br...@en...> * src/script/javascript.cpp Modified: branches/0.18/examples/pretty-print.vcxproj =================================================================== --- branches/0.18/examples/pretty-print.vcxproj 2012-05-01 05:00:36 UTC (rev 4281) +++ branches/0.18/examples/pretty-print.vcxproj 2012-05-01 05:06:12 UTC (rev 4282) @@ -53,7 +53,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -69,7 +69,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;_CONSOLE;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> Modified: branches/0.18/examples/sdl-viewer.vcxproj =================================================================== --- branches/0.18/examples/sdl-viewer.vcxproj 2012-05-01 05:00:36 UTC (rev 4281) +++ branches/0.18/examples/sdl-viewer.vcxproj 2012-05-01 05:06:12 UTC (rev 4282) @@ -42,10 +42,6 @@ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> - <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\SDL-1.2.14\include;$(IncludePath)</IncludePath> - <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\SDL-1.2.14\lib;$(LibraryPath)</LibraryPath> - <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\SDL-1.2.14\include;$(IncludePath)</IncludePath> - <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\SDL-1.2.14\lib;$(LibraryPath)</LibraryPath> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir> @@ -57,7 +53,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\src\libopenvrml-gl;..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>Default</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> @@ -80,7 +76,7 @@ <Optimization>Full</Optimization> <WholeProgramOptimization>true</WholeProgramOptimization> <AdditionalIncludeDirectories>..\src\libopenvrml-gl;..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_SECURE_SCL=0;OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> Modified: branches/0.18/src/libopenvrml/openvrml.vcxproj =================================================================== --- branches/0.18/src/libopenvrml/openvrml.vcxproj 2012-05-01 05:00:36 UTC (rev 4281) +++ branches/0.18/src/libopenvrml/openvrml.vcxproj 2012-05-01 05:06:12 UTC (rev 4282) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -81,7 +81,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>$(SolutionDir)$(Configuration)\lib\$(TargetName).lib</ImportLibrary> + <ImportLibrary>$(SolutionDir)$(Platform)\$(Configuration)\lib\$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -91,7 +91,7 @@ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>.;..\local\libopenvrml-dl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <MultiProcessorCompilation>true</MultiProcessorCompilation> @@ -111,7 +111,7 @@ <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>$(SolutionDir)$(Configuration)\lib\$(TargetName).lib</ImportLibrary> + <ImportLibrary>$(SolutionDir)$(Platform)\$(Configuration)\lib\$(TargetName).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> </Link> </ItemDefinitionGroup> @@ -187,4 +187,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project> \ No newline at end of file Modified: branches/0.18/src/libopenvrml-gl/openvrml-gl.vcxproj =================================================================== --- branches/0.18/src/libopenvrml-gl/openvrml-gl.vcxproj 2012-05-01 05:00:36 UTC (rev 4281) +++ branches/0.18/src/libopenvrml-gl/openvrml-gl.vcxproj 2012-05-01 05:06:12 UTC (rev 4282) @@ -56,7 +56,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.;..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>OPENVRML_USE_DLL;OPENVRML_GL_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_GL_BUILD_DLL;OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>Default</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> @@ -81,7 +81,7 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>.;..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_SECURE_SCL=0;OPENVRML_GL_BUILD_DLL;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_GL_BUILD_DLL;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -89,6 +89,7 @@ <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <AdditionalDependencies>GlU32.lib;OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies> Modified: branches/0.18/src/local/libopenvrml-dl/openvrml-dl.vcxproj =================================================================== --- branches/0.18/src/local/libopenvrml-dl/openvrml-dl.vcxproj 2012-05-01 05:00:36 UTC (rev 4281) +++ branches/0.18/src/local/libopenvrml-dl/openvrml-dl.vcxproj 2012-05-01 05:06:12 UTC (rev 4282) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -70,7 +70,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -82,7 +82,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_SECURE_SCL=0;NDEBUG;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -104,4 +104,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project> \ No newline at end of file Modified: branches/0.18/src/node/vrml97/vrml97.vcxproj =================================================================== --- branches/0.18/src/node/vrml97/vrml97.vcxproj 2012-05-01 05:00:36 UTC (rev 4281) +++ branches/0.18/src/node/vrml97/vrml97.vcxproj 2012-05-01 05:06:12 UTC (rev 4282) @@ -47,29 +47,25 @@ <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\bin\node\</OutDir> <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary> - <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\zlib-1.2.4;C:\Users\braden\Documents\Visual Studio 2010\Projects\libpng-1.4.3;C:\Users\braden\Documents\Visual Studio 2010\Projects\freetype-2.4.0\include;$(IncludePath)</IncludePath> - <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\zlib-1.2.4;C:\Users\braden\Documents\Visual Studio 2010\Projects\libpng-1.4.3;C:\Users\braden\Documents\Visual Studio 2010\Projects\freetype-2.4.0\include;$(IncludePath)</IncludePath> - <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\libpng-1.4.3\projects\vstudio\Debug Library;C:\Users\braden\Documents\Visual Studio 2010\Projects\freetype-2.4.0\objs\win32\vc2008;$(LibraryPath)</LibraryPath> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\node</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\node</OutDir> - <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\libpng-1.4.3\projects\vstudio\Release Library;C:\Users\braden\Documents\Visual Studio 2010\Projects\freetype-2.4.0\objs\win32\vc2008;$(LibraryPath)</LibraryPath> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_USE_DLL;OPENVRML_FT_CONST=const;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_USE_DLL;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> - <AdditionalDependencies>libpng14.lib;zlib.lib;freetype240_D.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libpng15.lib;zlib.lib;freetype249_D.lib;%(AdditionalDependencies)</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> </Link> </ItemDefinitionGroup> @@ -78,14 +74,14 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_USE_DLL;OPENVRML_FT_CONST=const;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_USE_DLL;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> - <AdditionalDependencies>libpng14.lib;zlib.lib;freetype240.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libpng15.lib;zlib.lib;freetype249.lib;%(AdditionalDependencies)</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> </Link> </ItemDefinitionGroup> Modified: branches/0.18/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj =================================================================== --- branches/0.18/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj 2012-05-01 05:00:36 UTC (rev 4281) +++ branches/0.18/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj 2012-05-01 05:06:12 UTC (rev 4282) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -73,7 +73,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> Modified: branches/0.18/src/node/x3d-core/x3d-core.vcxproj =================================================================== --- branches/0.18/src/node/x3d-core/x3d-core.vcxproj 2012-05-01 05:00:36 UTC (rev 4281) +++ branches/0.18/src/node/x3d-core/x3d-core.vcxproj 2012-05-01 05:06:12 UTC (rev 4282) @@ -59,7 +59,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <MultiProcessorCompilation>true</MultiProcessorCompilation> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -74,7 +74,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> Modified: branches/0.18/src/node/x3d-dis/x3d-dis.vcxproj =================================================================== --- branches/0.18/src/node/x3d-dis/x3d-dis.vcxproj 2012-05-01 05:00:36 UTC (rev 4281) +++ branches/0.18/src/node/x3d-dis/x3d-dis.vcxproj 2012-05-01 05:06:12 UTC (rev 4282) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -73,7 +73,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> Modified: branches/0.18/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj =================================================================== --- branches/0.18/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj 2012-05-01 05:00:36 UTC (rev 4281) +++ branches/0.18/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj 2012-05-01 05:06:12 UTC (rev 4282) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -73,7 +73,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> Modified: branches/0.18/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj =================================================================== --- branches/0.18/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj 2012-05-01 05:00:36 UTC (rev 4281) +++ branches/0.18/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj 2012-05-01 05:06:12 UTC (rev 4282) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -73,7 +73,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> Modified: branches/0.18/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj =================================================================== --- branches/0.18/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj 2012-05-01 05:00:36 UTC (rev 4281) +++ branches/0.18/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj 2012-05-01 05:06:12 UTC (rev 4282) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -73,7 +73,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> Modified: branches/0.18/src/node/x3d-geospatial/x3d-geospatial.vcxproj =================================================================== --- branches/0.18/src/node/x3d-geospatial/x3d-geospatial.vcxproj 2012-05-01 05:00:36 UTC (rev 4281) +++ branches/0.18/src/node/x3d-geospatial/x3d-geospatial.vcxproj 2012-05-01 05:06:12 UTC (rev 4282) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -73,7 +73,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> Modified: branches/0.18/src/node/x3d-grouping/x3d-grouping.vcxproj =================================================================== --- branches/0.18/src/node/x3d-grouping/x3d-grouping.vcxproj 2012-05-01 05:00:36 UTC (rev 4281) +++ branches/0.18/src/node/x3d-grouping/x3d-grouping.vcxproj 2012-05-01 05:06:12 UTC (rev 4282) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -73,7 +73,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> Modified: branches/0.18/src/node/x3d-h-anim/x3d-h-anim.vcxproj =================================================================== --- branches/0.18/src/node/x3d-h-anim/x3d-h-anim.vcxproj 2012-05-01 05:00:36 UTC (rev 4281) +++ branches/0.18/src/node/x3d-h-anim/x3d-h-anim.vcxproj 2012-05-01 05:06:12 UTC (rev 4282) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -73,7 +73,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> Modified: branches/0.18/src/node/x3d-interpolation/x3d-interpolation.vcxproj =================================================================== --- branches/0.18/src/node/x3d-interpolation/x3d-interpolation.vcxproj 2012-05-01 05:00:36 UTC (rev 4281) +++ branches/0.18/src/node/x3d-interpolation/x3d-interpolation.vcxproj 2012-05-01 05:06:12 UTC (rev 4282) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -73,7 +73,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> Modified: branches/0.18/src/node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj =================================================================== --- branches/0.18/src/node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj 2012-05-01 05:00:36 UTC (rev 4281) +++ branches/0.18/src/node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj 2012-05-01 05:06:12 UTC (rev 4282) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -72,7 +72,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> Modified: branches/0.18/src/node/x3d-networking/x3d-networking.vcxproj =================================================================== --- branches/0.18/src/node/x3d-networking/x3d-networking.vcxproj 2012-05-01 05:00:36 UTC (rev 4281) +++ branches/0.18/src/node/x3d-networking/x3d-networking.vcxproj 2012-05-01 05:06:12 UTC (rev 4282) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -75,7 +75,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <PrecompiledHeader> Modified: branches/0.18/src/node/x3d-nurbs/x3d-nurbs.vcxproj =================================================================== --- branches/0.18/src/node/x3d-nurbs/x3d-nurbs.vcxproj 2012-05-01 05:00:36 UTC (rev 4281) +++ branches/0.18/src/node/x3d-nurbs/x3d-nurbs.vcxproj 2012-05-01 05:06:12 UTC (rev 4282) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -75,7 +75,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <PrecompiledHeader> Modified: branches/0.18/src/node/x3d-rendering/x3d-rendering.vcxproj =================================================================== --- branches/0.18/src/node/x3d-rendering/x3d-rendering.vcxproj 2012-05-01 05:00:36 UTC (rev 4281) +++ branches/0.18/src/node/x3d-rendering/x3d-rendering.vcxproj 2012-05-01 05:06:12 UTC (rev 4282) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -75,7 +75,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <PrecompiledHeader> Modified: branches/0.18/src/node/x3d-shape/x3d-shape.vcxproj =================================================================== --- branches/0.18/src/node/x3d-shape/x3d-shape.vcxproj 2012-05-01 05:00:36 UTC (rev 4281) +++ branches/0.18/src/node/x3d-shape/x3d-shape.vcxproj 2012-05-01 05:06:12 UTC (rev 4282) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -75,7 +75,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <PrecompiledHeader> Modified: branches/0.18/src/node/x3d-texturing/x3d-texturing.vcxproj =================================================================== --- branches/0.18/src/node/x3d-texturing/x3d-texturing.vcxproj 2012-05-01 05:00:36 UTC (rev 4281) +++ branches/0.18/src/node/x3d-texturing/x3d-texturing.vcxproj 2012-05-01 05:06:12 UTC (rev 4282) @@ -59,7 +59,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -76,7 +76,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <PrecompiledHeader> @@ -86,7 +86,6 @@ <DisableSpecificWarnings>4226;4250;4251;4275;4290;4355;4661;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> - <OutputFile>$(OutDir)bin\node\$(ProjectName).dll</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation> </Link> </ItemDefinitionGroup> Modified: branches/0.18/src/script/javascript.vcxproj =================================================================== --- branches/0.18/src/script/javascript.vcxproj 2012-05-01 05:00:36 UTC (rev 4281) +++ branches/0.18/src/script/javascript.vcxproj 2012-05-01 05:06:12 UTC (rev 4282) @@ -47,29 +47,27 @@ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\bin\script\</OutDir> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> - <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\xulrunner-sdk\include;$(IncludePath)</IncludePath> - <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\xulrunner-sdk\lib;$(LibraryPath)</LibraryPath> - <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\xulrunner-sdk\include;$(IncludePath)</IncludePath> - <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\xulrunner-sdk\lib;$(LibraryPath)</LibraryPath> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\script\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\script\</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir> + <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary> + <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_SCL_SECURE_NO_WARNINGS;OPENVRML_USE_DLL;XP_WIN;JS_THREADSAFE;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_JAVASCRIPT_API=__declspec(dllexport);OPENVRML_JAVASCRIPT_LOCAL=;OPENVRML_JSVAL_TO_DOUBLE_RETURNS_POINTER=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>XP_WIN;JS_THREADSAFE;_SCL_SECURE_NO_WARNINGS;OPENVRML_USE_DLL;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_JAVASCRIPT_API=__declspec(dllexport);OPENVRML_JAVASCRIPT_LOCAL=;OPENVRML_JS_HAS_TYPED_ROOT_FUNCTIONS=1;OPENVRML_JSPROPERTYOP_USES_JSID=1;OPENVRML_FAST_JSNATIVE=1;OPENVRML_JS_HAS_STRICTPROPERTYOP=1;OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO=1;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> - <AdditionalDependencies>js3250.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>mozjs.lib;%(AdditionalDependencies)</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> </Link> @@ -79,18 +77,18 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;OPENVRML_USE_DLL;XP_WIN;JS_THREADSAFE;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_JAVASCRIPT_API=__declspec(dllexport);OPENVRML_JAVASCRIPT_LOCAL=;OPENVRML_JSVAL_TO_DOUBLE_RETURNS_POINTER=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>XP_WIN;JS_THREADSAFE;_SCL_SECURE_NO_WARNINGS;OPENVRML_USE_DLL;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_JAVASCRIPT_API=__declspec(dllexport);OPENVRML_JAVASCRIPT_LOCAL=;OPENVRML_JS_HAS_TYPED_ROOT_FUNCTIONS=1;OPENVRML_JSPROPERTYOP_USES_JSID=1;OPENVRML_FAST_JSNATIVE=1;OPENVRML_JS_HAS_STRICTPROPERTYOP=1;OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO=1;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> - <AdditionalDependencies>js3250.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>mozjs.lib;%(AdditionalDependencies)</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> + <SubSystem>Windows</SubSystem> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: branches/0.18/tests/parse-vrml97.vcxproj =================================================================== --- branches/0.18/tests/parse-vrml97.vcxproj 2012-05-01 05:00:36 UTC (rev 4281) +++ branches/0.18/tests/parse-vrml97.vcxproj 2012-05-01 05:06:12 UTC (rev 4282) @@ -55,7 +55,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -72,7 +72,7 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;_CONSOLE;BOOST_SPIRIT_THREADSAFE;BOOST_SPIRIT_CLOSURE_LIMIT=6;PHOENIX_LIMIT=6;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> Modified: branches/0.18/tests/parse-x3dvrml.vcxproj =================================================================== --- branches/0.18/tests/parse-x3dvrml.vcxproj 2012-05-01 05:00:36 UTC (rev 4281) +++ branches/0.18/tests/parse-x3dvrml.vcxproj 2012-05-01 05:06:12 UTC (rev 4282) @@ -55,7 +55,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -72,7 +72,7 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;_CONSOLE;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-05-01 05:00:42
|
Revision: 4281 http://openvrml.svn.sourceforge.net/openvrml/?rev=4281&view=rev Author: braden Date: 2012-05-01 05:00:36 +0000 (Tue, 01 May 2012) Log Message: ----------- Project file clean-up. Remove references to site-specific library directories; these should be set in user (site-specific) properties. Reorganize preprocessor symbol definitions to leverage commonality between Debug and Release configurations and remove unneeded definitions. Modified Paths: -------------- trunk/ChangeLog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2012-05-01 04:59:34 UTC (rev 4280) +++ trunk/ChangeLog 2012-05-01 05:00:36 UTC (rev 4281) @@ -1,3 +1,37 @@ +2012-05-01 Braden McDaniel <br...@en...> + + Project file clean-up. Remove references to site-specific library + directories; these should be set in user (site-specific) + properties. Reorganize preprocessor symbol definitions to + leverage commonality between Debug and Release configurations and + remove unneeded definitions. + + * examples/pretty-print.vcxproj + * examples/sdl-viewer.vcxproj + * src/libopenvrml/openvrml.vcxproj + * src/libopenvrml-gl/openvrml-gl.vcxproj + * src/local/libopenvrml-dl/openvrml-dl.vcxproj + * src/node/vrml97/vrml97.vcxproj + * src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj + * src/node/x3d-core/x3d-core.vcxproj + * src/node/x3d-dis/x3d-dis.vcxproj + * src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj + * src/node/x3d-event-utilities/x3d-event-utilities.vcxproj + * src/node/x3d-geometry2d/x3d-geometry2d.vcxproj + * src/node/x3d-geospatial/x3d-geospatial.vcxproj + * src/node/x3d-grouping/x3d-grouping.vcxproj + * src/node/x3d-h-anim/x3d-h-anim.vcxproj + * src/node/x3d-interpolation/x3d-interpolation.vcxproj + * src/node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj + * src/node/x3d-networking/x3d-networking.vcxproj + * src/node/x3d-nurbs/x3d-nurbs.vcxproj + * src/node/x3d-rendering/x3d-rendering.vcxproj + * src/node/x3d-shape/x3d-shape.vcxproj + * src/node/x3d-texturing/x3d-texturing.vcxproj + * src/script/javascript.vcxproj + * tests/parse-vrml97.vcxproj + * tests/parse-x3dvrml.vcxproj + 2012-04-29 Braden McDaniel <br...@en...> * src/script/javascript.cpp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-05-01 04:59:42
|
Revision: 4280 http://openvrml.svn.sourceforge.net/openvrml/?rev=4280&view=rev Author: braden Date: 2012-05-01 04:59:34 +0000 (Tue, 01 May 2012) Log Message: ----------- Project file clean-up. Remove references to site-specific library directories; these should be set in user (site-specific) properties. Reorganize preprocessor symbol definitions to leverage commonality between Debug and Release configurations and remove unneeded definitions. Modified Paths: -------------- trunk/examples/pretty-print.vcxproj trunk/examples/sdl-viewer.vcxproj trunk/src/libopenvrml/openvrml.vcxproj trunk/src/libopenvrml-gl/openvrml-gl.vcxproj trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj trunk/src/node/vrml97/vrml97.vcxproj trunk/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj trunk/src/node/x3d-core/x3d-core.vcxproj trunk/src/node/x3d-dis/x3d-dis.vcxproj trunk/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj trunk/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj trunk/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj trunk/src/node/x3d-geospatial/x3d-geospatial.vcxproj trunk/src/node/x3d-grouping/x3d-grouping.vcxproj trunk/src/node/x3d-h-anim/x3d-h-anim.vcxproj trunk/src/node/x3d-interpolation/x3d-interpolation.vcxproj trunk/src/node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj trunk/src/node/x3d-networking/x3d-networking.vcxproj trunk/src/node/x3d-nurbs/x3d-nurbs.vcxproj trunk/src/node/x3d-rendering/x3d-rendering.vcxproj trunk/src/node/x3d-shape/x3d-shape.vcxproj trunk/src/node/x3d-texturing/x3d-texturing.vcxproj trunk/src/script/javascript.vcxproj trunk/tests/parse-vrml97.vcxproj trunk/tests/parse-x3dvrml.vcxproj Modified: trunk/examples/pretty-print.vcxproj =================================================================== --- trunk/examples/pretty-print.vcxproj 2012-04-29 20:09:10 UTC (rev 4279) +++ trunk/examples/pretty-print.vcxproj 2012-05-01 04:59:34 UTC (rev 4280) @@ -53,7 +53,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -69,7 +69,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;_CONSOLE;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> Modified: trunk/examples/sdl-viewer.vcxproj =================================================================== --- trunk/examples/sdl-viewer.vcxproj 2012-04-29 20:09:10 UTC (rev 4279) +++ trunk/examples/sdl-viewer.vcxproj 2012-05-01 04:59:34 UTC (rev 4280) @@ -42,10 +42,6 @@ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> - <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\SDL-1.2.14\include;$(IncludePath)</IncludePath> - <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\SDL-1.2.14\lib;$(LibraryPath)</LibraryPath> - <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\SDL-1.2.14\include;$(IncludePath)</IncludePath> - <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\SDL-1.2.14\lib;$(LibraryPath)</LibraryPath> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir> @@ -57,7 +53,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\src\libopenvrml-gl;..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>Default</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> @@ -80,7 +76,7 @@ <Optimization>Full</Optimization> <WholeProgramOptimization>true</WholeProgramOptimization> <AdditionalIncludeDirectories>..\src\libopenvrml-gl;..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_SECURE_SCL=0;OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> Modified: trunk/src/libopenvrml/openvrml.vcxproj =================================================================== --- trunk/src/libopenvrml/openvrml.vcxproj 2012-04-29 20:09:10 UTC (rev 4279) +++ trunk/src/libopenvrml/openvrml.vcxproj 2012-05-01 04:59:34 UTC (rev 4280) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -81,7 +81,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>$(SolutionDir)$(Configuration)\lib\$(TargetName).lib</ImportLibrary> + <ImportLibrary>$(SolutionDir)$(Platform)\$(Configuration)\lib\$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -91,7 +91,7 @@ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>.;..\local\libopenvrml-dl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <MultiProcessorCompilation>true</MultiProcessorCompilation> @@ -111,7 +111,7 @@ <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>$(SolutionDir)$(Configuration)\lib\$(TargetName).lib</ImportLibrary> + <ImportLibrary>$(SolutionDir)$(Platform)\$(Configuration)\lib\$(TargetName).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> </Link> </ItemDefinitionGroup> @@ -187,4 +187,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project> \ No newline at end of file Modified: trunk/src/libopenvrml-gl/openvrml-gl.vcxproj =================================================================== --- trunk/src/libopenvrml-gl/openvrml-gl.vcxproj 2012-04-29 20:09:10 UTC (rev 4279) +++ trunk/src/libopenvrml-gl/openvrml-gl.vcxproj 2012-05-01 04:59:34 UTC (rev 4280) @@ -56,7 +56,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.;..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>OPENVRML_USE_DLL;OPENVRML_GL_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_GL_BUILD_DLL;OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>Default</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> @@ -81,7 +81,7 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>.;..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_SECURE_SCL=0;OPENVRML_GL_BUILD_DLL;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_GL_BUILD_DLL;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -89,6 +89,7 @@ <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> <RuntimeTypeInfo>true</RuntimeTypeInfo> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <AdditionalDependencies>GlU32.lib;OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies> Modified: trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj =================================================================== --- trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj 2012-04-29 20:09:10 UTC (rev 4279) +++ trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj 2012-05-01 04:59:34 UTC (rev 4280) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -70,7 +70,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -82,7 +82,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_SECURE_SCL=0;NDEBUG;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> @@ -104,4 +104,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project> \ No newline at end of file Modified: trunk/src/node/vrml97/vrml97.vcxproj =================================================================== --- trunk/src/node/vrml97/vrml97.vcxproj 2012-04-29 20:09:10 UTC (rev 4279) +++ trunk/src/node/vrml97/vrml97.vcxproj 2012-05-01 04:59:34 UTC (rev 4280) @@ -47,29 +47,25 @@ <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\bin\node\</OutDir> <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary> - <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\zlib-1.2.4;C:\Users\braden\Documents\Visual Studio 2010\Projects\libpng-1.4.3;C:\Users\braden\Documents\Visual Studio 2010\Projects\freetype-2.4.0\include;$(IncludePath)</IncludePath> - <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\zlib-1.2.4;C:\Users\braden\Documents\Visual Studio 2010\Projects\libpng-1.4.3;C:\Users\braden\Documents\Visual Studio 2010\Projects\freetype-2.4.0\include;$(IncludePath)</IncludePath> - <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\libpng-1.4.3\projects\vstudio\Debug Library;C:\Users\braden\Documents\Visual Studio 2010\Projects\freetype-2.4.0\objs\win32\vc2008;$(LibraryPath)</LibraryPath> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\node</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\node</OutDir> - <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\libpng-1.4.3\projects\vstudio\Release Library;C:\Users\braden\Documents\Visual Studio 2010\Projects\freetype-2.4.0\objs\win32\vc2008;$(LibraryPath)</LibraryPath> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_USE_DLL;OPENVRML_FT_CONST=const;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_USE_DLL;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> - <AdditionalDependencies>libpng14.lib;zlib.lib;freetype240_D.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libpng15.lib;zlib.lib;freetype249_D.lib;%(AdditionalDependencies)</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> </Link> </ItemDefinitionGroup> @@ -78,14 +74,14 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_USE_DLL;OPENVRML_FT_CONST=const;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_USE_DLL;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> - <AdditionalDependencies>libpng14.lib;zlib.lib;freetype240.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libpng15.lib;zlib.lib;freetype249.lib;%(AdditionalDependencies)</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> </Link> </ItemDefinitionGroup> Modified: trunk/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj =================================================================== --- trunk/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj 2012-04-29 20:09:10 UTC (rev 4279) +++ trunk/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj 2012-05-01 04:59:34 UTC (rev 4280) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -73,7 +73,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> Modified: trunk/src/node/x3d-core/x3d-core.vcxproj =================================================================== --- trunk/src/node/x3d-core/x3d-core.vcxproj 2012-04-29 20:09:10 UTC (rev 4279) +++ trunk/src/node/x3d-core/x3d-core.vcxproj 2012-05-01 04:59:34 UTC (rev 4280) @@ -59,7 +59,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <MultiProcessorCompilation>true</MultiProcessorCompilation> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -74,7 +74,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> Modified: trunk/src/node/x3d-dis/x3d-dis.vcxproj =================================================================== --- trunk/src/node/x3d-dis/x3d-dis.vcxproj 2012-04-29 20:09:10 UTC (rev 4279) +++ trunk/src/node/x3d-dis/x3d-dis.vcxproj 2012-05-01 04:59:34 UTC (rev 4280) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -73,7 +73,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> Modified: trunk/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj =================================================================== --- trunk/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj 2012-04-29 20:09:10 UTC (rev 4279) +++ trunk/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj 2012-05-01 04:59:34 UTC (rev 4280) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -73,7 +73,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> Modified: trunk/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj =================================================================== --- trunk/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj 2012-04-29 20:09:10 UTC (rev 4279) +++ trunk/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj 2012-05-01 04:59:34 UTC (rev 4280) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -73,7 +73,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> Modified: trunk/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj =================================================================== --- trunk/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj 2012-04-29 20:09:10 UTC (rev 4279) +++ trunk/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj 2012-05-01 04:59:34 UTC (rev 4280) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -73,7 +73,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> Modified: trunk/src/node/x3d-geospatial/x3d-geospatial.vcxproj =================================================================== --- trunk/src/node/x3d-geospatial/x3d-geospatial.vcxproj 2012-04-29 20:09:10 UTC (rev 4279) +++ trunk/src/node/x3d-geospatial/x3d-geospatial.vcxproj 2012-05-01 04:59:34 UTC (rev 4280) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -73,7 +73,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> Modified: trunk/src/node/x3d-grouping/x3d-grouping.vcxproj =================================================================== --- trunk/src/node/x3d-grouping/x3d-grouping.vcxproj 2012-04-29 20:09:10 UTC (rev 4279) +++ trunk/src/node/x3d-grouping/x3d-grouping.vcxproj 2012-05-01 04:59:34 UTC (rev 4280) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -73,7 +73,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> Modified: trunk/src/node/x3d-h-anim/x3d-h-anim.vcxproj =================================================================== --- trunk/src/node/x3d-h-anim/x3d-h-anim.vcxproj 2012-04-29 20:09:10 UTC (rev 4279) +++ trunk/src/node/x3d-h-anim/x3d-h-anim.vcxproj 2012-05-01 04:59:34 UTC (rev 4280) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -73,7 +73,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> Modified: trunk/src/node/x3d-interpolation/x3d-interpolation.vcxproj =================================================================== --- trunk/src/node/x3d-interpolation/x3d-interpolation.vcxproj 2012-04-29 20:09:10 UTC (rev 4279) +++ trunk/src/node/x3d-interpolation/x3d-interpolation.vcxproj 2012-05-01 04:59:34 UTC (rev 4280) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -73,7 +73,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> Modified: trunk/src/node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj =================================================================== --- trunk/src/node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj 2012-04-29 20:09:10 UTC (rev 4279) +++ trunk/src/node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj 2012-05-01 04:59:34 UTC (rev 4280) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -72,7 +72,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> Modified: trunk/src/node/x3d-networking/x3d-networking.vcxproj =================================================================== --- trunk/src/node/x3d-networking/x3d-networking.vcxproj 2012-04-29 20:09:10 UTC (rev 4279) +++ trunk/src/node/x3d-networking/x3d-networking.vcxproj 2012-05-01 04:59:34 UTC (rev 4280) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -75,7 +75,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <PrecompiledHeader> Modified: trunk/src/node/x3d-nurbs/x3d-nurbs.vcxproj =================================================================== --- trunk/src/node/x3d-nurbs/x3d-nurbs.vcxproj 2012-04-29 20:09:10 UTC (rev 4279) +++ trunk/src/node/x3d-nurbs/x3d-nurbs.vcxproj 2012-05-01 04:59:34 UTC (rev 4280) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -75,7 +75,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <PrecompiledHeader> Modified: trunk/src/node/x3d-rendering/x3d-rendering.vcxproj =================================================================== --- trunk/src/node/x3d-rendering/x3d-rendering.vcxproj 2012-04-29 20:09:10 UTC (rev 4279) +++ trunk/src/node/x3d-rendering/x3d-rendering.vcxproj 2012-05-01 04:59:34 UTC (rev 4280) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -75,7 +75,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <PrecompiledHeader> Modified: trunk/src/node/x3d-shape/x3d-shape.vcxproj =================================================================== --- trunk/src/node/x3d-shape/x3d-shape.vcxproj 2012-04-29 20:09:10 UTC (rev 4279) +++ trunk/src/node/x3d-shape/x3d-shape.vcxproj 2012-05-01 04:59:34 UTC (rev 4280) @@ -58,7 +58,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -75,7 +75,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <PrecompiledHeader> Modified: trunk/src/node/x3d-texturing/x3d-texturing.vcxproj =================================================================== --- trunk/src/node/x3d-texturing/x3d-texturing.vcxproj 2012-04-29 20:09:10 UTC (rev 4279) +++ trunk/src/node/x3d-texturing/x3d-texturing.vcxproj 2012-05-01 04:59:34 UTC (rev 4280) @@ -59,7 +59,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -76,7 +76,7 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <PrecompiledHeader> @@ -86,7 +86,6 @@ <DisableSpecificWarnings>4226;4250;4251;4275;4290;4355;4661;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> - <OutputFile>$(OutDir)bin\node\$(ProjectName).dll</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation> </Link> </ItemDefinitionGroup> Modified: trunk/src/script/javascript.vcxproj =================================================================== --- trunk/src/script/javascript.vcxproj 2012-04-29 20:09:10 UTC (rev 4279) +++ trunk/src/script/javascript.vcxproj 2012-05-01 04:59:34 UTC (rev 4280) @@ -47,29 +47,27 @@ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\bin\script\</OutDir> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> - <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\xulrunner-sdk\include;$(IncludePath)</IncludePath> - <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\xulrunner-sdk\lib;$(LibraryPath)</LibraryPath> - <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\xulrunner-sdk\include;$(IncludePath)</IncludePath> - <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\xulrunner-sdk\lib;$(LibraryPath)</LibraryPath> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\script\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\script\</OutDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir> + <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary> + <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_SCL_SECURE_NO_WARNINGS;OPENVRML_USE_DLL;XP_WIN;JS_THREADSAFE;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_JAVASCRIPT_API=__declspec(dllexport);OPENVRML_JAVASCRIPT_LOCAL=;OPENVRML_JSVAL_TO_DOUBLE_RETURNS_POINTER=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>XP_WIN;JS_THREADSAFE;_SCL_SECURE_NO_WARNINGS;OPENVRML_USE_DLL;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_JAVASCRIPT_API=__declspec(dllexport);OPENVRML_JAVASCRIPT_LOCAL=;OPENVRML_JS_HAS_TYPED_ROOT_FUNCTIONS=1;OPENVRML_JSPROPERTYOP_USES_JSID=1;OPENVRML_FAST_JSNATIVE=1;OPENVRML_JS_HAS_STRICTPROPERTYOP=1;OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO=1;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> - <AdditionalDependencies>js3250.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>mozjs.lib;%(AdditionalDependencies)</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> </Link> @@ -79,18 +77,18 @@ <Optimization>MaxSpeed</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;OPENVRML_USE_DLL;XP_WIN;JS_THREADSAFE;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_JAVASCRIPT_API=__declspec(dllexport);OPENVRML_JAVASCRIPT_LOCAL=;OPENVRML_JSVAL_TO_DOUBLE_RETURNS_POINTER=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>XP_WIN;JS_THREADSAFE;_SCL_SECURE_NO_WARNINGS;OPENVRML_USE_DLL;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_JAVASCRIPT_API=__declspec(dllexport);OPENVRML_JAVASCRIPT_LOCAL=;OPENVRML_JS_HAS_TYPED_ROOT_FUNCTIONS=1;OPENVRML_JSPROPERTYOP_USES_JSID=1;OPENVRML_FAST_JSNATIVE=1;OPENVRML_JS_HAS_STRICTPROPERTYOP=1;OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO=1;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> - <AdditionalDependencies>js3250.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>mozjs.lib;%(AdditionalDependencies)</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> + <SubSystem>Windows</SubSystem> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/tests/parse-vrml97.vcxproj =================================================================== --- trunk/tests/parse-vrml97.vcxproj 2012-04-29 20:09:10 UTC (rev 4279) +++ trunk/tests/parse-vrml97.vcxproj 2012-05-01 04:59:34 UTC (rev 4280) @@ -55,7 +55,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -72,7 +72,7 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;_CONSOLE;BOOST_SPIRIT_THREADSAFE;BOOST_SPIRIT_CLOSURE_LIMIT=6;PHOENIX_LIMIT=6;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> Modified: trunk/tests/parse-x3dvrml.vcxproj =================================================================== --- trunk/tests/parse-x3dvrml.vcxproj 2012-04-29 20:09:10 UTC (rev 4279) +++ trunk/tests/parse-x3dvrml.vcxproj 2012-05-01 04:59:34 UTC (rev 4280) @@ -55,7 +55,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> @@ -72,7 +72,7 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;_CONSOLE;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-04-29 20:09:17
|
Revision: 4279 http://openvrml.svn.sourceforge.net/openvrml/?rev=4279&view=rev Author: braden Date: 2012-04-29 20:09:10 +0000 (Sun, 29 Apr 2012) Log Message: ----------- Make initialization of thread_id_ conditional on NDEBUG. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/script/javascript.cpp Property Changed: ---------------- branches/0.18/ Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274,4276 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274,4276,4278 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2012-04-29 19:23:58 UTC (rev 4278) +++ branches/0.18/ChangeLog 2012-04-29 20:09:10 UTC (rev 4279) @@ -1,5 +1,12 @@ 2012-04-29 Braden McDaniel <br...@en...> + * src/script/javascript.cpp + (script::script(openvrml::script_node &, const + boost::shared_ptr<openvrml::resource_istream> &)): Make + initialization of thread_id_ conditional on NDEBUG. + +2012-04-29 Braden McDaniel <br...@en...> + * src/script/javascript.cpp: As of XULRunner 12.0, JSRuntime should now be used by a single thread. For now, at least, employ a JSRuntime for each Script node. Modified: branches/0.18/src/script/javascript.cpp =================================================================== --- branches/0.18/src/script/javascript.cpp 2012-04-29 19:23:58 UTC (rev 4278) +++ branches/0.18/src/script/javascript.cpp 2012-04-29 20:09:10 UTC (rev 4279) @@ -1035,8 +1035,10 @@ cx(0), sfnode_class(this->direct_output() ? SFNode::direct_output_jsclass - : SFNode::jsclass), - thread_id_(boost::this_thread::get_id()) + : SFNode::jsclass) +# ifndef NDEBUG + ,thread_id_(boost::this_thread::get_id()) +# endif { using std::bad_alloc; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-04-29 19:24:05
|
Revision: 4278 http://openvrml.svn.sourceforge.net/openvrml/?rev=4278&view=rev Author: braden Date: 2012-04-29 19:23:58 +0000 (Sun, 29 Apr 2012) Log Message: ----------- Make initialization of thread_id_ conditional on NDEBUG. Modified Paths: -------------- trunk/ChangeLog trunk/src/script/javascript.cpp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2012-04-29 08:06:42 UTC (rev 4277) +++ trunk/ChangeLog 2012-04-29 19:23:58 UTC (rev 4278) @@ -1,5 +1,12 @@ 2012-04-29 Braden McDaniel <br...@en...> + * src/script/javascript.cpp + (script::script(openvrml::script_node &, const + boost::shared_ptr<openvrml::resource_istream> &)): Make + initialization of thread_id_ conditional on NDEBUG. + +2012-04-29 Braden McDaniel <br...@en...> + * src/script/javascript.cpp: As of XULRunner 12.0, JSRuntime should now be used by a single thread. For now, at least, employ a JSRuntime for each Script node. Modified: trunk/src/script/javascript.cpp =================================================================== --- trunk/src/script/javascript.cpp 2012-04-29 08:06:42 UTC (rev 4277) +++ trunk/src/script/javascript.cpp 2012-04-29 19:23:58 UTC (rev 4278) @@ -1035,8 +1035,10 @@ cx(0), sfnode_class(this->direct_output() ? SFNode::direct_output_jsclass - : SFNode::jsclass), - thread_id_(boost::this_thread::get_id()) + : SFNode::jsclass) +# ifndef NDEBUG + ,thread_id_(boost::this_thread::get_id()) +# endif { using std::bad_alloc; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-04-29 08:06:51
|
Revision: 4277 http://openvrml.svn.sourceforge.net/openvrml/?rev=4277&view=rev Author: braden Date: 2012-04-29 08:06:42 +0000 (Sun, 29 Apr 2012) Log Message: ----------- As of XULRunner 12.0, JSRuntime should now be used by a single thread. For now, at least, employ a JSRuntime for each Script node. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/script/javascript.cpp Property Changed: ---------------- branches/0.18/ Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274,4276 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2012-04-29 08:04:55 UTC (rev 4276) +++ branches/0.18/ChangeLog 2012-04-29 08:06:42 UTC (rev 4277) @@ -1,5 +1,11 @@ 2012-04-29 Braden McDaniel <br...@en...> + * src/script/javascript.cpp: As of XULRunner 12.0, JSRuntime + should now be used by a single thread. For now, at least, employ + a JSRuntime for each Script node. + +2012-04-29 Braden McDaniel <br...@en...> + * src/script/javascript.cpp: Fix copy/paste error. 2012-04-29 Braden McDaniel <br...@en...> Modified: branches/0.18/src/script/javascript.cpp =================================================================== --- branches/0.18/src/script/javascript.cpp 2012-04-29 08:04:55 UTC (rev 4276) +++ branches/0.18/src/script/javascript.cpp 2012-04-29 08:06:42 UTC (rev 4277) @@ -264,13 +264,15 @@ friend OPENVRML_DECLARE_MEMBER_JSNATIVE(Browser, addRoute); friend OPENVRML_DECLARE_MEMBER_JSNATIVE(Browser, deleteRoute); - static JSRuntime * rt; - static size_t nInstances; + JSRuntime * rt; double d_timeStamp; JSContext * cx; JSClass & sfnode_class; +# ifndef NDEBUG + boost::thread::id thread_id_; +# endif public: script(openvrml::script_node & node, @@ -1014,9 +1016,6 @@ VrmlMatrix(); }; - JSRuntime * script::rt = 0; // Javascript runtime singleton object - size_t script::nInstances = 0; // Number of distinct script objects - OPENVRML_JAVASCRIPT_LOCAL OPENVRML_DECLARE_JSSTRICTPROPERTYOP(eventOut_setProperty); @@ -1030,28 +1029,28 @@ script:: script(openvrml::script_node & node, const boost::shared_ptr<openvrml::resource_istream> & source) - OPENVRML_THROW1(std::bad_alloc): - openvrml::script(node), + OPENVRML_THROW1(std::bad_alloc): + openvrml::script(node), + rt(0), cx(0), sfnode_class(this->direct_output() ? SFNode::direct_output_jsclass - : SFNode::jsclass) + : SFNode::jsclass), + thread_id_(boost::this_thread::get_id()) { using std::bad_alloc; // // Initialize the runtime. // - if (!rt && !(rt = JS_NewRuntime(MAX_HEAP_BYTES))) { - throw bad_alloc(); - } + this->rt = JS_NewRuntime(MAX_HEAP_BYTES); + if (!this->rt) { throw bad_alloc(); } // // Initialize the context for this script object. // - if (!(this->cx = JS_NewContext(rt, STACK_CHUNK_BYTES))) { - throw bad_alloc(); - } + this->cx = JS_NewContext(rt, STACK_CHUNK_BYTES); + if (!this->cx) { throw bad_alloc(); } // // Store a pointer to this script object in the context. @@ -1131,17 +1130,12 @@ source_str.c_str(), source_str.length(), filename, lineno, &rval); OPENVRML_VERIFY_(ok); - - ++nInstances; } script::~script() { JS_DestroyContext(this->cx); - if (--nInstances == 0) { - JS_DestroyRuntime(rt); - rt = 0; - } + JS_DestroyRuntime(this->rt); } void script::do_initialize(const double timestamp) @@ -1187,14 +1181,8 @@ const openvrml::field_value * const argv[]) { assert(this->cx); + assert(this->thread_id_ == boost::this_thread::get_id()); -# ifdef JS_THREADSAFE - JS_SetContextThread(this->cx); - BOOST_SCOPE_EXIT((cx)) { - JS_ClearContextThread(cx); - } BOOST_SCOPE_EXIT_END -# endif - jsval fval, rval; JSObject * const globalObj = JS_GetGlobalObject(this->cx); assert(globalObj); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-04-29 08:05:02
|
Revision: 4276 http://openvrml.svn.sourceforge.net/openvrml/?rev=4276&view=rev Author: braden Date: 2012-04-29 08:04:55 +0000 (Sun, 29 Apr 2012) Log Message: ----------- As of XULRunner 12.0, JSRuntime should now be used by a single thread. For now, at least, employ a JSRuntime for each Script node. Modified Paths: -------------- trunk/ChangeLog trunk/src/script/javascript.cpp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2012-04-29 07:37:59 UTC (rev 4275) +++ trunk/ChangeLog 2012-04-29 08:04:55 UTC (rev 4276) @@ -1,5 +1,11 @@ 2012-04-29 Braden McDaniel <br...@en...> + * src/script/javascript.cpp: As of XULRunner 12.0, JSRuntime + should now be used by a single thread. For now, at least, employ + a JSRuntime for each Script node. + +2012-04-29 Braden McDaniel <br...@en...> + * src/script/javascript.cpp: Fix copy/paste error. 2012-04-29 Braden McDaniel <br...@en...> Modified: trunk/src/script/javascript.cpp =================================================================== --- trunk/src/script/javascript.cpp 2012-04-29 07:37:59 UTC (rev 4275) +++ trunk/src/script/javascript.cpp 2012-04-29 08:04:55 UTC (rev 4276) @@ -264,13 +264,15 @@ friend OPENVRML_DECLARE_MEMBER_JSNATIVE(Browser, addRoute); friend OPENVRML_DECLARE_MEMBER_JSNATIVE(Browser, deleteRoute); - static JSRuntime * rt; - static size_t nInstances; + JSRuntime * rt; double d_timeStamp; JSContext * cx; JSClass & sfnode_class; +# ifndef NDEBUG + boost::thread::id thread_id_; +# endif public: script(openvrml::script_node & node, @@ -1014,9 +1016,6 @@ VrmlMatrix(); }; - JSRuntime * script::rt = 0; // Javascript runtime singleton object - size_t script::nInstances = 0; // Number of distinct script objects - OPENVRML_JAVASCRIPT_LOCAL OPENVRML_DECLARE_JSSTRICTPROPERTYOP(eventOut_setProperty); @@ -1030,28 +1029,28 @@ script:: script(openvrml::script_node & node, const boost::shared_ptr<openvrml::resource_istream> & source) - OPENVRML_THROW1(std::bad_alloc): - openvrml::script(node), + OPENVRML_THROW1(std::bad_alloc): + openvrml::script(node), + rt(0), cx(0), sfnode_class(this->direct_output() ? SFNode::direct_output_jsclass - : SFNode::jsclass) + : SFNode::jsclass), + thread_id_(boost::this_thread::get_id()) { using std::bad_alloc; // // Initialize the runtime. // - if (!rt && !(rt = JS_NewRuntime(MAX_HEAP_BYTES))) { - throw bad_alloc(); - } + this->rt = JS_NewRuntime(MAX_HEAP_BYTES); + if (!this->rt) { throw bad_alloc(); } // // Initialize the context for this script object. // - if (!(this->cx = JS_NewContext(rt, STACK_CHUNK_BYTES))) { - throw bad_alloc(); - } + this->cx = JS_NewContext(rt, STACK_CHUNK_BYTES); + if (!this->cx) { throw bad_alloc(); } // // Store a pointer to this script object in the context. @@ -1131,17 +1130,12 @@ source_str.c_str(), source_str.length(), filename, lineno, &rval); OPENVRML_VERIFY_(ok); - - ++nInstances; } script::~script() { JS_DestroyContext(this->cx); - if (--nInstances == 0) { - JS_DestroyRuntime(rt); - rt = 0; - } + JS_DestroyRuntime(this->rt); } void script::do_initialize(const double timestamp) @@ -1187,14 +1181,8 @@ const openvrml::field_value * const argv[]) { assert(this->cx); + assert(this->thread_id_ == boost::this_thread::get_id()); -# ifdef JS_THREADSAFE - JS_SetContextThread(this->cx); - BOOST_SCOPE_EXIT((cx)) { - JS_ClearContextThread(cx); - } BOOST_SCOPE_EXIT_END -# endif - jsval fval, rval; JSObject * const globalObj = JS_GetGlobalObject(this->cx); assert(globalObj); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-04-29 07:38:05
|
Revision: 4275 http://openvrml.svn.sourceforge.net/openvrml/?rev=4275&view=rev Author: braden Date: 2012-04-29 07:37:59 +0000 (Sun, 29 Apr 2012) Log Message: ----------- Fix copy/paste error. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/script/javascript.cpp Property Changed: ---------------- branches/0.18/ Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2012-04-29 07:30:59 UTC (rev 4274) +++ branches/0.18/ChangeLog 2012-04-29 07:37:59 UTC (rev 4275) @@ -1,5 +1,9 @@ 2012-04-29 Braden McDaniel <br...@en...> + * src/script/javascript.cpp: Fix copy/paste error. + +2012-04-29 Braden McDaniel <br...@en...> + * src/script/javascript.cpp: Fix OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO conditional to be #ifdef. Modified: branches/0.18/src/script/javascript.cpp =================================================================== --- branches/0.18/src/script/javascript.cpp 2012-04-29 07:30:59 UTC (rev 4274) +++ branches/0.18/src/script/javascript.cpp 2012-04-29 07:37:59 UTC (rev 4275) @@ -136,9 +136,9 @@ { assert(!proto); # ifdef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO - return js_construct_object_with_arguments(cx, clasp, parent, argc, argv); + return JS_ConstructObjectWithArguments(cx, clasp, parent, argc, argv); # else - return js_construct_object_with_arguments(cx, clasp, proto, parent, + return JS_ConstructObjectWithArguments(cx, clasp, proto, parent, argc, argv); # endif } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-04-29 07:31:07
|
Revision: 4274 http://openvrml.svn.sourceforge.net/openvrml/?rev=4274&view=rev Author: braden Date: 2012-04-29 07:30:59 +0000 (Sun, 29 Apr 2012) Log Message: ----------- Fix copy/paste error. Modified Paths: -------------- trunk/ChangeLog trunk/src/script/javascript.cpp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2012-04-29 06:58:35 UTC (rev 4273) +++ trunk/ChangeLog 2012-04-29 07:30:59 UTC (rev 4274) @@ -1,5 +1,9 @@ 2012-04-29 Braden McDaniel <br...@en...> + * src/script/javascript.cpp: Fix copy/paste error. + +2012-04-29 Braden McDaniel <br...@en...> + * src/script/javascript.cpp: Fix OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO conditional to be #ifdef. Modified: trunk/src/script/javascript.cpp =================================================================== --- trunk/src/script/javascript.cpp 2012-04-29 06:58:35 UTC (rev 4273) +++ trunk/src/script/javascript.cpp 2012-04-29 07:30:59 UTC (rev 4274) @@ -136,9 +136,9 @@ { assert(!proto); # ifdef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO - return js_construct_object_with_arguments(cx, clasp, parent, argc, argv); + return JS_ConstructObjectWithArguments(cx, clasp, parent, argc, argv); # else - return js_construct_object_with_arguments(cx, clasp, proto, parent, + return JS_ConstructObjectWithArguments(cx, clasp, proto, parent, argc, argv); # endif } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-04-29 06:58:41
|
Revision: 4273 http://openvrml.svn.sourceforge.net/openvrml/?rev=4273&view=rev Author: braden Date: 2012-04-29 06:58:35 +0000 (Sun, 29 Apr 2012) Log Message: ----------- Fix OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO conditional to be #ifdef. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/script/javascript.cpp Property Changed: ---------------- branches/0.18/ Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2012-04-29 06:55:38 UTC (rev 4272) +++ branches/0.18/ChangeLog 2012-04-29 06:58:35 UTC (rev 4273) @@ -1,3 +1,9 @@ +2012-04-29 Braden McDaniel <br...@en...> + + * src/script/javascript.cpp: Fix + OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO conditional to be + #ifdef. + 2012-04-28 Braden McDaniel <br...@en...> XULRunner 12.0 removes the JSObject* prototype argument from Modified: branches/0.18/src/script/javascript.cpp =================================================================== --- branches/0.18/src/script/javascript.cpp 2012-04-29 06:55:38 UTC (rev 4272) +++ branches/0.18/src/script/javascript.cpp 2012-04-29 06:58:35 UTC (rev 4273) @@ -118,7 +118,7 @@ JSObject * const parent) { assert(!proto); -# ifndef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO +# ifdef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO return JS_ConstructObject(cx, clasp, parent); # else return JS_ConstructObject(cx, clasp, proto, parent); @@ -135,7 +135,7 @@ jsval * const argv) { assert(!proto); -# ifndef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO +# ifdef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO return js_construct_object_with_arguments(cx, clasp, parent, argc, argv); # else return js_construct_object_with_arguments(cx, clasp, proto, parent, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-04-29 06:55:44
|
Revision: 4272 http://openvrml.svn.sourceforge.net/openvrml/?rev=4272&view=rev Author: braden Date: 2012-04-29 06:55:38 +0000 (Sun, 29 Apr 2012) Log Message: ----------- Fix OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO conditional to be #ifdef. Modified Paths: -------------- trunk/ChangeLog trunk/src/script/javascript.cpp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2012-04-29 03:06:39 UTC (rev 4271) +++ trunk/ChangeLog 2012-04-29 06:55:38 UTC (rev 4272) @@ -1,3 +1,9 @@ +2012-04-29 Braden McDaniel <br...@en...> + + * src/script/javascript.cpp: Fix + OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO conditional to be + #ifdef. + 2012-04-28 Braden McDaniel <br...@en...> XULRunner 12.0 removes the JSObject* prototype argument from Modified: trunk/src/script/javascript.cpp =================================================================== --- trunk/src/script/javascript.cpp 2012-04-29 03:06:39 UTC (rev 4271) +++ trunk/src/script/javascript.cpp 2012-04-29 06:55:38 UTC (rev 4272) @@ -118,7 +118,7 @@ JSObject * const parent) { assert(!proto); -# ifndef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO +# ifdef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO return JS_ConstructObject(cx, clasp, parent); # else return JS_ConstructObject(cx, clasp, proto, parent); @@ -135,7 +135,7 @@ jsval * const argv) { assert(!proto); -# ifndef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO +# ifdef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO return js_construct_object_with_arguments(cx, clasp, parent, argc, argv); # else return js_construct_object_with_arguments(cx, clasp, proto, parent, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-04-29 03:06:47
|
Revision: 4271 http://openvrml.svn.sourceforge.net/openvrml/?rev=4271&view=rev Author: braden Date: 2012-04-29 03:06:39 +0000 (Sun, 29 Apr 2012) Log Message: ----------- XULRunner 12.0 removes the JSObject* prototype argument from JS_ConstructObject. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/configure.ac branches/0.18/src/script/javascript.cpp Property Changed: ---------------- branches/0.18/ Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2012-04-29 03:04:50 UTC (rev 4270) +++ branches/0.18/ChangeLog 2012-04-29 03:06:39 UTC (rev 4271) @@ -1,3 +1,11 @@ +2012-04-28 Braden McDaniel <br...@en...> + + XULRunner 12.0 removes the JSObject* prototype argument from + JS_ConstructObject. + + * configure.ac + * src/script/javascript.cpp + 2012-04-27 Braden McDaniel <br...@en...> * doc/Makefile.am (JAVADOC_RESOURCES_FILES): javadoc does not Modified: branches/0.18/configure.ac =================================================================== --- branches/0.18/configure.ac 2012-04-29 03:04:50 UTC (rev 4270) +++ branches/0.18/configure.ac 2012-04-29 03:06:39 UTC (rev 4271) @@ -284,6 +284,26 @@ [Defined if SpiderMonkey has JSStrictPropertyOp])]) # +# XULRunner 12.0 removes the JSObject* prototype argument from +# JS_ConstructObject. +# +AC_CACHE_CHECK([whether JS_ConstructObject is missing the prototype argument], +[ov_cv_js_constructobject_without_proto], +[ov_cv_js_constructobject_without_proto=no +ov_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$JS_CFLAGS $CPPFLAGS" +AC_LANG_ASSERT([C]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM( +[[#include <jsapi.h>]], +[[JS_ConstructObject(0, 0, 0)]])], +[ov_cv_js_constructobject_without_proto=yes]) +CPPFLAGS=$ov_save_CPPFLAGS +]) +AS_IF([test X$ov_cv_js_constructobject_without_proto = Xyes], + [AC_DEFINE([OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO], [1], + [Defined if JS_ConstructObject is missing the prototype argument])]) + +# # openvrml-xembed and openvrml-player both use GOption, which was # introduced in GLib 2.6. # Modified: branches/0.18/src/script/javascript.cpp =================================================================== --- branches/0.18/src/script/javascript.cpp 2012-04-29 03:04:50 UTC (rev 4270) +++ branches/0.18/src/script/javascript.cpp 2012-04-29 03:06:39 UTC (rev 4271) @@ -110,6 +110,40 @@ # endif } + OPENVRML_LOCAL + JSObject * + js_construct_object(JSContext * const cx, + JSClass * const clasp, + JSObject * const proto, + JSObject * const parent) + { + assert(!proto); +# ifndef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO + return JS_ConstructObject(cx, clasp, parent); +# else + return JS_ConstructObject(cx, clasp, proto, parent); +# endif + } + + OPENVRML_LOCAL + JSObject * + js_construct_object_with_arguments(JSContext * const cx, + JSClass * const clasp, + JSObject * const proto, + JSObject * const parent, + const uintN argc, + jsval * const argv) + { + assert(!proto); +# ifndef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO + return js_construct_object_with_arguments(cx, clasp, parent, argc, argv); +# else + return js_construct_object_with_arguments(cx, clasp, proto, parent, + argc, argv); +# endif + } + + # ifdef OPENVRML_FAST_JSNATIVE # define OPENVRML_DECLARE_JSNATIVE(name) \ JSBool (name)(JSContext * cx, uintN argc, jsval * vp) @@ -2640,7 +2674,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const sfcolorObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const sfcolorObj = js_construct_object(cx, &jsclass, 0, obj); if (!sfcolorObj) { return JS_FALSE; } assert(JS_GetPrivate(cx, sfcolorObj)); @@ -3439,7 +3473,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const sfrotationObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const sfrotationObj = js_construct_object(cx, &jsclass, 0, obj); if (!sfrotationObj) { return JS_FALSE; } assert(JS_GetPrivate(cx, sfrotationObj)); @@ -3679,7 +3713,7 @@ &obj_sfdata.field_value()); JSObject * const robj = - JS_ConstructObject(cx, &SFVec3f::jsclass, 0, + js_construct_object(cx, &SFVec3f::jsclass, 0, OPENVRML_JS_THIS_OBJECT(cx, vp)); if (!robj) { return JS_FALSE; } @@ -3709,7 +3743,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFRotation::jsclass, proto, parent); + js_construct_object(cx, &SFRotation::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -3758,7 +3792,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFRotation::jsclass, proto, parent); + js_construct_object(cx, &SFRotation::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -3807,7 +3841,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec3f::jsclass, proto, parent); + js_construct_object(cx, &SFVec3f::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -3899,7 +3933,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFRotation::jsclass, proto, parent); + js_construct_object(cx, &SFRotation::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -3976,7 +4010,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const sfvec2Obj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const sfvec2Obj = js_construct_object(cx, &jsclass, 0, obj); if (!sfvec2Obj) { return JS_FALSE; } assert(JS_GetPrivate(cx, sfvec2Obj)); @@ -4176,7 +4210,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec2::jsclass, proto, parent); + js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -4219,7 +4253,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec2::jsclass, proto, parent); + js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -4320,7 +4354,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec2::jsclass, proto, parent); + js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -4354,7 +4388,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec2::jsclass, proto, parent); + js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -4388,7 +4422,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec2::jsclass, proto, parent); + js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -4442,7 +4476,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec2::jsclass, proto, parent); + js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -4484,7 +4518,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const sfvec2dObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const sfvec2dObj = js_construct_object(cx, &jsclass, 0, obj); if (!sfvec2dObj) { return JS_FALSE; } assert(JS_GetPrivate(cx, sfvec2dObj)); @@ -4583,7 +4617,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const sfvec3fObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const sfvec3fObj = js_construct_object(cx, &jsclass, 0, obj); if (!sfvec3fObj) { return JS_FALSE; } assert(JS_GetPrivate(cx, sfvec3fObj)); @@ -4787,7 +4821,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent); + js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -4841,7 +4875,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent); + js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) {return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -4884,7 +4918,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent); + js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -4985,7 +5019,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent); + js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -5019,7 +5053,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent); + js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -5053,7 +5087,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent); + js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -5107,7 +5141,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent); + js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -5148,7 +5182,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const sfvec3dObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const sfvec3dObj = js_construct_object(cx, &jsclass, 0, obj); if (!sfvec3dObj) { return JS_FALSE; } assert(JS_GetPrivate(cx, sfvec3dObj)); @@ -5416,7 +5450,7 @@ try { for (size_t i = length; i < newArray.size(); ++i) { JSObject * const element = - JS_ConstructObject(cx, &Subclass::sfjsclass, 0, 0); + js_construct_object(cx, &Subclass::sfjsclass, 0, 0); if (!element) { throw std::bad_alloc(); } newArray[i] = OBJECT_TO_JSVAL(element); } @@ -5746,7 +5780,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const mfboolObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const mfboolObj = js_construct_object(cx, &jsclass, 0, obj); if (!mfboolObj) { return JS_FALSE; } jsval length = INT_TO_JSVAL(bools.size()); @@ -5963,7 +5997,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const mfcolorObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const mfcolorObj = js_construct_object(cx, &jsclass, 0, obj); if (!mfcolorObj) { return JS_FALSE; } jsval length = INT_TO_JSVAL(colors.size()); @@ -6014,7 +6048,7 @@ assert(obj); assert(rval); - JSObject * const mffloatObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const mffloatObj = js_construct_object(cx, &jsclass, 0, obj); if (!mffloatObj) { return JS_FALSE; } jsval length = INT_TO_JSVAL(floats.size()); @@ -6089,7 +6123,7 @@ assert(obj); assert(rval); - JSObject * const mfdoubleObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const mfdoubleObj = js_construct_object(cx, &jsclass, 0, obj); if (!mfdoubleObj) { return JS_FALSE; } jsval length = INT_TO_JSVAL(doubles.size()); @@ -6185,7 +6219,7 @@ assert(obj); assert(rval); - JSObject * const mfint32Obj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const mfint32Obj = js_construct_object(cx, &jsclass, 0, obj); if (!mfint32Obj) { return JS_FALSE; } jsval length = INT_TO_JSVAL(int32s.size()); @@ -6450,7 +6484,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const mfnodeObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const mfnodeObj = js_construct_object(cx, &jsclass, 0, obj); if (!mfnodeObj) { return JS_FALSE; } jsval length = INT_TO_JSVAL(nodes.size()); @@ -6610,8 +6644,9 @@ for (size_t i = length; i < newArray.size(); ++i) { JSObject * const element = - JS_ConstructObjectWithArguments(cx, &sfnode_jsclass, 0, 0, - 1, &arg); + js_construct_object_with_arguments(cx, &sfnode_jsclass, + 0, 0, + 1, &arg); if (!element) { throw std::bad_alloc(); } newArray[i] = OBJECT_TO_JSVAL(element); } @@ -6704,7 +6739,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const mfrotationObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const mfrotationObj = js_construct_object(cx, &jsclass, 0, obj); if (!mfrotationObj) { return JS_FALSE; } jsval length = INT_TO_JSVAL(rotations.size()); @@ -6807,7 +6842,7 @@ assert(cx); assert(obj); assert(rval); - JSObject * const mfstringObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const mfstringObj = js_construct_object(cx, &jsclass, 0, obj); if (!mfstringObj) { return JS_FALSE; } jsval length = INT_TO_JSVAL(strings.size()); @@ -7050,7 +7085,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const mftimeObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const mftimeObj = js_construct_object(cx, &jsclass, 0, obj); if (!mftimeObj) { return JS_FALSE; } jsval length = INT_TO_JSVAL(times.size()); @@ -7123,7 +7158,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const mfvec2fObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const mfvec2fObj = js_construct_object(cx, &jsclass, 0, obj); if (!mfvec2fObj) { return JS_FALSE; } jsval length = INT_TO_JSVAL(vec2fs.size()); @@ -7204,7 +7239,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const mfvec2dObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const mfvec2dObj = js_construct_object(cx, &jsclass, 0, obj); if (!mfvec2dObj) { return JS_FALSE; } jsval length = INT_TO_JSVAL(vec2ds.size()); @@ -7285,7 +7320,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const mfvec3fObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const mfvec3fObj = js_construct_object(cx, &jsclass, 0, obj); if (!mfvec3fObj) { return JS_FALSE; } jsval length = INT_TO_JSVAL(vec3fs.size()); @@ -7367,7 +7402,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const mfvec3dObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const mfvec3dObj = js_construct_object(cx, &jsclass, 0, obj); if (!mfvec3dObj) { return JS_FALSE; } jsval length = INT_TO_JSVAL(vec3ds.size()); @@ -7624,7 +7659,7 @@ // // Construct the result object. // - JSObject * const robj = JS_ConstructObject(cx, &Row::jsclass, 0, + JSObject * const robj = js_construct_object(cx, &Row::jsclass, 0, JS_GetParent(cx, obj)); if (!robj) { return JS_FALSE; } @@ -7809,7 +7844,7 @@ using openvrml::mat4f; JSObject * const robj = - JS_ConstructObject(cx, &VrmlMatrix::jsclass, 0, + js_construct_object(cx, &VrmlMatrix::jsclass, 0, JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); if (!robj) { return JS_FALSE; } @@ -7831,7 +7866,7 @@ using openvrml::mat4f; JSObject * const robj = - JS_ConstructObject(cx, &VrmlMatrix::jsclass, 0, + js_construct_object(cx, &VrmlMatrix::jsclass, 0, JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); if (!robj) { return JS_FALSE; } @@ -7875,7 +7910,7 @@ // Construct the result object. // JSObject * const robj = - JS_ConstructObject(cx, &VrmlMatrix::jsclass, 0, + js_construct_object(cx, &VrmlMatrix::jsclass, 0, JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); if (!robj) { return JS_FALSE; } @@ -7915,7 +7950,7 @@ // Construct the result object. // JSObject * const robj = - JS_ConstructObject(cx, &VrmlMatrix::jsclass, 0, + js_construct_object(cx, &VrmlMatrix::jsclass, 0, JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); if (!robj) { return JS_FALSE; } @@ -7965,7 +8000,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec3f::jsclass, proto, parent); + js_construct_object(cx, &SFVec3f::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -8013,9 +8048,9 @@ // Construct the result object. // JSObject * const robj = - JS_ConstructObject(cx, &SFVec3f::jsclass, 0, - JS_GetParent(cx, - OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_construct_object(cx, &SFVec3f::jsclass, 0, + JS_GetParent(cx, + OPENVRML_JS_THIS_OBJECT(cx, vp))); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-04-29 03:04:59
|
Revision: 4270 http://openvrml.svn.sourceforge.net/openvrml/?rev=4270&view=rev Author: braden Date: 2012-04-29 03:04:50 +0000 (Sun, 29 Apr 2012) Log Message: ----------- XULRunner 12.0 removes the JSObject* prototype argument from JS_ConstructObject. Modified Paths: -------------- trunk/ChangeLog trunk/configure.ac trunk/src/script/javascript.cpp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2012-04-27 05:02:39 UTC (rev 4269) +++ trunk/ChangeLog 2012-04-29 03:04:50 UTC (rev 4270) @@ -1,3 +1,11 @@ +2012-04-28 Braden McDaniel <br...@en...> + + XULRunner 12.0 removes the JSObject* prototype argument from + JS_ConstructObject. + + * configure.ac + * src/script/javascript.cpp + 2012-04-27 Braden McDaniel <br...@en...> * doc/Makefile.am (JAVADOC_RESOURCES_FILES): javadoc does not Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2012-04-27 05:02:39 UTC (rev 4269) +++ trunk/configure.ac 2012-04-29 03:04:50 UTC (rev 4270) @@ -266,6 +266,26 @@ [Defined if SpiderMonkey has JSStrictPropertyOp])]) # +# XULRunner 12.0 removes the JSObject* prototype argument from +# JS_ConstructObject. +# +AC_CACHE_CHECK([whether JS_ConstructObject is missing the prototype argument], +[ov_cv_js_constructobject_without_proto], +[ov_cv_js_constructobject_without_proto=no +ov_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$JS_CFLAGS $CPPFLAGS" +AC_LANG_ASSERT([C]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM( +[[#include <jsapi.h>]], +[[JS_ConstructObject(0, 0, 0)]])], +[ov_cv_js_constructobject_without_proto=yes]) +CPPFLAGS=$ov_save_CPPFLAGS +]) +AS_IF([test X$ov_cv_js_constructobject_without_proto = Xyes], + [AC_DEFINE([OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO], [1], + [Defined if JS_ConstructObject is missing the prototype argument])]) + +# # openvrml-xembed and openvrml-player both use GOption, which was # introduced in GLib 2.6. # Modified: trunk/src/script/javascript.cpp =================================================================== --- trunk/src/script/javascript.cpp 2012-04-27 05:02:39 UTC (rev 4269) +++ trunk/src/script/javascript.cpp 2012-04-29 03:04:50 UTC (rev 4270) @@ -110,6 +110,40 @@ # endif } + OPENVRML_LOCAL + JSObject * + js_construct_object(JSContext * const cx, + JSClass * const clasp, + JSObject * const proto, + JSObject * const parent) + { + assert(!proto); +# ifndef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO + return JS_ConstructObject(cx, clasp, parent); +# else + return JS_ConstructObject(cx, clasp, proto, parent); +# endif + } + + OPENVRML_LOCAL + JSObject * + js_construct_object_with_arguments(JSContext * const cx, + JSClass * const clasp, + JSObject * const proto, + JSObject * const parent, + const uintN argc, + jsval * const argv) + { + assert(!proto); +# ifndef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO + return js_construct_object_with_arguments(cx, clasp, parent, argc, argv); +# else + return js_construct_object_with_arguments(cx, clasp, proto, parent, + argc, argv); +# endif + } + + # ifdef OPENVRML_FAST_JSNATIVE # define OPENVRML_DECLARE_JSNATIVE(name) \ JSBool (name)(JSContext * cx, uintN argc, jsval * vp) @@ -2640,7 +2674,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const sfcolorObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const sfcolorObj = js_construct_object(cx, &jsclass, 0, obj); if (!sfcolorObj) { return JS_FALSE; } assert(JS_GetPrivate(cx, sfcolorObj)); @@ -3439,7 +3473,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const sfrotationObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const sfrotationObj = js_construct_object(cx, &jsclass, 0, obj); if (!sfrotationObj) { return JS_FALSE; } assert(JS_GetPrivate(cx, sfrotationObj)); @@ -3679,7 +3713,7 @@ &obj_sfdata.field_value()); JSObject * const robj = - JS_ConstructObject(cx, &SFVec3f::jsclass, 0, + js_construct_object(cx, &SFVec3f::jsclass, 0, OPENVRML_JS_THIS_OBJECT(cx, vp)); if (!robj) { return JS_FALSE; } @@ -3709,7 +3743,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFRotation::jsclass, proto, parent); + js_construct_object(cx, &SFRotation::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -3758,7 +3792,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFRotation::jsclass, proto, parent); + js_construct_object(cx, &SFRotation::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -3807,7 +3841,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec3f::jsclass, proto, parent); + js_construct_object(cx, &SFVec3f::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -3899,7 +3933,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFRotation::jsclass, proto, parent); + js_construct_object(cx, &SFRotation::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -3976,7 +4010,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const sfvec2Obj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const sfvec2Obj = js_construct_object(cx, &jsclass, 0, obj); if (!sfvec2Obj) { return JS_FALSE; } assert(JS_GetPrivate(cx, sfvec2Obj)); @@ -4176,7 +4210,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec2::jsclass, proto, parent); + js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -4219,7 +4253,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec2::jsclass, proto, parent); + js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -4320,7 +4354,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec2::jsclass, proto, parent); + js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -4354,7 +4388,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec2::jsclass, proto, parent); + js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -4388,7 +4422,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec2::jsclass, proto, parent); + js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -4442,7 +4476,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec2::jsclass, proto, parent); + js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -4484,7 +4518,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const sfvec2dObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const sfvec2dObj = js_construct_object(cx, &jsclass, 0, obj); if (!sfvec2dObj) { return JS_FALSE; } assert(JS_GetPrivate(cx, sfvec2dObj)); @@ -4583,7 +4617,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const sfvec3fObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const sfvec3fObj = js_construct_object(cx, &jsclass, 0, obj); if (!sfvec3fObj) { return JS_FALSE; } assert(JS_GetPrivate(cx, sfvec3fObj)); @@ -4787,7 +4821,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent); + js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -4841,7 +4875,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent); + js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) {return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -4884,7 +4918,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent); + js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -4985,7 +5019,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent); + js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -5019,7 +5053,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent); + js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -5053,7 +5087,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent); + js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -5107,7 +5141,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent); + js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -5148,7 +5182,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const sfvec3dObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const sfvec3dObj = js_construct_object(cx, &jsclass, 0, obj); if (!sfvec3dObj) { return JS_FALSE; } assert(JS_GetPrivate(cx, sfvec3dObj)); @@ -5416,7 +5450,7 @@ try { for (size_t i = length; i < newArray.size(); ++i) { JSObject * const element = - JS_ConstructObject(cx, &Subclass::sfjsclass, 0, 0); + js_construct_object(cx, &Subclass::sfjsclass, 0, 0); if (!element) { throw std::bad_alloc(); } newArray[i] = OBJECT_TO_JSVAL(element); } @@ -5746,7 +5780,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const mfboolObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const mfboolObj = js_construct_object(cx, &jsclass, 0, obj); if (!mfboolObj) { return JS_FALSE; } jsval length = INT_TO_JSVAL(bools.size()); @@ -5963,7 +5997,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const mfcolorObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const mfcolorObj = js_construct_object(cx, &jsclass, 0, obj); if (!mfcolorObj) { return JS_FALSE; } jsval length = INT_TO_JSVAL(colors.size()); @@ -6014,7 +6048,7 @@ assert(obj); assert(rval); - JSObject * const mffloatObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const mffloatObj = js_construct_object(cx, &jsclass, 0, obj); if (!mffloatObj) { return JS_FALSE; } jsval length = INT_TO_JSVAL(floats.size()); @@ -6089,7 +6123,7 @@ assert(obj); assert(rval); - JSObject * const mfdoubleObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const mfdoubleObj = js_construct_object(cx, &jsclass, 0, obj); if (!mfdoubleObj) { return JS_FALSE; } jsval length = INT_TO_JSVAL(doubles.size()); @@ -6185,7 +6219,7 @@ assert(obj); assert(rval); - JSObject * const mfint32Obj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const mfint32Obj = js_construct_object(cx, &jsclass, 0, obj); if (!mfint32Obj) { return JS_FALSE; } jsval length = INT_TO_JSVAL(int32s.size()); @@ -6450,7 +6484,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const mfnodeObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const mfnodeObj = js_construct_object(cx, &jsclass, 0, obj); if (!mfnodeObj) { return JS_FALSE; } jsval length = INT_TO_JSVAL(nodes.size()); @@ -6610,8 +6644,9 @@ for (size_t i = length; i < newArray.size(); ++i) { JSObject * const element = - JS_ConstructObjectWithArguments(cx, &sfnode_jsclass, 0, 0, - 1, &arg); + js_construct_object_with_arguments(cx, &sfnode_jsclass, + 0, 0, + 1, &arg); if (!element) { throw std::bad_alloc(); } newArray[i] = OBJECT_TO_JSVAL(element); } @@ -6704,7 +6739,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const mfrotationObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const mfrotationObj = js_construct_object(cx, &jsclass, 0, obj); if (!mfrotationObj) { return JS_FALSE; } jsval length = INT_TO_JSVAL(rotations.size()); @@ -6807,7 +6842,7 @@ assert(cx); assert(obj); assert(rval); - JSObject * const mfstringObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const mfstringObj = js_construct_object(cx, &jsclass, 0, obj); if (!mfstringObj) { return JS_FALSE; } jsval length = INT_TO_JSVAL(strings.size()); @@ -7050,7 +7085,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const mftimeObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const mftimeObj = js_construct_object(cx, &jsclass, 0, obj); if (!mftimeObj) { return JS_FALSE; } jsval length = INT_TO_JSVAL(times.size()); @@ -7123,7 +7158,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const mfvec2fObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const mfvec2fObj = js_construct_object(cx, &jsclass, 0, obj); if (!mfvec2fObj) { return JS_FALSE; } jsval length = INT_TO_JSVAL(vec2fs.size()); @@ -7204,7 +7239,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const mfvec2dObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const mfvec2dObj = js_construct_object(cx, &jsclass, 0, obj); if (!mfvec2dObj) { return JS_FALSE; } jsval length = INT_TO_JSVAL(vec2ds.size()); @@ -7285,7 +7320,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const mfvec3fObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const mfvec3fObj = js_construct_object(cx, &jsclass, 0, obj); if (!mfvec3fObj) { return JS_FALSE; } jsval length = INT_TO_JSVAL(vec3fs.size()); @@ -7367,7 +7402,7 @@ jsval * const rval) OPENVRML_NOTHROW { - JSObject * const mfvec3dObj = JS_ConstructObject(cx, &jsclass, 0, obj); + JSObject * const mfvec3dObj = js_construct_object(cx, &jsclass, 0, obj); if (!mfvec3dObj) { return JS_FALSE; } jsval length = INT_TO_JSVAL(vec3ds.size()); @@ -7624,7 +7659,7 @@ // // Construct the result object. // - JSObject * const robj = JS_ConstructObject(cx, &Row::jsclass, 0, + JSObject * const robj = js_construct_object(cx, &Row::jsclass, 0, JS_GetParent(cx, obj)); if (!robj) { return JS_FALSE; } @@ -7809,7 +7844,7 @@ using openvrml::mat4f; JSObject * const robj = - JS_ConstructObject(cx, &VrmlMatrix::jsclass, 0, + js_construct_object(cx, &VrmlMatrix::jsclass, 0, JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); if (!robj) { return JS_FALSE; } @@ -7831,7 +7866,7 @@ using openvrml::mat4f; JSObject * const robj = - JS_ConstructObject(cx, &VrmlMatrix::jsclass, 0, + js_construct_object(cx, &VrmlMatrix::jsclass, 0, JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); if (!robj) { return JS_FALSE; } @@ -7875,7 +7910,7 @@ // Construct the result object. // JSObject * const robj = - JS_ConstructObject(cx, &VrmlMatrix::jsclass, 0, + js_construct_object(cx, &VrmlMatrix::jsclass, 0, JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); if (!robj) { return JS_FALSE; } @@ -7915,7 +7950,7 @@ // Construct the result object. // JSObject * const robj = - JS_ConstructObject(cx, &VrmlMatrix::jsclass, 0, + js_construct_object(cx, &VrmlMatrix::jsclass, 0, JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); if (!robj) { return JS_FALSE; } @@ -7965,7 +8000,7 @@ JSObject * const parent = JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = - JS_ConstructObject(cx, &SFVec3f::jsclass, proto, parent); + js_construct_object(cx, &SFVec3f::jsclass, proto, parent); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); @@ -8013,9 +8048,9 @@ // Construct the result object. // JSObject * const robj = - JS_ConstructObject(cx, &SFVec3f::jsclass, 0, - JS_GetParent(cx, - OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_construct_object(cx, &SFVec3f::jsclass, 0, + JS_GetParent(cx, + OPENVRML_JS_THIS_OBJECT(cx, vp))); if (!robj) { return JS_FALSE; } assert(JS_GetPrivate(cx, robj)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-04-27 05:02:45
|
Revision: 4269 http://openvrml.svn.sourceforge.net/openvrml/?rev=4269&view=rev Author: braden Date: 2012-04-27 05:02:39 +0000 (Fri, 27 Apr 2012) Log Message: ----------- javadoc does not necessarily emit "inherit.gif"; be more generic. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/doc/Makefile.am Property Changed: ---------------- branches/0.18/ Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2012-04-27 05:00:41 UTC (rev 4268) +++ branches/0.18/ChangeLog 2012-04-27 05:02:39 UTC (rev 4269) @@ -1,3 +1,8 @@ +2012-04-27 Braden McDaniel <br...@en...> + + * doc/Makefile.am (JAVADOC_RESOURCES_FILES): javadoc does not + necessarily emit "inherit.gif"; be more generic. + 2012-04-26 Braden McDaniel <br...@en...> Define BOOST_FILESYSTEM_VERSION=3 for compatibility with Boost Modified: branches/0.18/doc/Makefile.am =================================================================== --- branches/0.18/doc/Makefile.am 2012-04-27 05:00:41 UTC (rev 4268) +++ branches/0.18/doc/Makefile.am 2012-04-27 05:02:39 UTC (rev 4269) @@ -87,7 +87,7 @@ $(srcdir)/javadoc/stylesheet.css JAVADOC_RESOURCES_FILES = \ - $(srcdir)/javadoc/resources/inherit.gif + $(srcdir)/javadoc/resources/* JAVADOC_VRML_FILES = \ $(srcdir)/javadoc/vrml/*.html This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-04-27 05:00:48
|
Revision: 4268 http://openvrml.svn.sourceforge.net/openvrml/?rev=4268&view=rev Author: braden Date: 2012-04-27 05:00:41 +0000 (Fri, 27 Apr 2012) Log Message: ----------- javadoc does not necessarily emit "inherit.gif"; be more generic. Modified Paths: -------------- trunk/ChangeLog trunk/doc/Makefile.am Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2012-04-27 02:54:46 UTC (rev 4267) +++ trunk/ChangeLog 2012-04-27 05:00:41 UTC (rev 4268) @@ -1,3 +1,8 @@ +2012-04-27 Braden McDaniel <br...@en...> + + * doc/Makefile.am (JAVADOC_RESOURCES_FILES): javadoc does not + necessarily emit "inherit.gif"; be more generic. + 2012-04-26 Braden McDaniel <br...@en...> Define BOOST_FILESYSTEM_VERSION=3 for compatibility with Boost Modified: trunk/doc/Makefile.am =================================================================== --- trunk/doc/Makefile.am 2012-04-27 02:54:46 UTC (rev 4267) +++ trunk/doc/Makefile.am 2012-04-27 05:00:41 UTC (rev 4268) @@ -87,7 +87,7 @@ $(srcdir)/javadoc/stylesheet.css JAVADOC_RESOURCES_FILES = \ - $(srcdir)/javadoc/resources/inherit.gif + $(srcdir)/javadoc/resources/* JAVADOC_VRML_FILES = \ $(srcdir)/javadoc/vrml/*.html This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-04-27 02:54:55
|
Revision: 4267 http://openvrml.svn.sourceforge.net/openvrml/?rev=4267&view=rev Author: braden Date: 2012-04-27 02:54:46 +0000 (Fri, 27 Apr 2012) Log Message: ----------- Fix erroneous paths for Visual Studio project files. Modified Paths: -------------- branches/0.18/ChangeLog Property Changed: ---------------- branches/0.18/ Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2012-04-27 02:52:56 UTC (rev 4266) +++ branches/0.18/ChangeLog 2012-04-27 02:54:46 UTC (rev 4267) @@ -116,9 +116,9 @@ * NEWS * configure.ac * doc/Doxyfile - * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc - * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj - * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc + * src/libopenvrml/openvrml.rc + * src/libopenvrml/openvrml.vcproj + * src/libopenvrml-gl/openvrml-gl.rc * src/Makefile.am (LIBOPENVRML_LIBRARY_VERSION): Update to 10:0:1. Previous change was incorrect. @@ -136,9 +136,9 @@ * NEWS * configure.ac * doc/Doxyfile - * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc - * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj - * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc + * src/libopenvrml/openvrml.rc + * src/libopenvrml/openvrml.vcproj + * src/libopenvrml-gl/openvrml-gl.rc * src/Makefile.am (LIBOPENVRML_LIBRARY_VERSION): Update to 9:5:1. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |