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-09-01 05:50:25
|
Revision: 4316 http://openvrml.svn.sourceforge.net/openvrml/?rev=4316&view=rev Author: braden Date: 2012-09-01 05:50:16 +0000 (Sat, 01 Sep 2012) Log Message: ----------- XULRunner 15.0 removes JSVAL_IS_OBJECT. 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,4270,4272,4274,4276,4278,4280-4281,4283,4285,4287,4292,4294,4296,4298,4300,4302,4304,4306,4308-4309,4311,4313 + /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,4292,4294,4296,4298,4300,4302,4304,4306,4308-4309,4311,4313,4315 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2012-09-01 05:48:09 UTC (rev 4315) +++ branches/0.18/ChangeLog 2012-09-01 05:50:16 UTC (rev 4316) @@ -1,3 +1,10 @@ +2012-09-01 Braden McDaniel <br...@en...> + + XULRunner 15.0 removes JSVAL_IS_OBJECT. + + * configure.ac + * src/script/javascript.cpp + 2012-08-19 Braden McDaniel <br...@en...> XULRunner 14.0 replaces the JSContext* argument to JSFinalizeOp Modified: branches/0.18/configure.ac =================================================================== --- branches/0.18/configure.ac 2012-09-01 05:48:09 UTC (rev 4315) +++ branches/0.18/configure.ac 2012-09-01 05:50:16 UTC (rev 4316) @@ -311,12 +311,15 @@ [ov_cv_js_has_finalizestub=no ov_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$JS_CFLAGS $CPPFLAGS" +ov_save_LDFLAGS="$LDFLAGS" +LDFLAGS="$JS_LIBS $LDFLAGS" AC_LANG_ASSERT([C]) AC_LINK_IFELSE([AC_LANG_PROGRAM( [[#include <jsapi.h>]], [[JS_FinalizeStub(0, 0)]])], [ov_cv_js_has_finalizestub=yes]) CPPFLAGS=$ov_save_CPPFLAGS +LDFLAGS=$ov_save_LDFLAGS ]) AS_IF([test X$ov_cv_js_has_finalizestub = Xyes], [AC_DEFINE([OPENVRML_JS_HAS_FINALIZESTUB], [1], @@ -381,6 +384,28 @@ [Defined if JS_GetParent does not take a JSContext argument])]) # +# XULRunner 15.0 removes JSVAL_IS_OBJECT. +# +AC_CACHE_CHECK([whether SpiderMonkey has JSVAL_IS_OBJECT], +[ov_cv_js_has_jsval_is_object], +[ov_cv_js_has_jsval_is_object=no +ov_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$JS_CFLAGS $CPPFLAGS" +ov_save_LDFLAGS="$LDFLAGS" +LDFLAGS="$JS_LIBS $LDFLAGS" +AC_LANG_ASSERT([C]) +AC_LINK_IFELSE([AC_LANG_PROGRAM( +[[#include <jsapi.h>]], +[[jsval val; JSVAL_IS_OBJECT(val)]])], +[ov_cv_js_has_jsval_is_object=yes]) +CPPFLAGS=$ov_save_CPPFLAGS +LDFLAGS=$ov_save_LDFLAGS +]) +AS_IF([test X$ov_cv_js_has_jsval_is_object = Xyes], + [AC_DEFINE([OPENVRML_JS_HAS_JSVAL_IS_OBJECT], [1], + [Defined if SpiderMonkey has JSVAL_IS_OBJECT])]) + +# # 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-09-01 05:48:09 UTC (rev 4315) +++ branches/0.18/src/script/javascript.cpp 2012-09-01 05:50:16 UTC (rev 4316) @@ -294,6 +294,15 @@ # endif + bool jsval_is_object_or_null(const jsval & val) + { +# ifdef OPENVRML_JS_HAS_JSVAL_IS_OBJECT + return JSVAL_IS_OBJECT(val); +# else + return val.isObjectOrNull(); +# endif + } + class SFNode; class MFNode; @@ -1302,7 +1311,7 @@ throw std::bad_alloc(); } assert(val != JSVAL_VOID); - if (JSVAL_IS_OBJECT(val)) { + if (jsval_is_object_or_null(val)) { field_data * fieldData = static_cast<field_data *> (js_get_private(this->cx, JSVAL_TO_OBJECT(val))); @@ -2019,7 +2028,9 @@ } case field_value::sfcolor_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } return auto_ptr<field_value> (SFColor::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); @@ -2051,19 +2062,26 @@ } case field_value::sfimage_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } return auto_ptr<field_value> (SFImage::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::sfnode_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } return auto_ptr<field_value> (SFNode::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::sfrotation_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (SFRotation::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + SFRotation::createFromJSObject(cx, JSVAL_TO_OBJECT(v)) + .release()); case field_value::sfstring_id: { @@ -2091,89 +2109,124 @@ } case field_value::sfvec2f_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (SFVec2f::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + SFVec2f::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::sfvec2d_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (SFVec2d::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + SFVec2d::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::sfvec3f_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (SFVec3f::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + SFVec3f::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::sfvec3d_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (SFVec3d::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + SFVec3d::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::mfbool_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (MFBool::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + MFBool::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::mfcolor_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (MFColor::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + MFColor::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::mffloat_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (MFFloat::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + MFFloat::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::mfdouble_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (MFDouble::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + MFDouble::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::mfint32_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (MFInt32::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + MFInt32::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::mfnode_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (MFNode::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + MFNode::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::mfrotation_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (MFRotation::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + MFRotation::createFromJSObject(cx, JSVAL_TO_OBJECT(v)) + .release()); case field_value::mfstring_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (MFString::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + MFString::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::mftime_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (MFTime::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + MFTime::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::mfvec2f_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (MFVec2f::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + MFVec2f::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::mfvec2d_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (MFVec2d::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + MFVec2d::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::mfvec3f_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (MFVec3f::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + MFVec3f::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::mfvec3d_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (MFVec3d::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + MFVec3d::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); default: assert(false); @@ -3560,7 +3613,7 @@ OPENVRML_DEFINE_MEMBER_JSNATIVE(SFRotation, construct) { double rot[4] = { 0.0, 1.0, 0.0, 0.0 }; - if (argc > 1 && JSVAL_IS_OBJECT(OPENVRML_JS_ARGV(cx, vp)[0]) + if (argc > 1 && jsval_is_object_or_null(OPENVRML_JS_ARGV(cx, vp)[0]) && JSVAL_IS_NUMBER(OPENVRML_JS_ARGV(cx, vp)[1])) { JSObject * axis_obj = 0; if (!JS_ConvertArguments(cx, argc, OPENVRML_JS_ARGV(cx, vp), "od", @@ -3581,8 +3634,9 @@ rot[0] = axis.value().x(); rot[1] = axis.value().y(); rot[2] = axis.value().z(); - } else if (argc > 1 && JSVAL_IS_OBJECT(OPENVRML_JS_ARGV(cx, vp)[0]) - && JSVAL_IS_OBJECT(OPENVRML_JS_ARGV(cx, vp)[1])) { + } else if (argc > 1 + && jsval_is_object_or_null(OPENVRML_JS_ARGV(cx, vp)[0]) + && jsval_is_object_or_null(OPENVRML_JS_ARGV(cx, vp)[1])) { JSObject * from_obj = 0, * to_obj = 0; if (!JS_ConvertArguments(cx, argc, OPENVRML_JS_ARGV(cx, vp), "oo", &from_obj, &to_obj)) { @@ -5394,7 +5448,7 @@ std::auto_ptr<MFData> mfdata(new MFData(argc)); for (unsigned i = 0; i < argc; ++i) { - if (!JSVAL_IS_OBJECT(argv[i]) + if (!jsval_is_object_or_null(argv[i]) || !JS_InstanceOf(cx, JSVAL_TO_OBJECT(argv[i]), &Subclass::sfjsclass, argv)) { return JS_FALSE; @@ -5533,7 +5587,7 @@ std::ostringstream out; out << '['; for (JsvalArray::size_type i = 0; i < mfdata->array.size(); ++i) { - assert(JSVAL_IS_OBJECT(mfdata->array[i])); + assert(jsval_is_object_or_null(mfdata->array[i])); const sfield::sfdata * const sfdata = static_cast<sfield::sfdata *> (js_get_private(cx, JSVAL_TO_OBJECT(mfdata->array[i]))); @@ -6027,7 +6081,7 @@ mfcolor(new openvrml::mfcolor(mfdata->array.size())); std::vector<openvrml::color> temp = mfcolor->value(); for (MField::JsvalArray::size_type i = 0; i < mfdata->array.size(); ++i) { - assert(JSVAL_IS_OBJECT(mfdata->array[i])); + assert(jsval_is_object_or_null(mfdata->array[i])); assert(JS_InstanceOf(cx, JSVAL_TO_OBJECT(mfdata->array[i]), &SFColor::jsclass, 0)); const sfield::sfdata * const sfdata = @@ -6517,7 +6571,7 @@ // // Make sure all args are SFNodes. // - if (!JSVAL_IS_OBJECT(argv[i]) + if (!jsval_is_object_or_null(argv[i]) || !JS_InstanceOf(cx, JSVAL_TO_OBJECT(argv[i]), &sfnode_jsclass, argv)) { return JS_FALSE; @@ -6583,7 +6637,7 @@ mfnode(new openvrml::mfnode(mfdata->array.size())); std::vector<boost::intrusive_ptr<openvrml::node> > temp = mfnode->value(); for (MField::JsvalArray::size_type i = 0; i < mfdata->array.size(); ++i) { - assert(JSVAL_IS_OBJECT(mfdata->array[i])); + assert(jsval_is_object_or_null(mfdata->array[i])); assert(JS_InstanceOf(cx, JSVAL_TO_OBJECT(mfdata->array[i]), &sfnode_jsclass, 0)); const sfield::sfdata * const sfdata = @@ -6834,7 +6888,7 @@ mfrotation(new openvrml::mfrotation(mfdata->array.size())); std::vector<openvrml::rotation> temp = mfrotation->value(); for (MField::JsvalArray::size_type i = 0; i < mfdata->array.size(); ++i) { - assert(JSVAL_IS_OBJECT(mfdata->array[i])); + assert(jsval_is_object_or_null(mfdata->array[i])); assert(JS_InstanceOf(cx, JSVAL_TO_OBJECT(mfdata->array[i]), &SFRotation::jsclass, 0)); const sfield::sfdata * const sfdata = @@ -7254,7 +7308,7 @@ mfvec2f(new openvrml::mfvec2f(mfdata->array.size())); std::vector<openvrml::vec2f> temp = mfvec2f->value(); for (MField::JsvalArray::size_type i = 0; i < mfdata->array.size(); ++i) { - assert(JSVAL_IS_OBJECT(mfdata->array[i])); + assert(jsval_is_object_or_null(mfdata->array[i])); assert(JS_InstanceOf(cx, JSVAL_TO_OBJECT(mfdata->array[i]), &SFVec2f::jsclass, 0)); const sfield::sfdata * const sfdata = @@ -7335,7 +7389,7 @@ mfvec2d(new openvrml::mfvec2d(mfdata->array.size())); std::vector<openvrml::vec2d> temp = mfvec2d->value(); for (MField::JsvalArray::size_type i = 0; i < mfdata->array.size(); ++i) { - assert(JSVAL_IS_OBJECT(mfdata->array[i])); + assert(jsval_is_object_or_null(mfdata->array[i])); assert(JS_InstanceOf(cx, JSVAL_TO_OBJECT(mfdata->array[i]), &SFVec2d::jsclass, 0)); const sfield::sfdata * const sfdata = @@ -7417,7 +7471,7 @@ std::vector<openvrml::vec3f> temp = mfvec3f->value(); for (MField::JsvalArray::size_type i = 0; i < mfdata->array.size(); ++i) { - assert(JSVAL_IS_OBJECT(mfdata->array[i])); + assert(jsval_is_object_or_null(mfdata->array[i])); assert(JS_InstanceOf(cx, JSVAL_TO_OBJECT(mfdata->array[i]), &SFVec3f::jsclass, 0)); const sfield::sfdata * const sfdata = @@ -7499,7 +7553,7 @@ std::vector<openvrml::vec3d> temp = mfvec3d->value(); for (MField::JsvalArray::size_type i = 0; i < mfdata->array.size(); ++i) { - assert(JSVAL_IS_OBJECT(mfdata->array[i])); + assert(jsval_is_object_or_null(mfdata->array[i])); assert(JS_InstanceOf(cx, JSVAL_TO_OBJECT(mfdata->array[i]), &SFVec3d::jsclass, 0)); const sfield::sfdata * const sfdata = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-09-01 05:48:16
|
Revision: 4315 http://openvrml.svn.sourceforge.net/openvrml/?rev=4315&view=rev Author: braden Date: 2012-09-01 05:48:09 +0000 (Sat, 01 Sep 2012) Log Message: ----------- XULRunner 15.0 removes JSVAL_IS_OBJECT. Modified Paths: -------------- trunk/ChangeLog trunk/configure.ac trunk/src/script/javascript.cpp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2012-08-19 05:25:12 UTC (rev 4314) +++ trunk/ChangeLog 2012-09-01 05:48:09 UTC (rev 4315) @@ -1,3 +1,10 @@ +2012-09-01 Braden McDaniel <br...@en...> + + XULRunner 15.0 removes JSVAL_IS_OBJECT. + + * configure.ac + * src/script/javascript.cpp + 2012-08-19 Braden McDaniel <br...@en...> XULRunner 14.0 replaces the JSContext* argument to JSFinalizeOp Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2012-08-19 05:25:12 UTC (rev 4314) +++ trunk/configure.ac 2012-09-01 05:48:09 UTC (rev 4315) @@ -293,12 +293,15 @@ [ov_cv_js_has_finalizestub=no ov_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$JS_CFLAGS $CPPFLAGS" +ov_save_LDFLAGS="$LDFLAGS" +LDFLAGS="$JS_LIBS $LDFLAGS" AC_LANG_ASSERT([C]) AC_LINK_IFELSE([AC_LANG_PROGRAM( [[#include <jsapi.h>]], [[JS_FinalizeStub(0, 0)]])], [ov_cv_js_has_finalizestub=yes]) CPPFLAGS=$ov_save_CPPFLAGS +LDFLAGS=$ov_save_LDFLAGS ]) AS_IF([test X$ov_cv_js_has_finalizestub = Xyes], [AC_DEFINE([OPENVRML_JS_HAS_FINALIZESTUB], [1], @@ -363,6 +366,28 @@ [Defined if JS_GetParent does not take a JSContext argument])]) # +# XULRunner 15.0 removes JSVAL_IS_OBJECT. +# +AC_CACHE_CHECK([whether SpiderMonkey has JSVAL_IS_OBJECT], +[ov_cv_js_has_jsval_is_object], +[ov_cv_js_has_jsval_is_object=no +ov_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$JS_CFLAGS $CPPFLAGS" +ov_save_LDFLAGS="$LDFLAGS" +LDFLAGS="$JS_LIBS $LDFLAGS" +AC_LANG_ASSERT([C]) +AC_LINK_IFELSE([AC_LANG_PROGRAM( +[[#include <jsapi.h>]], +[[jsval val; JSVAL_IS_OBJECT(val)]])], +[ov_cv_js_has_jsval_is_object=yes]) +CPPFLAGS=$ov_save_CPPFLAGS +LDFLAGS=$ov_save_LDFLAGS +]) +AS_IF([test X$ov_cv_js_has_jsval_is_object = Xyes], + [AC_DEFINE([OPENVRML_JS_HAS_JSVAL_IS_OBJECT], [1], + [Defined if SpiderMonkey has JSVAL_IS_OBJECT])]) + +# # 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-08-19 05:25:12 UTC (rev 4314) +++ trunk/src/script/javascript.cpp 2012-09-01 05:48:09 UTC (rev 4315) @@ -294,6 +294,15 @@ # endif + bool jsval_is_object_or_null(const jsval & val) + { +# ifdef OPENVRML_JS_HAS_JSVAL_IS_OBJECT + return JSVAL_IS_OBJECT(val); +# else + return val.isObjectOrNull(); +# endif + } + class SFNode; class MFNode; @@ -1302,7 +1311,7 @@ throw std::bad_alloc(); } assert(val != JSVAL_VOID); - if (JSVAL_IS_OBJECT(val)) { + if (jsval_is_object_or_null(val)) { field_data * fieldData = static_cast<field_data *> (js_get_private(this->cx, JSVAL_TO_OBJECT(val))); @@ -2019,7 +2028,9 @@ } case field_value::sfcolor_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } return auto_ptr<field_value> (SFColor::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); @@ -2051,19 +2062,26 @@ } case field_value::sfimage_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } return auto_ptr<field_value> (SFImage::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::sfnode_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } return auto_ptr<field_value> (SFNode::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::sfrotation_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (SFRotation::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + SFRotation::createFromJSObject(cx, JSVAL_TO_OBJECT(v)) + .release()); case field_value::sfstring_id: { @@ -2091,89 +2109,124 @@ } case field_value::sfvec2f_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (SFVec2f::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + SFVec2f::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::sfvec2d_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (SFVec2d::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + SFVec2d::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::sfvec3f_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (SFVec3f::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + SFVec3f::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::sfvec3d_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (SFVec3d::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + SFVec3d::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::mfbool_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (MFBool::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + MFBool::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::mfcolor_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (MFColor::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + MFColor::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::mffloat_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (MFFloat::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + MFFloat::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::mfdouble_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (MFDouble::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + MFDouble::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::mfint32_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (MFInt32::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + MFInt32::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::mfnode_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (MFNode::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + MFNode::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::mfrotation_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (MFRotation::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + MFRotation::createFromJSObject(cx, JSVAL_TO_OBJECT(v)) + .release()); case field_value::mfstring_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (MFString::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + MFString::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::mftime_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (MFTime::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + MFTime::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::mfvec2f_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (MFVec2f::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + MFVec2f::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::mfvec2d_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (MFVec2d::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + MFVec2d::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::mfvec3f_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (MFVec3f::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + MFVec3f::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); case field_value::mfvec3d_id: - if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); } - return auto_ptr<field_value> - (MFVec3d::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); + if (!jsval_is_object_or_null(v)) { + throw bad_conversion("Object expected."); + } + return auto_ptr<field_value>( + MFVec3d::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release()); default: assert(false); @@ -3560,7 +3613,7 @@ OPENVRML_DEFINE_MEMBER_JSNATIVE(SFRotation, construct) { double rot[4] = { 0.0, 1.0, 0.0, 0.0 }; - if (argc > 1 && JSVAL_IS_OBJECT(OPENVRML_JS_ARGV(cx, vp)[0]) + if (argc > 1 && jsval_is_object_or_null(OPENVRML_JS_ARGV(cx, vp)[0]) && JSVAL_IS_NUMBER(OPENVRML_JS_ARGV(cx, vp)[1])) { JSObject * axis_obj = 0; if (!JS_ConvertArguments(cx, argc, OPENVRML_JS_ARGV(cx, vp), "od", @@ -3581,8 +3634,9 @@ rot[0] = axis.value().x(); rot[1] = axis.value().y(); rot[2] = axis.value().z(); - } else if (argc > 1 && JSVAL_IS_OBJECT(OPENVRML_JS_ARGV(cx, vp)[0]) - && JSVAL_IS_OBJECT(OPENVRML_JS_ARGV(cx, vp)[1])) { + } else if (argc > 1 + && jsval_is_object_or_null(OPENVRML_JS_ARGV(cx, vp)[0]) + && jsval_is_object_or_null(OPENVRML_JS_ARGV(cx, vp)[1])) { JSObject * from_obj = 0, * to_obj = 0; if (!JS_ConvertArguments(cx, argc, OPENVRML_JS_ARGV(cx, vp), "oo", &from_obj, &to_obj)) { @@ -5394,7 +5448,7 @@ std::auto_ptr<MFData> mfdata(new MFData(argc)); for (unsigned i = 0; i < argc; ++i) { - if (!JSVAL_IS_OBJECT(argv[i]) + if (!jsval_is_object_or_null(argv[i]) || !JS_InstanceOf(cx, JSVAL_TO_OBJECT(argv[i]), &Subclass::sfjsclass, argv)) { return JS_FALSE; @@ -5533,7 +5587,7 @@ std::ostringstream out; out << '['; for (JsvalArray::size_type i = 0; i < mfdata->array.size(); ++i) { - assert(JSVAL_IS_OBJECT(mfdata->array[i])); + assert(jsval_is_object_or_null(mfdata->array[i])); const sfield::sfdata * const sfdata = static_cast<sfield::sfdata *> (js_get_private(cx, JSVAL_TO_OBJECT(mfdata->array[i]))); @@ -6027,7 +6081,7 @@ mfcolor(new openvrml::mfcolor(mfdata->array.size())); std::vector<openvrml::color> temp = mfcolor->value(); for (MField::JsvalArray::size_type i = 0; i < mfdata->array.size(); ++i) { - assert(JSVAL_IS_OBJECT(mfdata->array[i])); + assert(jsval_is_object_or_null(mfdata->array[i])); assert(JS_InstanceOf(cx, JSVAL_TO_OBJECT(mfdata->array[i]), &SFColor::jsclass, 0)); const sfield::sfdata * const sfdata = @@ -6517,7 +6571,7 @@ // // Make sure all args are SFNodes. // - if (!JSVAL_IS_OBJECT(argv[i]) + if (!jsval_is_object_or_null(argv[i]) || !JS_InstanceOf(cx, JSVAL_TO_OBJECT(argv[i]), &sfnode_jsclass, argv)) { return JS_FALSE; @@ -6583,7 +6637,7 @@ mfnode(new openvrml::mfnode(mfdata->array.size())); std::vector<boost::intrusive_ptr<openvrml::node> > temp = mfnode->value(); for (MField::JsvalArray::size_type i = 0; i < mfdata->array.size(); ++i) { - assert(JSVAL_IS_OBJECT(mfdata->array[i])); + assert(jsval_is_object_or_null(mfdata->array[i])); assert(JS_InstanceOf(cx, JSVAL_TO_OBJECT(mfdata->array[i]), &sfnode_jsclass, 0)); const sfield::sfdata * const sfdata = @@ -6834,7 +6888,7 @@ mfrotation(new openvrml::mfrotation(mfdata->array.size())); std::vector<openvrml::rotation> temp = mfrotation->value(); for (MField::JsvalArray::size_type i = 0; i < mfdata->array.size(); ++i) { - assert(JSVAL_IS_OBJECT(mfdata->array[i])); + assert(jsval_is_object_or_null(mfdata->array[i])); assert(JS_InstanceOf(cx, JSVAL_TO_OBJECT(mfdata->array[i]), &SFRotation::jsclass, 0)); const sfield::sfdata * const sfdata = @@ -7254,7 +7308,7 @@ mfvec2f(new openvrml::mfvec2f(mfdata->array.size())); std::vector<openvrml::vec2f> temp = mfvec2f->value(); for (MField::JsvalArray::size_type i = 0; i < mfdata->array.size(); ++i) { - assert(JSVAL_IS_OBJECT(mfdata->array[i])); + assert(jsval_is_object_or_null(mfdata->array[i])); assert(JS_InstanceOf(cx, JSVAL_TO_OBJECT(mfdata->array[i]), &SFVec2f::jsclass, 0)); const sfield::sfdata * const sfdata = @@ -7335,7 +7389,7 @@ mfvec2d(new openvrml::mfvec2d(mfdata->array.size())); std::vector<openvrml::vec2d> temp = mfvec2d->value(); for (MField::JsvalArray::size_type i = 0; i < mfdata->array.size(); ++i) { - assert(JSVAL_IS_OBJECT(mfdata->array[i])); + assert(jsval_is_object_or_null(mfdata->array[i])); assert(JS_InstanceOf(cx, JSVAL_TO_OBJECT(mfdata->array[i]), &SFVec2d::jsclass, 0)); const sfield::sfdata * const sfdata = @@ -7417,7 +7471,7 @@ std::vector<openvrml::vec3f> temp = mfvec3f->value(); for (MField::JsvalArray::size_type i = 0; i < mfdata->array.size(); ++i) { - assert(JSVAL_IS_OBJECT(mfdata->array[i])); + assert(jsval_is_object_or_null(mfdata->array[i])); assert(JS_InstanceOf(cx, JSVAL_TO_OBJECT(mfdata->array[i]), &SFVec3f::jsclass, 0)); const sfield::sfdata * const sfdata = @@ -7499,7 +7553,7 @@ std::vector<openvrml::vec3d> temp = mfvec3d->value(); for (MField::JsvalArray::size_type i = 0; i < mfdata->array.size(); ++i) { - assert(JSVAL_IS_OBJECT(mfdata->array[i])); + assert(jsval_is_object_or_null(mfdata->array[i])); assert(JS_InstanceOf(cx, JSVAL_TO_OBJECT(mfdata->array[i]), &SFVec3d::jsclass, 0)); const sfield::sfdata * const sfdata = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-08-19 05:25:22
|
Revision: 4314 http://openvrml.svn.sourceforge.net/openvrml/?rev=4314&view=rev Author: braden Date: 2012-08-19 05:25:12 +0000 (Sun, 19 Aug 2012) Log Message: ----------- XULRunner 14.0 replaces the JSContext* argument to JSFinalizeOp with JSFreeOp* and removes the JSContext* argument from JS_GetParent. 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,4270,4272,4274,4276,4278,4280-4281,4283,4285,4287,4292,4294,4296,4298,4300,4302,4304,4306,4308-4309,4311 + /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,4292,4294,4296,4298,4300,4302,4304,4306,4308-4309,4311,4313 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2012-08-19 04:37:17 UTC (rev 4313) +++ branches/0.18/ChangeLog 2012-08-19 05:25:12 UTC (rev 4314) @@ -1,5 +1,15 @@ 2012-08-19 Braden McDaniel <br...@en...> + XULRunner 14.0 replaces the JSContext* argument to JSFinalizeOp + with JSFreeOp* and removes the JSContext* argument from + JS_GetParent. + + * configure.ac + * src/script/javascript.cpp + + +2012-08-19 Braden McDaniel <br...@en...> + * src/script/javascript.cpp: JS_SetPrivate no longer returns a boolean value. Modified: branches/0.18/configure.ac =================================================================== --- branches/0.18/configure.ac 2012-08-19 04:37:17 UTC (rev 4313) +++ branches/0.18/configure.ac 2012-08-19 05:25:12 UTC (rev 4314) @@ -342,6 +342,45 @@ [Defined if JS_SetContext does not take a JSContext argument])]) # +# XULRunner 14.0 replaces the JSContext* argument to JSFinalizeOp with +# JSFreeOp*. +# +AC_CACHE_CHECK([whether SpiderMonkey JSFinalizeOp uses JSFreeOp], +[ov_cv_jsfinalizeop_uses_jsfreeop], +[ov_cv_jsfinalizeop_uses_jsfreeop=no +ov_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$JS_CFLAGS $CPPFLAGS" +AC_LANG_ASSERT([C]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM( +[[#include <jsapi.h>]], +[[JSFreeOp * fop = 0; JSFinalizeOp finalize = 0; finalize(fop, 0)]])], +[ov_cv_jsfinalizeop_uses_jsfreeop=yes]) +CPPFLAGS=$ov_save_CPPFLAGS +]) +AS_IF([test X$ov_cv_jsfinalizeop_uses_jsfreeop = Xyes], + [AC_DEFINE([OPENVRML_JS_FINALIZEOP_USES_FREEOP], [1], + [Defined if JSFinalizeOp takes a JSFreeOp argument])]) + +# +# XULRunner 14.0 removes the JSContext argument from JS_GetParent. +# +AC_CACHE_CHECK([whether SpiderMonkey JS_GetParent is used without a JSContext], +[ov_cv_js_getparent_without_context], +[ov_cv_js_getparent_without_context=no +ov_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$JS_CFLAGS $CPPFLAGS" +AC_LANG_ASSERT([C]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM( +[[#include <jsapi.h>]], +[[JS_GetParent(0)]])], +[ov_cv_js_getparent_without_context=yes]) +CPPFLAGS=$ov_save_CPPFLAGS +]) +AS_IF([test X$ov_cv_js_getparent_without_context = Xyes], + [AC_DEFINE([OPENVRML_JS_GETPARENT_WITHOUT_CONTEXT], [1], + [Defined if JS_GetParent does not take a JSContext 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-08-19 04:37:17 UTC (rev 4313) +++ branches/0.18/src/script/javascript.cpp 2012-08-19 05:25:12 UTC (rev 4314) @@ -164,7 +164,17 @@ # endif } + OPENVRML_LOCAL + JSObject * js_get_parent(JSContext * const cx, JSObject * const obj) + { +# ifdef OPENVRML_JS_GETPARENT_WITHOUT_CONTEXT + return JS_GetParent(obj); +# else + return JS_GetParent(cx, obj); +# endif + } + # ifdef OPENVRML_FAST_JSNATIVE # define OPENVRML_DECLARE_JSNATIVE(name) \ JSBool (name)(JSContext * cx, unsigned argc, jsval * vp) @@ -268,6 +278,22 @@ JSPropertyOp openvrml_JS_StrictPropertyStub = JS_PropertyStub; # endif +# ifdef OPENVRML_JS_FINALIZEOP_USES_FREEOP +# define OPENVRML_DECLARE_JSFINALIZEOP(name) \ + void (name)(JSFreeOp * fop, JSObject * obj) + +# define OPENVRML_DEFINE_MEMBER_JSFINALIZEOP(class_name, name) \ + void class_name::name(JSFreeOp * fop, JSObject * obj) + +# else +# define OPENVRML_DECLARE_JSFINALIZEOP(name) \ + void (name)(JSContext * cx, JSObject * obj) + +# define OPENVRML_DEFINE_MEMBER_JSFINALIZEOP(class_name, name) \ + void class_name::name(JSContext * cx, JSObject * obj) + +# endif + class SFNode; class MFNode; @@ -489,7 +515,7 @@ }; protected: - static void finalize(JSContext * cx, JSObject * obj) OPENVRML_NOTHROW; + static OPENVRML_DECLARE_JSFINALIZEOP(finalize); static OPENVRML_DECLARE_JSNATIVE(toString); private: sfield(); @@ -755,7 +781,7 @@ static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement); static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setLength); static OPENVRML_DECLARE_JSNATIVE(toString); - static void finalize(JSContext * cx, JSObject * obj) OPENVRML_NOTHROW; + static OPENVRML_DECLARE_JSFINALIZEOP(finalize); private: static JSBool initObject(JSContext * cx, JSObject * obj, @@ -778,7 +804,7 @@ static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement); static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setLength); static OPENVRML_DECLARE_JSNATIVE(toString); - static void finalize(JSContext * cx, JSObject * obj) OPENVRML_NOTHROW; + static OPENVRML_DECLARE_JSFINALIZEOP(finalize); private: static JSBool initObject(JSContext * cx, JSObject * obj, @@ -803,7 +829,7 @@ static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement); static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setLength); static OPENVRML_DECLARE_JSNATIVE(toString); - static void finalize(JSContext * cx, JSObject * obj); + static OPENVRML_DECLARE_JSFINALIZEOP(finalize); }; class OPENVRML_JAVASCRIPT_LOCAL MFColor : public MFJSObject<MFColor> { @@ -862,7 +888,7 @@ static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement); static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setLength); static OPENVRML_DECLARE_JSNATIVE(toString); - static void finalize(JSContext * cx, JSObject * obj); + static OPENVRML_DECLARE_JSFINALIZEOP(finalize); }; // @@ -890,7 +916,7 @@ static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement); static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setLength); static OPENVRML_DECLARE_JSNATIVE(toString); - static void finalize(JSContext * cx, JSObject * obj) OPENVRML_NOTHROW; + static OPENVRML_DECLARE_JSFINALIZEOP(finalize); }; class OPENVRML_JAVASCRIPT_LOCAL MFRotation : public MFJSObject<MFRotation> { @@ -927,7 +953,7 @@ static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement); static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setLength); static OPENVRML_DECLARE_JSNATIVE(toString); - static void finalize(JSContext * cx, JSObject * obj) OPENVRML_NOTHROW; + static OPENVRML_DECLARE_JSFINALIZEOP(finalize); }; class OPENVRML_JAVASCRIPT_LOCAL MFTime : public MFJSDouble<MFTime> { @@ -1039,7 +1065,7 @@ static OPENVRML_DECLARE_JSNATIVE(multVecMatrix); static OPENVRML_DECLARE_JSNATIVE(multMatrixVec); static OPENVRML_DECLARE_JSNATIVE(toString); - static void finalize(JSContext * cx, JSObject * obj) OPENVRML_NOTHROW; + static OPENVRML_DECLARE_JSFINALIZEOP(finalize); private: VrmlMatrix(); @@ -2618,9 +2644,11 @@ return *this->field_value_; } - void sfield::finalize(JSContext * const cx, JSObject * const obj) - OPENVRML_NOTHROW + OPENVRML_DEFINE_MEMBER_JSFINALIZEOP(sfield, finalize) { +# ifdef OPENVRML_JS_FINALIZEOP_USES_FREEOP + static JSContext * const cx = 0; +# endif delete static_cast<field_data *>(js_get_private(cx, obj)); js_set_private(cx, obj, 0); } @@ -3760,7 +3788,7 @@ static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFRotation::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -3809,7 +3837,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFRotation::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -3858,7 +3886,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec3f::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -3950,7 +3978,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFRotation::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -4227,7 +4255,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -4270,7 +4298,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -4371,7 +4399,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -4405,7 +4433,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -4439,7 +4467,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -4493,7 +4521,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -4838,7 +4866,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -4892,7 +4920,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) {return JS_FALSE; } @@ -4935,7 +4963,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -5036,7 +5064,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -5070,7 +5098,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -5104,7 +5132,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -5158,7 +5186,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -5522,11 +5550,12 @@ } template <typename Subclass> - void MFJSObject<Subclass>::finalize(JSContext * const cx, JSObject * const obj) - OPENVRML_NOTHROW + OPENVRML_DEFINE_MEMBER_JSFINALIZEOP(MFJSObject<Subclass>, finalize) { - assert(cx); assert(obj); +# ifdef OPENVRML_JS_FINALIZEOP_USES_FREEOP + static JSContext * const cx = 0; +# endif MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj)); if (mfdata) { RemoveRoots(cx, mfdata->array); @@ -5735,9 +5764,11 @@ } template <typename Subclass> - void MFJSDouble<Subclass>::finalize(JSContext * const cx, JSObject * const obj) - OPENVRML_NOTHROW + OPENVRML_DEFINE_MEMBER_JSFINALIZEOP(MFJSDouble<Subclass>, finalize) { +# ifdef OPENVRML_JS_FINALIZEOP_USES_FREEOP + static JSContext * const cx = 0; +# endif MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj)); if (mfdata) { RemoveRoots(cx, mfdata->array); @@ -5946,8 +5977,11 @@ return JS_TRUE; } - void MFBool::finalize(JSContext * const cx, JSObject * const obj) + OPENVRML_DEFINE_MEMBER_JSFINALIZEOP(MFBool, finalize) { +# ifdef OPENVRML_JS_FINALIZEOP_USES_FREEOP + static JSContext * const cx = 0; +# endif delete static_cast<MFData *>(js_get_private(cx, obj)); js_set_private(cx, obj, 0); } @@ -6414,8 +6448,11 @@ return JS_TRUE; } - void MFInt32::finalize(JSContext * const cx, JSObject * const obj) + OPENVRML_DEFINE_MEMBER_JSFINALIZEOP(MFInt32, finalize) { +# ifdef OPENVRML_JS_FINALIZEOP_USES_FREEOP + static JSContext * const cx = 0; +# endif delete static_cast<MFData *>(js_get_private(cx, obj)); js_set_private(cx, obj, 0); } @@ -6717,11 +6754,12 @@ return JS_TRUE; } - void MFNode::finalize(JSContext * const cx, JSObject * const obj) - OPENVRML_NOTHROW + OPENVRML_DEFINE_MEMBER_JSFINALIZEOP(MFNode, finalize) { - assert(cx); assert(obj); +# ifdef OPENVRML_JS_FINALIZEOP_USES_FREEOP + static JSContext * const cx = 0; +# endif MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj)); if (mfdata) { RemoveRoots(cx, mfdata->array); @@ -7067,9 +7105,11 @@ return JS_TRUE; } - void MFString::finalize(JSContext * const cx, JSObject * const obj) - OPENVRML_NOTHROW + OPENVRML_DEFINE_MEMBER_JSFINALIZEOP(MFString, finalize) { +# ifdef OPENVRML_JS_FINALIZEOP_USES_FREEOP + static JSContext * const cx = 0; +# endif MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj)); if (mfdata) { RemoveRoots(cx, mfdata->array); @@ -7684,12 +7724,11 @@ // Construct the result object. // JSObject * const robj = js_construct_object(cx, &Row::jsclass, 0, - JS_GetParent(cx, obj)); + js_get_parent(cx, obj)); if (!robj) { return JS_FALSE; } float (&row)[4] = (*thisMat)[jspropertyop_id_to_int(id)]; - js_set_private(cx, robj, &row)); - *vp = OBJECT_TO_JSVAL(robj); + js_set_private(cx, robj, &row); } return JS_TRUE; } @@ -7869,8 +7908,8 @@ JSObject * const robj = js_construct_object(cx, &VrmlMatrix::jsclass, 0, - JS_GetParent(cx, - OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_parent(cx, + OPENVRML_JS_THIS_OBJECT(cx, vp))); if (!robj) { return JS_FALSE; } const mat4f * const thisMat = @@ -7891,8 +7930,8 @@ JSObject * const robj = js_construct_object(cx, &VrmlMatrix::jsclass, 0, - JS_GetParent(cx, - OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_parent(cx, + OPENVRML_JS_THIS_OBJECT(cx, vp))); if (!robj) { return JS_FALSE; } const mat4f * const thisMat = @@ -7935,8 +7974,8 @@ // JSObject * const robj = js_construct_object(cx, &VrmlMatrix::jsclass, 0, - JS_GetParent(cx, - OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_parent(cx, + OPENVRML_JS_THIS_OBJECT(cx, vp))); if (!robj) { return JS_FALSE; } void * robj_private_data = js_get_private(cx, robj); assert(robj_private_data); @@ -7975,8 +8014,8 @@ // JSObject * const robj = js_construct_object(cx, &VrmlMatrix::jsclass, 0, - JS_GetParent(cx, - OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_parent(cx, + OPENVRML_JS_THIS_OBJECT(cx, vp))); if (!robj) { return JS_FALSE; } void * private_data = js_get_private(cx, robj); assert(private_data); @@ -8022,7 +8061,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec3f::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -8073,8 +8112,8 @@ // JSObject * const robj = js_construct_object(cx, &SFVec3f::jsclass, 0, - JS_GetParent(cx, - OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_parent(cx, + OPENVRML_JS_THIS_OBJECT(cx, vp))); if (!robj) { return JS_FALSE; } assert(js_get_private(cx, robj)); @@ -8113,9 +8152,11 @@ return JS_TRUE; } - void VrmlMatrix::finalize(JSContext * const cx, JSObject * const obj) - OPENVRML_NOTHROW + OPENVRML_DEFINE_MEMBER_JSFINALIZEOP(VrmlMatrix, finalize) { +# ifdef OPENVRML_JS_FINALIZEOP_USES_FREEOP + static JSContext * const cx = 0; +# endif delete static_cast<openvrml::mat4f *>(js_get_private(cx, obj)); js_set_private(cx, obj, 0); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-08-19 04:37:27
|
Revision: 4313 http://openvrml.svn.sourceforge.net/openvrml/?rev=4313&view=rev Author: braden Date: 2012-08-19 04:37:17 +0000 (Sun, 19 Aug 2012) Log Message: ----------- XULRunner 14.0 replaces the JSContext* argument to JSFinalizeOp with JSFreeOp* and removes the JSContext* argument from JS_GetParent. Modified Paths: -------------- trunk/ChangeLog trunk/configure.ac trunk/src/script/javascript.cpp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2012-08-19 04:36:20 UTC (rev 4312) +++ trunk/ChangeLog 2012-08-19 04:37:17 UTC (rev 4313) @@ -1,5 +1,15 @@ 2012-08-19 Braden McDaniel <br...@en...> + XULRunner 14.0 replaces the JSContext* argument to JSFinalizeOp + with JSFreeOp* and removes the JSContext* argument from + JS_GetParent. + + * configure.ac + * src/script/javascript.cpp + + +2012-08-19 Braden McDaniel <br...@en...> + * src/script/javascript.cpp: JS_SetPrivate no longer returns a boolean value. Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2012-08-19 04:36:20 UTC (rev 4312) +++ trunk/configure.ac 2012-08-19 04:37:17 UTC (rev 4313) @@ -324,6 +324,45 @@ [Defined if JS_SetContext does not take a JSContext argument])]) # +# XULRunner 14.0 replaces the JSContext* argument to JSFinalizeOp with +# JSFreeOp*. +# +AC_CACHE_CHECK([whether SpiderMonkey JSFinalizeOp uses JSFreeOp], +[ov_cv_jsfinalizeop_uses_jsfreeop], +[ov_cv_jsfinalizeop_uses_jsfreeop=no +ov_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$JS_CFLAGS $CPPFLAGS" +AC_LANG_ASSERT([C]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM( +[[#include <jsapi.h>]], +[[JSFreeOp * fop = 0; JSFinalizeOp finalize = 0; finalize(fop, 0)]])], +[ov_cv_jsfinalizeop_uses_jsfreeop=yes]) +CPPFLAGS=$ov_save_CPPFLAGS +]) +AS_IF([test X$ov_cv_jsfinalizeop_uses_jsfreeop = Xyes], + [AC_DEFINE([OPENVRML_JS_FINALIZEOP_USES_FREEOP], [1], + [Defined if JSFinalizeOp takes a JSFreeOp argument])]) + +# +# XULRunner 14.0 removes the JSContext argument from JS_GetParent. +# +AC_CACHE_CHECK([whether SpiderMonkey JS_GetParent is used without a JSContext], +[ov_cv_js_getparent_without_context], +[ov_cv_js_getparent_without_context=no +ov_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$JS_CFLAGS $CPPFLAGS" +AC_LANG_ASSERT([C]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM( +[[#include <jsapi.h>]], +[[JS_GetParent(0)]])], +[ov_cv_js_getparent_without_context=yes]) +CPPFLAGS=$ov_save_CPPFLAGS +]) +AS_IF([test X$ov_cv_js_getparent_without_context = Xyes], + [AC_DEFINE([OPENVRML_JS_GETPARENT_WITHOUT_CONTEXT], [1], + [Defined if JS_GetParent does not take a JSContext 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-08-19 04:36:20 UTC (rev 4312) +++ trunk/src/script/javascript.cpp 2012-08-19 04:37:17 UTC (rev 4313) @@ -164,7 +164,17 @@ # endif } + OPENVRML_LOCAL + JSObject * js_get_parent(JSContext * const cx, JSObject * const obj) + { +# ifdef OPENVRML_JS_GETPARENT_WITHOUT_CONTEXT + return JS_GetParent(obj); +# else + return JS_GetParent(cx, obj); +# endif + } + # ifdef OPENVRML_FAST_JSNATIVE # define OPENVRML_DECLARE_JSNATIVE(name) \ JSBool (name)(JSContext * cx, unsigned argc, jsval * vp) @@ -268,6 +278,22 @@ JSPropertyOp openvrml_JS_StrictPropertyStub = JS_PropertyStub; # endif +# ifdef OPENVRML_JS_FINALIZEOP_USES_FREEOP +# define OPENVRML_DECLARE_JSFINALIZEOP(name) \ + void (name)(JSFreeOp * fop, JSObject * obj) + +# define OPENVRML_DEFINE_MEMBER_JSFINALIZEOP(class_name, name) \ + void class_name::name(JSFreeOp * fop, JSObject * obj) + +# else +# define OPENVRML_DECLARE_JSFINALIZEOP(name) \ + void (name)(JSContext * cx, JSObject * obj) + +# define OPENVRML_DEFINE_MEMBER_JSFINALIZEOP(class_name, name) \ + void class_name::name(JSContext * cx, JSObject * obj) + +# endif + class SFNode; class MFNode; @@ -489,7 +515,7 @@ }; protected: - static void finalize(JSContext * cx, JSObject * obj) OPENVRML_NOTHROW; + static OPENVRML_DECLARE_JSFINALIZEOP(finalize); static OPENVRML_DECLARE_JSNATIVE(toString); private: sfield(); @@ -755,7 +781,7 @@ static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement); static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setLength); static OPENVRML_DECLARE_JSNATIVE(toString); - static void finalize(JSContext * cx, JSObject * obj) OPENVRML_NOTHROW; + static OPENVRML_DECLARE_JSFINALIZEOP(finalize); private: static JSBool initObject(JSContext * cx, JSObject * obj, @@ -778,7 +804,7 @@ static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement); static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setLength); static OPENVRML_DECLARE_JSNATIVE(toString); - static void finalize(JSContext * cx, JSObject * obj) OPENVRML_NOTHROW; + static OPENVRML_DECLARE_JSFINALIZEOP(finalize); private: static JSBool initObject(JSContext * cx, JSObject * obj, @@ -803,7 +829,7 @@ static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement); static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setLength); static OPENVRML_DECLARE_JSNATIVE(toString); - static void finalize(JSContext * cx, JSObject * obj); + static OPENVRML_DECLARE_JSFINALIZEOP(finalize); }; class OPENVRML_JAVASCRIPT_LOCAL MFColor : public MFJSObject<MFColor> { @@ -862,7 +888,7 @@ static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement); static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setLength); static OPENVRML_DECLARE_JSNATIVE(toString); - static void finalize(JSContext * cx, JSObject * obj); + static OPENVRML_DECLARE_JSFINALIZEOP(finalize); }; // @@ -890,7 +916,7 @@ static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement); static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setLength); static OPENVRML_DECLARE_JSNATIVE(toString); - static void finalize(JSContext * cx, JSObject * obj) OPENVRML_NOTHROW; + static OPENVRML_DECLARE_JSFINALIZEOP(finalize); }; class OPENVRML_JAVASCRIPT_LOCAL MFRotation : public MFJSObject<MFRotation> { @@ -927,7 +953,7 @@ static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement); static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setLength); static OPENVRML_DECLARE_JSNATIVE(toString); - static void finalize(JSContext * cx, JSObject * obj) OPENVRML_NOTHROW; + static OPENVRML_DECLARE_JSFINALIZEOP(finalize); }; class OPENVRML_JAVASCRIPT_LOCAL MFTime : public MFJSDouble<MFTime> { @@ -1039,7 +1065,7 @@ static OPENVRML_DECLARE_JSNATIVE(multVecMatrix); static OPENVRML_DECLARE_JSNATIVE(multMatrixVec); static OPENVRML_DECLARE_JSNATIVE(toString); - static void finalize(JSContext * cx, JSObject * obj) OPENVRML_NOTHROW; + static OPENVRML_DECLARE_JSFINALIZEOP(finalize); private: VrmlMatrix(); @@ -2618,9 +2644,11 @@ return *this->field_value_; } - void sfield::finalize(JSContext * const cx, JSObject * const obj) - OPENVRML_NOTHROW + OPENVRML_DEFINE_MEMBER_JSFINALIZEOP(sfield, finalize) { +# ifdef OPENVRML_JS_FINALIZEOP_USES_FREEOP + static JSContext * const cx = 0; +# endif delete static_cast<field_data *>(js_get_private(cx, obj)); js_set_private(cx, obj, 0); } @@ -3760,7 +3788,7 @@ static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFRotation::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -3809,7 +3837,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFRotation::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -3858,7 +3886,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec3f::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -3950,7 +3978,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFRotation::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -4227,7 +4255,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -4270,7 +4298,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -4371,7 +4399,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -4405,7 +4433,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -4439,7 +4467,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -4493,7 +4521,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -4838,7 +4866,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -4892,7 +4920,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) {return JS_FALSE; } @@ -4935,7 +4963,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -5036,7 +5064,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -5070,7 +5098,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -5104,7 +5132,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -5158,7 +5186,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -5522,11 +5550,12 @@ } template <typename Subclass> - void MFJSObject<Subclass>::finalize(JSContext * const cx, JSObject * const obj) - OPENVRML_NOTHROW + OPENVRML_DEFINE_MEMBER_JSFINALIZEOP(MFJSObject<Subclass>, finalize) { - assert(cx); assert(obj); +# ifdef OPENVRML_JS_FINALIZEOP_USES_FREEOP + static JSContext * const cx = 0; +# endif MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj)); if (mfdata) { RemoveRoots(cx, mfdata->array); @@ -5735,9 +5764,11 @@ } template <typename Subclass> - void MFJSDouble<Subclass>::finalize(JSContext * const cx, JSObject * const obj) - OPENVRML_NOTHROW + OPENVRML_DEFINE_MEMBER_JSFINALIZEOP(MFJSDouble<Subclass>, finalize) { +# ifdef OPENVRML_JS_FINALIZEOP_USES_FREEOP + static JSContext * const cx = 0; +# endif MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj)); if (mfdata) { RemoveRoots(cx, mfdata->array); @@ -5946,8 +5977,11 @@ return JS_TRUE; } - void MFBool::finalize(JSContext * const cx, JSObject * const obj) + OPENVRML_DEFINE_MEMBER_JSFINALIZEOP(MFBool, finalize) { +# ifdef OPENVRML_JS_FINALIZEOP_USES_FREEOP + static JSContext * const cx = 0; +# endif delete static_cast<MFData *>(js_get_private(cx, obj)); js_set_private(cx, obj, 0); } @@ -6414,8 +6448,11 @@ return JS_TRUE; } - void MFInt32::finalize(JSContext * const cx, JSObject * const obj) + OPENVRML_DEFINE_MEMBER_JSFINALIZEOP(MFInt32, finalize) { +# ifdef OPENVRML_JS_FINALIZEOP_USES_FREEOP + static JSContext * const cx = 0; +# endif delete static_cast<MFData *>(js_get_private(cx, obj)); js_set_private(cx, obj, 0); } @@ -6717,11 +6754,12 @@ return JS_TRUE; } - void MFNode::finalize(JSContext * const cx, JSObject * const obj) - OPENVRML_NOTHROW + OPENVRML_DEFINE_MEMBER_JSFINALIZEOP(MFNode, finalize) { - assert(cx); assert(obj); +# ifdef OPENVRML_JS_FINALIZEOP_USES_FREEOP + static JSContext * const cx = 0; +# endif MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj)); if (mfdata) { RemoveRoots(cx, mfdata->array); @@ -7067,9 +7105,11 @@ return JS_TRUE; } - void MFString::finalize(JSContext * const cx, JSObject * const obj) - OPENVRML_NOTHROW + OPENVRML_DEFINE_MEMBER_JSFINALIZEOP(MFString, finalize) { +# ifdef OPENVRML_JS_FINALIZEOP_USES_FREEOP + static JSContext * const cx = 0; +# endif MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj)); if (mfdata) { RemoveRoots(cx, mfdata->array); @@ -7684,12 +7724,11 @@ // Construct the result object. // JSObject * const robj = js_construct_object(cx, &Row::jsclass, 0, - JS_GetParent(cx, obj)); + js_get_parent(cx, obj)); if (!robj) { return JS_FALSE; } float (&row)[4] = (*thisMat)[jspropertyop_id_to_int(id)]; - js_set_private(cx, robj, &row)); - *vp = OBJECT_TO_JSVAL(robj); + js_set_private(cx, robj, &row); } return JS_TRUE; } @@ -7869,8 +7908,8 @@ JSObject * const robj = js_construct_object(cx, &VrmlMatrix::jsclass, 0, - JS_GetParent(cx, - OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_parent(cx, + OPENVRML_JS_THIS_OBJECT(cx, vp))); if (!robj) { return JS_FALSE; } const mat4f * const thisMat = @@ -7891,8 +7930,8 @@ JSObject * const robj = js_construct_object(cx, &VrmlMatrix::jsclass, 0, - JS_GetParent(cx, - OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_parent(cx, + OPENVRML_JS_THIS_OBJECT(cx, vp))); if (!robj) { return JS_FALSE; } const mat4f * const thisMat = @@ -7935,8 +7974,8 @@ // JSObject * const robj = js_construct_object(cx, &VrmlMatrix::jsclass, 0, - JS_GetParent(cx, - OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_parent(cx, + OPENVRML_JS_THIS_OBJECT(cx, vp))); if (!robj) { return JS_FALSE; } void * robj_private_data = js_get_private(cx, robj); assert(robj_private_data); @@ -7975,8 +8014,8 @@ // JSObject * const robj = js_construct_object(cx, &VrmlMatrix::jsclass, 0, - JS_GetParent(cx, - OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_parent(cx, + OPENVRML_JS_THIS_OBJECT(cx, vp))); if (!robj) { return JS_FALSE; } void * private_data = js_get_private(cx, robj); assert(private_data); @@ -8022,7 +8061,7 @@ // static JSObject * const proto = 0; JSObject * const parent = - JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); + js_get_parent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp)); JSObject * const robj = js_construct_object(cx, &SFVec3f::jsclass, proto, parent); if (!robj) { return JS_FALSE; } @@ -8073,8 +8112,8 @@ // JSObject * const robj = js_construct_object(cx, &SFVec3f::jsclass, 0, - JS_GetParent(cx, - OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_parent(cx, + OPENVRML_JS_THIS_OBJECT(cx, vp))); if (!robj) { return JS_FALSE; } assert(js_get_private(cx, robj)); @@ -8113,9 +8152,11 @@ return JS_TRUE; } - void VrmlMatrix::finalize(JSContext * const cx, JSObject * const obj) - OPENVRML_NOTHROW + OPENVRML_DEFINE_MEMBER_JSFINALIZEOP(VrmlMatrix, finalize) { +# ifdef OPENVRML_JS_FINALIZEOP_USES_FREEOP + static JSContext * const cx = 0; +# endif delete static_cast<openvrml::mat4f *>(js_get_private(cx, obj)); js_set_private(cx, obj, 0); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-08-19 04:36:27
|
Revision: 4312 http://openvrml.svn.sourceforge.net/openvrml/?rev=4312&view=rev Author: braden Date: 2012-08-19 04:36:20 +0000 (Sun, 19 Aug 2012) Log Message: ----------- JS_SetPrivate no longer returns a boolean value. 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,4278,4280-4281,4283,4285,4287,4292,4294,4296,4298,4300,4302,4304,4306,4308-4309 + /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,4292,4294,4296,4298,4300,4302,4304,4306,4308-4309,4311 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2012-08-19 04:28:52 UTC (rev 4311) +++ branches/0.18/ChangeLog 2012-08-19 04:36:20 UTC (rev 4312) @@ -1,3 +1,8 @@ +2012-08-19 Braden McDaniel <br...@en...> + + * src/script/javascript.cpp: JS_SetPrivate no longer returns a + boolean value. + 2012-08-18 Braden McDaniel <br...@en...> XULRunner 14.0 removes the JSContext argument from Modified: branches/0.18/src/script/javascript.cpp =================================================================== --- branches/0.18/src/script/javascript.cpp 2012-08-19 04:28:52 UTC (rev 4311) +++ branches/0.18/src/script/javascript.cpp 2012-08-19 04:36:20 UTC (rev 4312) @@ -2779,7 +2779,7 @@ float(rgb[2])))); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfcolor.get())); sfcolor.release(); - if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; } + js_set_private(cx, obj, sfdata.get()); sfdata.release(); } catch (std::exception & ex) { OPENVRML_PRINT_EXCEPTION_(ex); @@ -2984,7 +2984,7 @@ std::auto_ptr<sfield::sfdata> sfdata( new sfield::sfdata(sfimageClone.get())); sfimageClone.release(); - if (!js_set_private(cx, sfimageObj, sfdata.get())) { return JS_FALSE; } + js_set_private(cx, sfimageObj, sfdata.get()); sfdata.release(); } catch (std::exception & ex) { OPENVRML_PRINT_EXCEPTION_(ex); @@ -3098,7 +3098,7 @@ openvrml::image(x, y, comp, pixels))); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfimage.get())); sfimage.release(); - if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; } + js_set_private(cx, obj, sfdata.get()); sfdata.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -3241,7 +3241,7 @@ auto_ptr<openvrml::sfnode> sfnodeClone(new openvrml::sfnode(node)); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfnodeClone.get())); sfnodeClone.release(); - if (!js_set_private(cx, sfnodeObj, sfdata.get())) { return JS_FALSE; } + js_set_private(cx, sfnodeObj, sfdata.get()); sfdata.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -3335,7 +3335,7 @@ auto_ptr<openvrml::sfnode> sfnode(new openvrml::sfnode(nodes[0])); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfnode.get())); sfnode.release(); - if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; } + js_set_private(cx, obj, sfdata.get()); sfdata.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -3641,7 +3641,7 @@ float(rot[3])))); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfrotation.get())); sfrotation.release(); - if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; } + js_set_private(cx, obj, sfdata.get()); sfdata.release(); } catch (std::exception & ex) { OPENVRML_PRINT_EXCEPTION_(ex); @@ -4116,7 +4116,7 @@ auto_ptr<sfvec2_t> sfvec2(new sfvec2_t(vec2)); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfvec2.get())); sfvec2.release(); - if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; } + js_set_private(cx, obj, sfdata.get()); sfdata.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -4725,7 +4725,7 @@ auto_ptr<sfvec3_t> sfvec3(new sfvec3_t(vec3)); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfvec3.get())); sfvec3.release(); - if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; } + js_set_private(cx, obj, sfdata.get()); sfdata.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -5379,7 +5379,7 @@ // AddRoots(cx, mfdata->array); - if (!js_set_private(cx, obj, mfdata.get())) { return JS_FALSE; } + js_set_private(cx, obj, mfdata.get()); mfdata.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -5595,7 +5595,7 @@ } } - if (!js_set_private(cx, obj, mfdata.get())) { return JS_FALSE; } + js_set_private(cx, obj, mfdata.get()); // // Protect array values from gc. @@ -5857,7 +5857,7 @@ } mfdata->array[i] = BOOLEAN_TO_JSVAL(boolean); } - if (!js_set_private(cx, obj, mfdata.get())) { return JS_FALSE; } + js_set_private(cx, obj, mfdata.get()); mfdata.release(); } catch (std::bad_alloc & ex) { OPENVRML_PRINT_EXCEPTION_(ex); @@ -6323,7 +6323,7 @@ return JS_FALSE; } } - if (!js_set_private(cx, obj, mfdata.get())) { return JS_FALSE; } + js_set_private(cx, obj, mfdata.get()); mfdata.release(); } catch (std::bad_alloc & ex) { OPENVRML_PRINT_EXCEPTION_(ex); @@ -6487,7 +6487,7 @@ } mfdata->array[i] = argv[i]; } - if (!js_set_private(cx, obj, mfdata.get())) { return JS_FALSE; } + js_set_private(cx, obj, mfdata.get()); mfdata.release(); } catch (std::bad_alloc & ex) { OPENVRML_PRINT_EXCEPTION_(ex); @@ -6950,7 +6950,7 @@ // AddRoots(cx, mfdata->array); - if (!js_set_private(cx, obj, mfdata.get())) { return JS_FALSE; } + js_set_private(cx, obj, mfdata.get()); mfdata.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -7658,7 +7658,7 @@ float(mat[4]), float(mat[5]), float(mat[6]), float(mat[7]), float(mat[8]), float(mat[9]), float(mat[10]), float(mat[11]), float(mat[12]), float(mat[13]), float(mat[14]), float(mat[15])))); - if (!js_set_private(cx, obj, mat_ptr.get())) { return JS_FALSE; } + js_set_private(cx, obj, mat_ptr.get()); mat_ptr.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -7688,7 +7688,7 @@ if (!robj) { return JS_FALSE; } float (&row)[4] = (*thisMat)[jspropertyop_id_to_int(id)]; - if (!js_set_private(cx, robj, &row)) { return JS_FALSE; } + js_set_private(cx, robj, &row)); *vp = OBJECT_TO_JSVAL(robj); } return JS_TRUE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-08-19 04:28:58
|
Revision: 4311 http://openvrml.svn.sourceforge.net/openvrml/?rev=4311&view=rev Author: braden Date: 2012-08-19 04:28:52 +0000 (Sun, 19 Aug 2012) Log Message: ----------- JS_SetPrivate no longer returns a boolean value. Modified Paths: -------------- trunk/ChangeLog trunk/src/script/javascript.cpp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2012-08-19 02:01:23 UTC (rev 4310) +++ trunk/ChangeLog 2012-08-19 04:28:52 UTC (rev 4311) @@ -1,3 +1,8 @@ +2012-08-19 Braden McDaniel <br...@en...> + + * src/script/javascript.cpp: JS_SetPrivate no longer returns a + boolean value. + 2012-08-18 Braden McDaniel <br...@en...> XULRunner 14.0 removes the JSContext argument from Modified: trunk/src/script/javascript.cpp =================================================================== --- trunk/src/script/javascript.cpp 2012-08-19 02:01:23 UTC (rev 4310) +++ trunk/src/script/javascript.cpp 2012-08-19 04:28:52 UTC (rev 4311) @@ -2779,7 +2779,7 @@ float(rgb[2])))); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfcolor.get())); sfcolor.release(); - if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; } + js_set_private(cx, obj, sfdata.get()); sfdata.release(); } catch (std::exception & ex) { OPENVRML_PRINT_EXCEPTION_(ex); @@ -2984,7 +2984,7 @@ std::auto_ptr<sfield::sfdata> sfdata( new sfield::sfdata(sfimageClone.get())); sfimageClone.release(); - if (!js_set_private(cx, sfimageObj, sfdata.get())) { return JS_FALSE; } + js_set_private(cx, sfimageObj, sfdata.get()); sfdata.release(); } catch (std::exception & ex) { OPENVRML_PRINT_EXCEPTION_(ex); @@ -3098,7 +3098,7 @@ openvrml::image(x, y, comp, pixels))); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfimage.get())); sfimage.release(); - if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; } + js_set_private(cx, obj, sfdata.get()); sfdata.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -3241,7 +3241,7 @@ auto_ptr<openvrml::sfnode> sfnodeClone(new openvrml::sfnode(node)); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfnodeClone.get())); sfnodeClone.release(); - if (!js_set_private(cx, sfnodeObj, sfdata.get())) { return JS_FALSE; } + js_set_private(cx, sfnodeObj, sfdata.get()); sfdata.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -3335,7 +3335,7 @@ auto_ptr<openvrml::sfnode> sfnode(new openvrml::sfnode(nodes[0])); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfnode.get())); sfnode.release(); - if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; } + js_set_private(cx, obj, sfdata.get()); sfdata.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -3641,7 +3641,7 @@ float(rot[3])))); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfrotation.get())); sfrotation.release(); - if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; } + js_set_private(cx, obj, sfdata.get()); sfdata.release(); } catch (std::exception & ex) { OPENVRML_PRINT_EXCEPTION_(ex); @@ -4116,7 +4116,7 @@ auto_ptr<sfvec2_t> sfvec2(new sfvec2_t(vec2)); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfvec2.get())); sfvec2.release(); - if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; } + js_set_private(cx, obj, sfdata.get()); sfdata.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -4725,7 +4725,7 @@ auto_ptr<sfvec3_t> sfvec3(new sfvec3_t(vec3)); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfvec3.get())); sfvec3.release(); - if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; } + js_set_private(cx, obj, sfdata.get()); sfdata.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -5379,7 +5379,7 @@ // AddRoots(cx, mfdata->array); - if (!js_set_private(cx, obj, mfdata.get())) { return JS_FALSE; } + js_set_private(cx, obj, mfdata.get()); mfdata.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -5595,7 +5595,7 @@ } } - if (!js_set_private(cx, obj, mfdata.get())) { return JS_FALSE; } + js_set_private(cx, obj, mfdata.get()); // // Protect array values from gc. @@ -5857,7 +5857,7 @@ } mfdata->array[i] = BOOLEAN_TO_JSVAL(boolean); } - if (!js_set_private(cx, obj, mfdata.get())) { return JS_FALSE; } + js_set_private(cx, obj, mfdata.get()); mfdata.release(); } catch (std::bad_alloc & ex) { OPENVRML_PRINT_EXCEPTION_(ex); @@ -6323,7 +6323,7 @@ return JS_FALSE; } } - if (!js_set_private(cx, obj, mfdata.get())) { return JS_FALSE; } + js_set_private(cx, obj, mfdata.get()); mfdata.release(); } catch (std::bad_alloc & ex) { OPENVRML_PRINT_EXCEPTION_(ex); @@ -6487,7 +6487,7 @@ } mfdata->array[i] = argv[i]; } - if (!js_set_private(cx, obj, mfdata.get())) { return JS_FALSE; } + js_set_private(cx, obj, mfdata.get()); mfdata.release(); } catch (std::bad_alloc & ex) { OPENVRML_PRINT_EXCEPTION_(ex); @@ -6950,7 +6950,7 @@ // AddRoots(cx, mfdata->array); - if (!js_set_private(cx, obj, mfdata.get())) { return JS_FALSE; } + js_set_private(cx, obj, mfdata.get()); mfdata.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -7658,7 +7658,7 @@ float(mat[4]), float(mat[5]), float(mat[6]), float(mat[7]), float(mat[8]), float(mat[9]), float(mat[10]), float(mat[11]), float(mat[12]), float(mat[13]), float(mat[14]), float(mat[15])))); - if (!js_set_private(cx, obj, mat_ptr.get())) { return JS_FALSE; } + js_set_private(cx, obj, mat_ptr.get()); mat_ptr.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -7688,7 +7688,7 @@ if (!robj) { return JS_FALSE; } float (&row)[4] = (*thisMat)[jspropertyop_id_to_int(id)]; - if (!js_set_private(cx, robj, &row)) { return JS_FALSE; } + js_set_private(cx, robj, &row)); *vp = OBJECT_TO_JSVAL(robj); } return JS_TRUE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-08-19 02:01:32
|
Revision: 4310 http://openvrml.svn.sourceforge.net/openvrml/?rev=4310&view=rev Author: braden Date: 2012-08-19 02:01:23 +0000 (Sun, 19 Aug 2012) Log Message: ----------- XULRunner 14.0 removes the JSContext argument from JS_{Get,Set}Private. 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,4270,4272,4274,4276,4278,4280-4281,4283,4285,4287,4292,4294,4296,4298,4300,4302,4304,4306 + /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,4292,4294,4296,4298,4300,4302,4304,4306,4308-4309 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2012-08-19 01:58:40 UTC (rev 4309) +++ branches/0.18/ChangeLog 2012-08-19 02:01:23 UTC (rev 4310) @@ -1,3 +1,11 @@ +2012-08-18 Braden McDaniel <br...@en...> + + XULRunner 14.0 removes the JSContext argument from + JS_{Get,Set}Private. + + * configure.ac + * src/script/javascript.cpp + 2012-07-26 Braden McDaniel <br...@en...> XULRunner 14.0 removes JS_FinalizeStub. Modified: branches/0.18/configure.ac =================================================================== --- branches/0.18/configure.ac 2012-08-19 01:58:40 UTC (rev 4309) +++ branches/0.18/configure.ac 2012-08-19 02:01:23 UTC (rev 4310) @@ -254,7 +254,7 @@ AC_LANG_PUSH([C++]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM( [[#include <jsapi.h>]], -[[JSBool (*f)(JSContext *, uintN, jsval *); JSNative g = f;]])], +[[JSBool (*f)(JSContext *, unsigned, jsval *); JSNative g = f;]])], [ov_cv_fast_jsnative=yes]) AC_LANG_POP([C++]) CPPFLAGS=$ov_save_CPPFLAGS @@ -312,8 +312,8 @@ ov_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$JS_CFLAGS $CPPFLAGS" AC_LANG_ASSERT([C]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM( -[[#include <jsapi.h]], +AC_LINK_IFELSE([AC_LANG_PROGRAM( +[[#include <jsapi.h>]], [[JS_FinalizeStub(0, 0)]])], [ov_cv_js_has_finalizestub=yes]) CPPFLAGS=$ov_save_CPPFLAGS @@ -323,6 +323,25 @@ [Defined if JS_FinalizeStub is declared in jsapi.h])]) # +# XULRunner 14.0 removes the JSContext argument from JS_{Set,Get}Private. +# +AC_CACHE_CHECK([whether SpiderMonkey JS_SetPrivate is used without a JSContext], +[ov_cv_js_private_without_context], +[ov_cv_js_private_without_context=no +ov_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$JS_CFLAGS $CPPFLAGS" +AC_LANG_ASSERT([C]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM( +[[#include <jsapi.h>]], +[[JS_SetPrivate(0, 0)]])], +[ov_cv_js_private_without_context=yes]) +CPPFLAGS=$ov_save_CPPFLAGS +]) +AS_IF([test X$ov_cv_js_private_without_context = Xyes], + [AC_DEFINE([OPENVRML_JS_PRIVATE_WITHOUT_CONTEXT], [1], + [Defined if JS_SetContext does not take a JSContext 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-08-19 01:58:40 UTC (rev 4309) +++ branches/0.18/src/script/javascript.cpp 2012-08-19 02:01:23 UTC (rev 4310) @@ -143,7 +143,28 @@ # endif } + OPENVRML_LOCAL + void * js_get_private(JSContext * const cx, JSObject * const obj) + { +# ifdef OPENVRML_JS_PRIVATE_WITHOUT_CONTEXT + return JS_GetPrivate(obj); +# else + return JS_GetPrivate(cx, obj); +# endif + } + OPENVRML_LOCAL + void js_set_private(JSContext * const cx, JSObject * const obj, + void * const data) + { +# ifdef OPENVRML_JS_PRIVATE_WITHOUT_CONTEXT + JS_SetPrivate(obj, data); +# else + JS_SetPrivate(cx, obj, data); +# endif + } + + # ifdef OPENVRML_FAST_JSNATIVE # define OPENVRML_DECLARE_JSNATIVE(name) \ JSBool (name)(JSContext * cx, unsigned argc, jsval * vp) @@ -1258,7 +1279,7 @@ if (JSVAL_IS_OBJECT(val)) { field_data * fieldData = static_cast<field_data *> - (JS_GetPrivate(this->cx, JSVAL_TO_OBJECT(val))); + (js_get_private(this->cx, JSVAL_TO_OBJECT(val))); if (fieldData->changed) { using std::auto_ptr; auto_ptr<openvrml::field_value> fieldValue = @@ -2600,16 +2621,16 @@ void sfield::finalize(JSContext * const cx, JSObject * const obj) OPENVRML_NOTHROW { - delete static_cast<field_data *>(JS_GetPrivate(cx, obj)); - JS_SetPrivate(cx, obj, 0); + delete static_cast<field_data *>(js_get_private(cx, obj)); + js_set_private(cx, obj, 0); } OPENVRML_DEFINE_MEMBER_JSNATIVE(sfield, toString) { - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); std::ostringstream out; out << sfdata.field_value(); @@ -2675,9 +2696,9 @@ JSObject * const sfcolorObj = js_construct_object(cx, &jsclass, 0, obj); if (!sfcolorObj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, sfcolorObj)); + assert(js_get_private(cx, sfcolorObj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, sfcolorObj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, sfcolorObj)); try { boost::polymorphic_downcast<openvrml::sfcolor *>(&sfdata.field_value()) @@ -2701,9 +2722,9 @@ if (!obj || !JS_InstanceOf(cx, obj, &SFColor::jsclass, 0)) { throw bad_conversion("SFColor object expected."); } - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); return auto_ptr<openvrml::sfcolor>( boost::polymorphic_downcast<openvrml::sfcolor *>( @@ -2758,7 +2779,7 @@ float(rgb[2])))); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfcolor.get())); sfcolor.release(); - if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; } + if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; } sfdata.release(); } catch (std::exception & ex) { OPENVRML_PRINT_EXCEPTION_(ex); @@ -2776,9 +2797,9 @@ jsval * const rval) OPENVRML_NOTHROW { - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); const openvrml::sfcolor & thisColor = *boost::polymorphic_downcast<openvrml::sfcolor *>( &sfdata.field_value()); @@ -2797,9 +2818,9 @@ OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(SFColor, setProperty) { - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); openvrml::sfcolor & thisColor = *boost::polymorphic_downcast<openvrml::sfcolor *>( &sfdata.field_value()); @@ -2843,10 +2864,10 @@ OPENVRML_DEFINE_MEMBER_JSNATIVE(SFColor, setHSV) { - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); sfield::sfdata & sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); openvrml::sfcolor & thisColor = *boost::polymorphic_downcast<openvrml::sfcolor *>( &sfdata.field_value()); @@ -2880,10 +2901,10 @@ OPENVRML_DEFINE_MEMBER_JSNATIVE(SFColor, getHSV) { - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const openvrml::sfcolor & thisColor = *boost::polymorphic_downcast<openvrml::sfcolor *>( &sfdata.field_value()); @@ -2963,7 +2984,7 @@ std::auto_ptr<sfield::sfdata> sfdata( new sfield::sfdata(sfimageClone.get())); sfimageClone.release(); - if (!JS_SetPrivate(cx, sfimageObj, sfdata.get())) { return JS_FALSE; } + if (!js_set_private(cx, sfimageObj, sfdata.get())) { return JS_FALSE; } sfdata.release(); } catch (std::exception & ex) { OPENVRML_PRINT_EXCEPTION_(ex); @@ -2985,9 +3006,9 @@ if (!JS_InstanceOf(cx, obj, &SFImage::jsclass, 0)) { throw bad_conversion("SFImage object expected."); } - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); return auto_ptr<openvrml::sfimage>( boost::polymorphic_downcast<openvrml::sfimage *>( sfdata.field_value().clone().release())); @@ -3051,7 +3072,7 @@ if (pixels_obj) { assert(JS_InstanceOf(cx, pixels_obj, &MFInt32::jsclass, 0)); MField::MFData * const mfdata = - static_cast<MField::MFData *>(JS_GetPrivate(cx, pixels_obj)); + static_cast<MField::MFData *>(js_get_private(cx, pixels_obj)); pixels_t::iterator pixelPtr = pixels.begin(); for (MField::JsvalArray::size_type i(0); @@ -3077,7 +3098,7 @@ openvrml::image(x, y, comp, pixels))); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfimage.get())); sfimage.release(); - if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; } + if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; } sfdata.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -3098,9 +3119,9 @@ jsval * const vp) OPENVRML_NOTHROW { - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); const openvrml::sfimage & thisImage = *boost::polymorphic_downcast<openvrml::sfimage *>( &sfdata.field_value()); @@ -3220,7 +3241,7 @@ auto_ptr<openvrml::sfnode> sfnodeClone(new openvrml::sfnode(node)); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfnodeClone.get())); sfnodeClone.release(); - if (!JS_SetPrivate(cx, sfnodeObj, sfdata.get())) { return JS_FALSE; } + if (!js_set_private(cx, sfnodeObj, sfdata.get())) { return JS_FALSE; } sfdata.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -3242,9 +3263,9 @@ if (!JS_InstanceOf(cx, obj, &sfnode_jsclass, 0)) { throw bad_conversion("SFNode object expected."); } - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); return auto_ptr<openvrml::sfnode>( boost::polymorphic_downcast<openvrml::sfnode *>( sfdata.field_value().clone().release())); @@ -3314,7 +3335,7 @@ auto_ptr<openvrml::sfnode> sfnode(new openvrml::sfnode(nodes[0])); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfnode.get())); sfnode.release(); - if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; } + if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; } sfdata.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -3334,9 +3355,9 @@ { if (!jspropertyop_id_is_string(id)) { return JS_TRUE; } - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); const openvrml::sfnode & thisNode = *boost::polymorphic_downcast<openvrml::sfnode *>( &sfdata.field_value()); @@ -3365,9 +3386,9 @@ using std::auto_ptr; using std::string; - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); openvrml::sfnode & thisNode = *boost::polymorphic_downcast<openvrml::sfnode *>( &sfdata.field_value()); @@ -3474,9 +3495,9 @@ JSObject * const sfrotationObj = js_construct_object(cx, &jsclass, 0, obj); if (!sfrotationObj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, sfrotationObj)); + assert(js_get_private(cx, sfrotationObj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, sfrotationObj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, sfrotationObj)); try { boost::polymorphic_downcast<openvrml::sfrotation *>( @@ -3500,9 +3521,9 @@ if (!JS_InstanceOf(cx, obj, &SFRotation::jsclass, 0)) { throw bad_conversion("SFRotation object expected."); } - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); return auto_ptr<openvrml::sfrotation>( boost::polymorphic_downcast<openvrml::sfrotation *>( sfdata.field_value().clone().release())); @@ -3523,9 +3544,9 @@ OPENVRML_JS_ARGV(cx, vp))) { return JS_FALSE; } - assert(JS_GetPrivate(cx, axis_obj)); + assert(js_get_private(cx, axis_obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, axis_obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, axis_obj)); const openvrml::sfvec3f & axis = *boost::polymorphic_downcast<openvrml::sfvec3f *>( &sfdata.field_value()); @@ -3548,16 +3569,16 @@ return JS_FALSE; } - assert(JS_GetPrivate(cx, from_obj)); + assert(js_get_private(cx, from_obj)); const sfield::sfdata & from_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, from_obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, from_obj)); const openvrml::sfvec3f & from_vec = *boost::polymorphic_downcast<openvrml::sfvec3f *>( &from_sfdata.field_value()); - assert(JS_GetPrivate(cx, to_obj)); + assert(js_get_private(cx, to_obj)); const sfield::sfdata & to_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, to_obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, to_obj)); const openvrml::sfvec3f & to_vec = *boost::polymorphic_downcast<openvrml::sfvec3f *>( &to_sfdata.field_value()); @@ -3620,7 +3641,7 @@ float(rot[3])))); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfrotation.get())); sfrotation.release(); - if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; } + if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; } sfdata.release(); } catch (std::exception & ex) { OPENVRML_PRINT_EXCEPTION_(ex); @@ -3638,9 +3659,9 @@ jsval * const rval) OPENVRML_NOTHROW { - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); const openvrml::sfrotation & thisRot = *boost::polymorphic_downcast<openvrml::sfrotation *>( &sfdata.field_value()); @@ -3657,9 +3678,9 @@ OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(SFRotation, setProperty) { - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); openvrml::sfrotation & thisRot = *boost::polymorphic_downcast<openvrml::sfrotation *>( &sfdata.field_value()); @@ -3702,10 +3723,10 @@ OPENVRML_DEFINE_MEMBER_JSNATIVE(SFRotation, getAxis) { - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const openvrml::sfrotation & thisRot = *boost::polymorphic_downcast<openvrml::sfrotation *>( &obj_sfdata.field_value()); @@ -3715,9 +3736,9 @@ OPENVRML_JS_THIS_OBJECT(cx, vp)); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); const sfield::sfdata & robj_sfdata = - *static_cast<sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfdata *>(js_get_private(cx, robj)); openvrml::sfvec3f & resultVec = *boost::polymorphic_downcast<openvrml::sfvec3f *>( &robj_sfdata.field_value()); @@ -3729,10 +3750,10 @@ OPENVRML_DEFINE_MEMBER_JSNATIVE(SFRotation, inverse) { - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const openvrml::sfrotation & thisRot = *boost::polymorphic_downcast<openvrml::sfrotation *>( &obj_sfdata.field_value()); @@ -3744,9 +3765,9 @@ js_construct_object(cx, &SFRotation::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); const sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); openvrml::sfrotation & resultRot = *boost::polymorphic_downcast<openvrml::sfrotation *>( &robj_sfdata.field_value()); @@ -3758,10 +3779,10 @@ OPENVRML_DEFINE_MEMBER_JSNATIVE(SFRotation, multiply) { - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const openvrml::sfrotation & thisRot = *boost::polymorphic_downcast<openvrml::sfrotation *>( &obj_sfdata.field_value()); @@ -3776,9 +3797,9 @@ return JS_FALSE; } - assert(JS_GetPrivate(cx, rot_obj)); + assert(js_get_private(cx, rot_obj)); const sfield::sfdata & arg_sfdata = - *static_cast<sfdata *>(JS_GetPrivate(cx, rot_obj)); + *static_cast<sfdata *>(js_get_private(cx, rot_obj)); const openvrml::sfrotation & argRot = *boost::polymorphic_downcast<openvrml::sfrotation *>( &arg_sfdata.field_value()); @@ -3793,9 +3814,9 @@ js_construct_object(cx, &SFRotation::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); const sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); openvrml::sfrotation & resultRot = *boost::polymorphic_downcast<openvrml::sfrotation *>( &robj_sfdata.field_value()); @@ -3807,10 +3828,10 @@ OPENVRML_DEFINE_MEMBER_JSNATIVE(SFRotation, multVec) { - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const openvrml::sfrotation & thisRot = *boost::polymorphic_downcast<openvrml::sfrotation *>( &obj_sfdata.field_value()); @@ -3825,9 +3846,9 @@ return JS_FALSE; } - assert(JS_GetPrivate(cx, vec_obj)); + assert(js_get_private(cx, vec_obj)); const sfield::sfdata & arg_sfdata = - *static_cast<sfdata *>(JS_GetPrivate(cx, vec_obj)); + *static_cast<sfdata *>(js_get_private(cx, vec_obj)); const openvrml::sfvec3f & argVec = *boost::polymorphic_downcast<openvrml::sfvec3f *>( &arg_sfdata.field_value()); @@ -3842,9 +3863,9 @@ js_construct_object(cx, &SFVec3f::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); sfield::sfdata & robj_sfdata = - *static_cast<sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfdata *>(js_get_private(cx, robj)); openvrml::sfvec3f & resultVec = *boost::polymorphic_downcast<openvrml::sfvec3f *>( &robj_sfdata.field_value()); @@ -3858,10 +3879,10 @@ OPENVRML_DEFINE_MEMBER_JSNATIVE(SFRotation, setAxis) { - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); openvrml::sfrotation & thisRot = *boost::polymorphic_downcast<openvrml::sfrotation *>( &obj_sfdata.field_value()); @@ -3876,9 +3897,9 @@ return JS_FALSE; } - assert(JS_GetPrivate(cx, vec_obj)); + assert(js_get_private(cx, vec_obj)); const sfield::sfdata & arg_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, vec_obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, vec_obj)); const openvrml::sfvec3f & argVec = *boost::polymorphic_downcast<openvrml::sfvec3f *>( &arg_sfdata.field_value()); @@ -3898,10 +3919,10 @@ OPENVRML_DEFINE_MEMBER_JSNATIVE(SFRotation, slerp) { - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const openvrml::sfrotation & thisRot = *boost::polymorphic_downcast<openvrml::sfrotation *>( &obj_sfdata.field_value()); @@ -3917,9 +3938,9 @@ return JS_FALSE; } - assert(JS_GetPrivate(cx, dest_obj)); + assert(js_get_private(cx, dest_obj)); const sfield::sfdata & dest_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, dest_obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, dest_obj)); const openvrml::sfrotation & dest = *boost::polymorphic_downcast<openvrml::sfrotation *>( &dest_sfdata.field_value()); @@ -3934,9 +3955,9 @@ js_construct_object(cx, &SFRotation::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); openvrml::sfrotation & resultRot = *boost::polymorphic_downcast<openvrml::sfrotation *>( &robj_sfdata.field_value()); @@ -4011,9 +4032,9 @@ JSObject * const sfvec2Obj = js_construct_object(cx, &jsclass, 0, obj); if (!sfvec2Obj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, sfvec2Obj)); + assert(js_get_private(cx, sfvec2Obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, sfvec2Obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, sfvec2Obj)); try { boost::polymorphic_downcast<field_type *>(&sfdata.field_value()) @@ -4036,9 +4057,9 @@ if (!JS_InstanceOf(cx, obj, &jsclass, 0)) { throw bad_conversion("SFVec2f object expected."); } - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); return auto_ptr<field_type>(boost::polymorphic_downcast<field_type *>( sfdata.field_value().clone().release())); } @@ -4095,7 +4116,7 @@ auto_ptr<sfvec2_t> sfvec2(new sfvec2_t(vec2)); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfvec2.get())); sfvec2.release(); - if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; } + if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; } sfdata.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -4116,9 +4137,9 @@ if (jspropertyop_id_is_int(id) && jspropertyop_id_to_int(id) >= 0 && jspropertyop_id_to_int(id) < 2) { - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); const sfvec2_t & thisVec = *boost::polymorphic_downcast<sfvec2_t *>(&sfdata.field_value()); @@ -4139,9 +4160,9 @@ if (jspropertyop_id_is_int(id) && jspropertyop_id_to_int(id) >= 0 && jspropertyop_id_to_int(id) < 2) { - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); sfvec2_t & thisVec = *boost::polymorphic_downcast<sfvec2_t *>(&sfdata.field_value()); @@ -4174,10 +4195,10 @@ { typedef typename SFVec2::field_type sfvec2_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec2_t & thisVec = *boost::polymorphic_downcast<sfvec2_t *>(&obj_sfdata.field_value()); @@ -4195,9 +4216,9 @@ return JS_FALSE; } - assert(JS_GetPrivate(cx, arg_obj)); + assert(js_get_private(cx, arg_obj)); const sfield::sfdata & arg_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, arg_obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, arg_obj)); const sfvec2_t & argVec = *boost::polymorphic_downcast<sfvec2_t *>(&arg_sfdata.field_value()); @@ -4211,9 +4232,9 @@ js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); sfvec2_t & resultVec = *boost::polymorphic_downcast<sfvec2_t *>(&robj_sfdata.field_value()); @@ -4228,10 +4249,10 @@ { typedef typename SFVec2::field_type sfvec2_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec2_t & thisVec = *boost::polymorphic_downcast<sfvec2_t *>(&obj_sfdata.field_value()); @@ -4254,9 +4275,9 @@ js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); sfvec2_t & resultVec = *boost::polymorphic_downcast<sfvec2_t *>(&robj_sfdata.field_value()); @@ -4271,10 +4292,10 @@ { typedef typename SFVec2::field_type sfvec2_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec2_t & thisVec = *boost::polymorphic_downcast<sfvec2_t *>(&sfdata.field_value()); @@ -4292,9 +4313,9 @@ return JS_FALSE; } - assert(JS_GetPrivate(cx, arg_obj)); + assert(js_get_private(cx, arg_obj)); const sfield::sfdata & arg_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, arg_obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, arg_obj)); const sfvec2_t & argVec = *boost::polymorphic_downcast<sfvec2_t *>(&arg_sfdata.field_value()); @@ -4310,10 +4331,10 @@ { typedef typename SFVec2::field_type sfvec2_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec2_t & thisVec = *boost::polymorphic_downcast<sfvec2_t *>(&sfdata.field_value()); @@ -4329,10 +4350,10 @@ { typedef typename SFVec2::field_type sfvec2_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec2_t & thisVec = *boost::polymorphic_downcast<sfvec2_t *>(&obj_sfdata.field_value()); @@ -4355,9 +4376,9 @@ js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); sfvec2_t & resultVec = *boost::polymorphic_downcast<sfvec2_t *>(&robj_sfdata.field_value()); @@ -4372,10 +4393,10 @@ { typedef typename SFVec2::field_type sfvec2_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec2_t & thisVec = *boost::polymorphic_downcast<sfvec2_t *>(&obj_sfdata.field_value()); @@ -4389,9 +4410,9 @@ js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); sfvec2_t & resultVec = *boost::polymorphic_downcast<sfvec2_t *>(&robj_sfdata.field_value()); @@ -4406,10 +4427,10 @@ { typedef typename SFVec2::field_type sfvec2_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec2_t & thisVec = *boost::polymorphic_downcast<sfvec2_t *>(&obj_sfdata.field_value()); @@ -4423,9 +4444,9 @@ js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); sfvec2_t & resultVec = *boost::polymorphic_downcast<sfvec2_t *>(&robj_sfdata.field_value()); @@ -4440,10 +4461,10 @@ { typedef typename SFVec2::field_type sfvec2_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec2_t & thisVec = *boost::polymorphic_downcast<sfvec2_t *>(&obj_sfdata.field_value()); @@ -4461,9 +4482,9 @@ return JS_FALSE; } - assert(JS_GetPrivate(cx, arg_obj)); + assert(js_get_private(cx, arg_obj)); const sfield::sfdata & arg_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, arg_obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, arg_obj)); const sfvec2_t & argVec = *boost::polymorphic_downcast<sfvec2_t *>(&arg_sfdata.field_value()); @@ -4477,9 +4498,9 @@ js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); sfvec2_t & resultVec = *boost::polymorphic_downcast<sfvec2_t *>(&robj_sfdata.field_value()); @@ -4519,9 +4540,9 @@ JSObject * const sfvec2dObj = js_construct_object(cx, &jsclass, 0, obj); if (!sfvec2dObj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, sfvec2dObj)); + assert(js_get_private(cx, sfvec2dObj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, sfvec2dObj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, sfvec2dObj)); try { boost::polymorphic_downcast<openvrml::sfvec2d *>( @@ -4544,9 +4565,9 @@ if (!JS_InstanceOf(cx, obj, &SFVec2d::jsclass, 0)) { throw bad_conversion("SFVec2d object expected"); } - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); return auto_ptr<openvrml::sfvec2d>( boost::polymorphic_downcast<openvrml::sfvec2d *>( sfdata.field_value().clone().release())); @@ -4618,9 +4639,9 @@ JSObject * const sfvec3fObj = js_construct_object(cx, &jsclass, 0, obj); if (!sfvec3fObj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, sfvec3fObj)); + assert(js_get_private(cx, sfvec3fObj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, sfvec3fObj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, sfvec3fObj)); try { boost::polymorphic_downcast<openvrml::sfvec3f *>( @@ -4643,9 +4664,9 @@ if (!JS_InstanceOf(cx, obj, &SFVec3f::jsclass, 0)) { throw bad_conversion("SFVec3f object expected."); } - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); return auto_ptr<openvrml::sfvec3f>( boost::polymorphic_downcast<openvrml::sfvec3f *>( sfdata.field_value().clone().release())); @@ -4704,7 +4725,7 @@ auto_ptr<sfvec3_t> sfvec3(new sfvec3_t(vec3)); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfvec3.get())); sfvec3.release(); - if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; } + if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; } sfdata.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -4724,9 +4745,9 @@ if (jspropertyop_id_is_int(id) && jspropertyop_id_to_int(id) >= 0 && jspropertyop_id_to_int(id) < 3) { - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); const sfvec3_t & thisVec = *boost::polymorphic_downcast<sfvec3_t *>(&sfdata.field_value()); @@ -4747,9 +4768,9 @@ if (jspropertyop_id_is_int(id) && jspropertyop_id_to_int(id) >= 0 && jspropertyop_id_to_int(id) < 3) { - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); sfvec3_t & thisVec = *boost::polymorphic_downcast<sfvec3_t *>(&sfdata.field_value()); @@ -4785,10 +4806,10 @@ { typedef typename SFVec3::field_type sfvec3_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec3_t & thisVec = *boost::polymorphic_downcast<sfvec3_t *>(&obj_sfdata.field_value()); @@ -4806,9 +4827,9 @@ return JS_FALSE; } - assert(JS_GetPrivate(cx, arg_obj)); + assert(js_get_private(cx, arg_obj)); const sfield::sfdata & arg_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, arg_obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, arg_obj)); const sfvec3_t & argVec = *boost::polymorphic_downcast<sfvec3_t *>(&arg_sfdata.field_value()); @@ -4822,9 +4843,9 @@ js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); sfvec3_t & resultVec = *boost::polymorphic_downcast<sfvec3_t *>(&robj_sfdata.field_value()); @@ -4839,10 +4860,10 @@ { typedef typename SFVec3::field_type sfvec3_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec3_t & thisVec = *boost::polymorphic_downcast<sfvec3_t *>(&obj_sfdata.field_value()); @@ -4860,9 +4881,9 @@ return JS_FALSE; } - assert(JS_GetPrivate(cx, arg_obj)); + assert(js_get_private(cx, arg_obj)); const sfield::sfdata & arg_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, arg_obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, arg_obj)); const sfvec3_t & argVec = *boost::polymorphic_downcast<sfvec3_t *>(&arg_sfdata.field_value()); @@ -4876,9 +4897,9 @@ js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) {return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); sfield::sfdata & robj_sfdata = - *static_cast<sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfdata *>(js_get_private(cx, robj)); sfvec3_t & resultVec = *boost::polymorphic_downcast<sfvec3_t *>(&robj_sfdata.field_value()); @@ -4893,10 +4914,10 @@ { typedef typename SFVec3::field_type sfvec3_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec3_t & thisVec = *boost::polymorphic_downcast<sfvec3_t *>(&obj_sfdata.field_value()); @@ -4919,9 +4940,9 @@ js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); sfvec3_t & resultVec = *boost::polymorphic_downcast<sfvec3_t *>(&robj_sfdata.field_value()); @@ -4936,10 +4957,10 @@ { typedef typename SFVec3::field_type sfvec3_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec3_t & thisVec = *boost::polymorphic_downcast<sfvec3_t *>(&obj_sfdata.field_value()); @@ -4957,9 +4978,9 @@ return JS_FALSE; } - assert(JS_GetPrivate(cx, arg_obj)); + assert(js_get_private(cx, arg_obj)); const sfield::sfdata & arg_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, arg_obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, arg_obj)); const sfvec3_t & argVec = *boost::polymorphic_downcast<sfvec3_t *>(&arg_sfdata.field_value()); @@ -4975,10 +4996,10 @@ { typedef typename SFVec3::field_type sfvec3_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec3_t & thisVec = *boost::polymorphic_downcast<sfvec3_t *>(&sfdata.field_value()); @@ -4994,10 +5015,10 @@ { typedef typename SFVec3::field_type sfvec3_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec3_t & thisVec = *boost::polymorphic_downcast<sfvec3_t *>(&obj_sfdata.field_value()); @@ -5020,9 +5041,9 @@ js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); const sfield::sfdata & arg_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); sfvec3_t & resultVec = *boost::polymorphic_downcast<sfvec3_t *>(&arg_sfdata.field_value()); @@ -5037,10 +5058,10 @@ { typedef typename SFVec3::field_type sfvec3_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec3_t & thisVec = *boost::polymorphic_downcast<sfvec3_t *>(&obj_sfdata.field_value()); @@ -5054,9 +5075,9 @@ js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); const sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); sfvec3_t & resultVec = *boost::polymorphic_downcast<sfvec3_t *>(&robj_sfdata.field_value()); @@ -5071,10 +5092,10 @@ { typedef typename SFVec3::field_type sfvec3_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec3_t & thisVec = *boost::polymorphic_downcast<sfvec3_t *>(&obj_sfdata.field_value()); @@ -5088,9 +5109,9 @@ js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); sfvec3_t & resultVec = *boost::polymorphic_downcast<sfvec3_t *>(&robj_sfdata.field_value()); @@ -5105,10 +5126,10 @@ { typedef typename SFVec3::field_type sfvec3_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec3_t & thisVec = *boost::polymorphic_downcast<sfvec3_t *>(&obj_sfdata.field_value()); @@ -5126,9 +5147,9 @@ return JS_FALSE; } - assert(JS_GetPrivate(cx, arg_obj)); + assert(js_get_private(cx, arg_obj)); const sfield::sfdata & arg_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, arg_obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, arg_obj)); const sfvec3_t & argVec = *boost::polymorphic_downcast<sfvec3_t *>(&arg_sfdata.field_value()); @@ -5142,9 +5163,9 @@ js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); sfvec3_t & resultVec = *boost::polymorphic_downcast<sfvec3_t *>(&robj_sfdata.field_value()); @@ -5183,9 +5204,9 @@ JSObject * const sfvec3dObj = js_construct_object(cx, &jsclass, 0, obj); if (!sfvec3dObj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, sfvec3dObj)); + assert(js_get_private(cx, sfvec3dObj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, sfvec3dObj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, sfvec3dObj)); try { boost::polymorphic_downcast<openvrml::sfvec3d *>( @@ -5208,9 +5229,9 @@ if (!JS_InstanceOf(cx, obj, &SFVec3d::jsclass, 0)) { throw bad_conversion("SFVec3d object expected"); } - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); return auto_ptr<openvrml::sfvec3d>( boost::polymorphic_downcast<openvrml::sfvec3d *>( sfdata.field_value().clone().release())); @@ -5258,7 +5279,7 @@ assert(cx); assert(obj); assert(vp); - MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj)); + MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj)); assert(mfdata); if (jspropertyop_id_is_int(id) @@ -5279,7 +5300,7 @@ assert(obj); assert(vp); const MFData * const mfdata = - static_cast<MFData *>(JS_GetPrivate(cx, obj)); + static_cast<MFData *>(js_get_private(cx, obj)); assert(mfdata); *vp = INT_TO_JSVAL(mfdata->array.size()); @@ -5358,7 +5379,7 @@ // AddRoots(cx, mfdata->array); - if (!JS_SetPrivate(cx, obj, mfdata.get())) { return JS_FALSE; } + if (!js_set_private(cx, obj, mfdata.get())) { return JS_FALSE; } mfdata.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -5375,7 +5396,7 @@ assert(vp); if (jspropertyop_id_is_int(id) && jspropertyop_id_to_int(id) > 0) { - MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj)); + MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj)); assert(mfdata); // @@ -5417,7 +5438,7 @@ assert(obj); assert(vp); - MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj)); + MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj)); assert(mfdata); uint32_t new_length; @@ -5478,7 +5499,7 @@ { MFData * const mfdata = static_cast<MFData *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); assert(mfdata); std::ostringstream out; @@ -5487,7 +5508,7 @@ assert(JSVAL_IS_OBJECT(mfdata->array[i])); const sfield::sfdata * const sfdata = static_cast<sfield::sfdata *> - (JS_GetPrivate(cx, JSVAL_TO_OBJECT(mfdata->array[i]))); + (js_get_private(cx, JSVAL_TO_OBJECT(mfdata->array[i]))); assert(sfdata); out << sfdata->field_value(); if ((i + 1) < mfdata->array.size()) { out << ", "; } @@ -5506,11 +5527,11 @@ { assert(cx); assert(obj); - MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj)); + MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj)); if (mfdata) { RemoveRoots(cx, mfdata->array); delete mfdata; - JS_SetPrivate(cx, obj, 0); + js_set_private(cx, obj, 0); } } @@ -5574,7 +5595,7 @@ } } - if (!JS_SetPrivate(cx, obj, mfdata.get())) { return JS_FALSE; } + if (!js_set_private(cx, obj, mfdata.get())) { return JS_FALSE; } // // Protect array values from gc. @@ -5594,7 +5615,7 @@ OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(MFJSDouble<Subclass>, setElement) { if (jspropertyop_id_is_int(id) && jspropertyop_id_to_int(id) >= 0) { - MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj)); + MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj)); assert(mfdata); // @@ -5635,7 +5656,7 @@ assert(obj); assert(vp); - MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj)); + MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj)); assert(mfdata); uint32_t new_length; @@ -5695,7 +5716,7 @@ { MFData * const mfdata = static_cast<MFData *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); assert(mfdata); std::ostringstream out; @@ -5717,11 +5738,11 @@ void MFJSDouble<Subclass>::finalize(JSContext * const cx, JSObject * const obj) OPENVRML_NOTHROW { - MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj)); + MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj)); if (mfdat... [truncated message content] |
From: <br...@us...> - 2012-08-19 01:58:47
|
Revision: 4309 http://openvrml.svn.sourceforge.net/openvrml/?rev=4309&view=rev Author: braden Date: 2012-08-19 01:58:40 +0000 (Sun, 19 Aug 2012) Log Message: ----------- XULRunner 14.0 removes the JSContext argument from JS_{Get,Set}Private. Modified Paths: -------------- trunk/ChangeLog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2012-08-19 01:57:59 UTC (rev 4308) +++ trunk/ChangeLog 2012-08-19 01:58:40 UTC (rev 4309) @@ -1,4 +1,4 @@ -2012-07-26 Braden McDaniel <br...@en...> +2012-08-18 Braden McDaniel <br...@en...> XULRunner 14.0 removes the JSContext argument from JS_{Get,Set}Private. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-08-19 01:58:07
|
Revision: 4308 http://openvrml.svn.sourceforge.net/openvrml/?rev=4308&view=rev Author: braden Date: 2012-08-19 01:57:59 +0000 (Sun, 19 Aug 2012) Log Message: ----------- XULRunner 14.0 removes the JSContext argument from JS_{Get,Set}Private. Modified Paths: -------------- trunk/ChangeLog trunk/configure.ac trunk/src/script/javascript.cpp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2012-07-26 22:12:19 UTC (rev 4307) +++ trunk/ChangeLog 2012-08-19 01:57:59 UTC (rev 4308) @@ -1,5 +1,13 @@ 2012-07-26 Braden McDaniel <br...@en...> + XULRunner 14.0 removes the JSContext argument from + JS_{Get,Set}Private. + + * configure.ac + * src/script/javascript.cpp + +2012-07-26 Braden McDaniel <br...@en...> + XULRunner 14.0 removes JS_FinalizeStub. * configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2012-07-26 22:12:19 UTC (rev 4307) +++ trunk/configure.ac 2012-08-19 01:57:59 UTC (rev 4308) @@ -236,7 +236,7 @@ AC_LANG_PUSH([C++]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM( [[#include <jsapi.h>]], -[[JSBool (*f)(JSContext *, uintN, jsval *); JSNative g = f;]])], +[[JSBool (*f)(JSContext *, unsigned, jsval *); JSNative g = f;]])], [ov_cv_fast_jsnative=yes]) AC_LANG_POP([C++]) CPPFLAGS=$ov_save_CPPFLAGS @@ -294,8 +294,8 @@ ov_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$JS_CFLAGS $CPPFLAGS" AC_LANG_ASSERT([C]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM( -[[#include <jsapi.h]], +AC_LINK_IFELSE([AC_LANG_PROGRAM( +[[#include <jsapi.h>]], [[JS_FinalizeStub(0, 0)]])], [ov_cv_js_has_finalizestub=yes]) CPPFLAGS=$ov_save_CPPFLAGS @@ -305,6 +305,25 @@ [Defined if JS_FinalizeStub is declared in jsapi.h])]) # +# XULRunner 14.0 removes the JSContext argument from JS_{Set,Get}Private. +# +AC_CACHE_CHECK([whether SpiderMonkey JS_SetPrivate is used without a JSContext], +[ov_cv_js_private_without_context], +[ov_cv_js_private_without_context=no +ov_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$JS_CFLAGS $CPPFLAGS" +AC_LANG_ASSERT([C]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM( +[[#include <jsapi.h>]], +[[JS_SetPrivate(0, 0)]])], +[ov_cv_js_private_without_context=yes]) +CPPFLAGS=$ov_save_CPPFLAGS +]) +AS_IF([test X$ov_cv_js_private_without_context = Xyes], + [AC_DEFINE([OPENVRML_JS_PRIVATE_WITHOUT_CONTEXT], [1], + [Defined if JS_SetContext does not take a JSContext 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-07-26 22:12:19 UTC (rev 4307) +++ trunk/src/script/javascript.cpp 2012-08-19 01:57:59 UTC (rev 4308) @@ -143,7 +143,28 @@ # endif } + OPENVRML_LOCAL + void * js_get_private(JSContext * const cx, JSObject * const obj) + { +# ifdef OPENVRML_JS_PRIVATE_WITHOUT_CONTEXT + return JS_GetPrivate(obj); +# else + return JS_GetPrivate(cx, obj); +# endif + } + OPENVRML_LOCAL + void js_set_private(JSContext * const cx, JSObject * const obj, + void * const data) + { +# ifdef OPENVRML_JS_PRIVATE_WITHOUT_CONTEXT + JS_SetPrivate(obj, data); +# else + JS_SetPrivate(cx, obj, data); +# endif + } + + # ifdef OPENVRML_FAST_JSNATIVE # define OPENVRML_DECLARE_JSNATIVE(name) \ JSBool (name)(JSContext * cx, unsigned argc, jsval * vp) @@ -1258,7 +1279,7 @@ if (JSVAL_IS_OBJECT(val)) { field_data * fieldData = static_cast<field_data *> - (JS_GetPrivate(this->cx, JSVAL_TO_OBJECT(val))); + (js_get_private(this->cx, JSVAL_TO_OBJECT(val))); if (fieldData->changed) { using std::auto_ptr; auto_ptr<openvrml::field_value> fieldValue = @@ -2600,16 +2621,16 @@ void sfield::finalize(JSContext * const cx, JSObject * const obj) OPENVRML_NOTHROW { - delete static_cast<field_data *>(JS_GetPrivate(cx, obj)); - JS_SetPrivate(cx, obj, 0); + delete static_cast<field_data *>(js_get_private(cx, obj)); + js_set_private(cx, obj, 0); } OPENVRML_DEFINE_MEMBER_JSNATIVE(sfield, toString) { - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); std::ostringstream out; out << sfdata.field_value(); @@ -2675,9 +2696,9 @@ JSObject * const sfcolorObj = js_construct_object(cx, &jsclass, 0, obj); if (!sfcolorObj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, sfcolorObj)); + assert(js_get_private(cx, sfcolorObj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, sfcolorObj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, sfcolorObj)); try { boost::polymorphic_downcast<openvrml::sfcolor *>(&sfdata.field_value()) @@ -2701,9 +2722,9 @@ if (!obj || !JS_InstanceOf(cx, obj, &SFColor::jsclass, 0)) { throw bad_conversion("SFColor object expected."); } - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); return auto_ptr<openvrml::sfcolor>( boost::polymorphic_downcast<openvrml::sfcolor *>( @@ -2758,7 +2779,7 @@ float(rgb[2])))); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfcolor.get())); sfcolor.release(); - if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; } + if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; } sfdata.release(); } catch (std::exception & ex) { OPENVRML_PRINT_EXCEPTION_(ex); @@ -2776,9 +2797,9 @@ jsval * const rval) OPENVRML_NOTHROW { - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); const openvrml::sfcolor & thisColor = *boost::polymorphic_downcast<openvrml::sfcolor *>( &sfdata.field_value()); @@ -2797,9 +2818,9 @@ OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(SFColor, setProperty) { - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); openvrml::sfcolor & thisColor = *boost::polymorphic_downcast<openvrml::sfcolor *>( &sfdata.field_value()); @@ -2843,10 +2864,10 @@ OPENVRML_DEFINE_MEMBER_JSNATIVE(SFColor, setHSV) { - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); sfield::sfdata & sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); openvrml::sfcolor & thisColor = *boost::polymorphic_downcast<openvrml::sfcolor *>( &sfdata.field_value()); @@ -2880,10 +2901,10 @@ OPENVRML_DEFINE_MEMBER_JSNATIVE(SFColor, getHSV) { - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const openvrml::sfcolor & thisColor = *boost::polymorphic_downcast<openvrml::sfcolor *>( &sfdata.field_value()); @@ -2963,7 +2984,7 @@ std::auto_ptr<sfield::sfdata> sfdata( new sfield::sfdata(sfimageClone.get())); sfimageClone.release(); - if (!JS_SetPrivate(cx, sfimageObj, sfdata.get())) { return JS_FALSE; } + if (!js_set_private(cx, sfimageObj, sfdata.get())) { return JS_FALSE; } sfdata.release(); } catch (std::exception & ex) { OPENVRML_PRINT_EXCEPTION_(ex); @@ -2985,9 +3006,9 @@ if (!JS_InstanceOf(cx, obj, &SFImage::jsclass, 0)) { throw bad_conversion("SFImage object expected."); } - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); return auto_ptr<openvrml::sfimage>( boost::polymorphic_downcast<openvrml::sfimage *>( sfdata.field_value().clone().release())); @@ -3051,7 +3072,7 @@ if (pixels_obj) { assert(JS_InstanceOf(cx, pixels_obj, &MFInt32::jsclass, 0)); MField::MFData * const mfdata = - static_cast<MField::MFData *>(JS_GetPrivate(cx, pixels_obj)); + static_cast<MField::MFData *>(js_get_private(cx, pixels_obj)); pixels_t::iterator pixelPtr = pixels.begin(); for (MField::JsvalArray::size_type i(0); @@ -3077,7 +3098,7 @@ openvrml::image(x, y, comp, pixels))); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfimage.get())); sfimage.release(); - if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; } + if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; } sfdata.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -3098,9 +3119,9 @@ jsval * const vp) OPENVRML_NOTHROW { - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); const openvrml::sfimage & thisImage = *boost::polymorphic_downcast<openvrml::sfimage *>( &sfdata.field_value()); @@ -3220,7 +3241,7 @@ auto_ptr<openvrml::sfnode> sfnodeClone(new openvrml::sfnode(node)); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfnodeClone.get())); sfnodeClone.release(); - if (!JS_SetPrivate(cx, sfnodeObj, sfdata.get())) { return JS_FALSE; } + if (!js_set_private(cx, sfnodeObj, sfdata.get())) { return JS_FALSE; } sfdata.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -3242,9 +3263,9 @@ if (!JS_InstanceOf(cx, obj, &sfnode_jsclass, 0)) { throw bad_conversion("SFNode object expected."); } - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); return auto_ptr<openvrml::sfnode>( boost::polymorphic_downcast<openvrml::sfnode *>( sfdata.field_value().clone().release())); @@ -3314,7 +3335,7 @@ auto_ptr<openvrml::sfnode> sfnode(new openvrml::sfnode(nodes[0])); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfnode.get())); sfnode.release(); - if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; } + if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; } sfdata.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -3334,9 +3355,9 @@ { if (!jspropertyop_id_is_string(id)) { return JS_TRUE; } - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); const openvrml::sfnode & thisNode = *boost::polymorphic_downcast<openvrml::sfnode *>( &sfdata.field_value()); @@ -3365,9 +3386,9 @@ using std::auto_ptr; using std::string; - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); openvrml::sfnode & thisNode = *boost::polymorphic_downcast<openvrml::sfnode *>( &sfdata.field_value()); @@ -3474,9 +3495,9 @@ JSObject * const sfrotationObj = js_construct_object(cx, &jsclass, 0, obj); if (!sfrotationObj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, sfrotationObj)); + assert(js_get_private(cx, sfrotationObj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, sfrotationObj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, sfrotationObj)); try { boost::polymorphic_downcast<openvrml::sfrotation *>( @@ -3500,9 +3521,9 @@ if (!JS_InstanceOf(cx, obj, &SFRotation::jsclass, 0)) { throw bad_conversion("SFRotation object expected."); } - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); return auto_ptr<openvrml::sfrotation>( boost::polymorphic_downcast<openvrml::sfrotation *>( sfdata.field_value().clone().release())); @@ -3523,9 +3544,9 @@ OPENVRML_JS_ARGV(cx, vp))) { return JS_FALSE; } - assert(JS_GetPrivate(cx, axis_obj)); + assert(js_get_private(cx, axis_obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, axis_obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, axis_obj)); const openvrml::sfvec3f & axis = *boost::polymorphic_downcast<openvrml::sfvec3f *>( &sfdata.field_value()); @@ -3548,16 +3569,16 @@ return JS_FALSE; } - assert(JS_GetPrivate(cx, from_obj)); + assert(js_get_private(cx, from_obj)); const sfield::sfdata & from_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, from_obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, from_obj)); const openvrml::sfvec3f & from_vec = *boost::polymorphic_downcast<openvrml::sfvec3f *>( &from_sfdata.field_value()); - assert(JS_GetPrivate(cx, to_obj)); + assert(js_get_private(cx, to_obj)); const sfield::sfdata & to_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, to_obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, to_obj)); const openvrml::sfvec3f & to_vec = *boost::polymorphic_downcast<openvrml::sfvec3f *>( &to_sfdata.field_value()); @@ -3620,7 +3641,7 @@ float(rot[3])))); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfrotation.get())); sfrotation.release(); - if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; } + if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; } sfdata.release(); } catch (std::exception & ex) { OPENVRML_PRINT_EXCEPTION_(ex); @@ -3638,9 +3659,9 @@ jsval * const rval) OPENVRML_NOTHROW { - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); const openvrml::sfrotation & thisRot = *boost::polymorphic_downcast<openvrml::sfrotation *>( &sfdata.field_value()); @@ -3657,9 +3678,9 @@ OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(SFRotation, setProperty) { - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); openvrml::sfrotation & thisRot = *boost::polymorphic_downcast<openvrml::sfrotation *>( &sfdata.field_value()); @@ -3702,10 +3723,10 @@ OPENVRML_DEFINE_MEMBER_JSNATIVE(SFRotation, getAxis) { - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const openvrml::sfrotation & thisRot = *boost::polymorphic_downcast<openvrml::sfrotation *>( &obj_sfdata.field_value()); @@ -3715,9 +3736,9 @@ OPENVRML_JS_THIS_OBJECT(cx, vp)); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); const sfield::sfdata & robj_sfdata = - *static_cast<sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfdata *>(js_get_private(cx, robj)); openvrml::sfvec3f & resultVec = *boost::polymorphic_downcast<openvrml::sfvec3f *>( &robj_sfdata.field_value()); @@ -3729,10 +3750,10 @@ OPENVRML_DEFINE_MEMBER_JSNATIVE(SFRotation, inverse) { - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const openvrml::sfrotation & thisRot = *boost::polymorphic_downcast<openvrml::sfrotation *>( &obj_sfdata.field_value()); @@ -3744,9 +3765,9 @@ js_construct_object(cx, &SFRotation::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); const sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); openvrml::sfrotation & resultRot = *boost::polymorphic_downcast<openvrml::sfrotation *>( &robj_sfdata.field_value()); @@ -3758,10 +3779,10 @@ OPENVRML_DEFINE_MEMBER_JSNATIVE(SFRotation, multiply) { - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const openvrml::sfrotation & thisRot = *boost::polymorphic_downcast<openvrml::sfrotation *>( &obj_sfdata.field_value()); @@ -3776,9 +3797,9 @@ return JS_FALSE; } - assert(JS_GetPrivate(cx, rot_obj)); + assert(js_get_private(cx, rot_obj)); const sfield::sfdata & arg_sfdata = - *static_cast<sfdata *>(JS_GetPrivate(cx, rot_obj)); + *static_cast<sfdata *>(js_get_private(cx, rot_obj)); const openvrml::sfrotation & argRot = *boost::polymorphic_downcast<openvrml::sfrotation *>( &arg_sfdata.field_value()); @@ -3793,9 +3814,9 @@ js_construct_object(cx, &SFRotation::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); const sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); openvrml::sfrotation & resultRot = *boost::polymorphic_downcast<openvrml::sfrotation *>( &robj_sfdata.field_value()); @@ -3807,10 +3828,10 @@ OPENVRML_DEFINE_MEMBER_JSNATIVE(SFRotation, multVec) { - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const openvrml::sfrotation & thisRot = *boost::polymorphic_downcast<openvrml::sfrotation *>( &obj_sfdata.field_value()); @@ -3825,9 +3846,9 @@ return JS_FALSE; } - assert(JS_GetPrivate(cx, vec_obj)); + assert(js_get_private(cx, vec_obj)); const sfield::sfdata & arg_sfdata = - *static_cast<sfdata *>(JS_GetPrivate(cx, vec_obj)); + *static_cast<sfdata *>(js_get_private(cx, vec_obj)); const openvrml::sfvec3f & argVec = *boost::polymorphic_downcast<openvrml::sfvec3f *>( &arg_sfdata.field_value()); @@ -3842,9 +3863,9 @@ js_construct_object(cx, &SFVec3f::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); sfield::sfdata & robj_sfdata = - *static_cast<sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfdata *>(js_get_private(cx, robj)); openvrml::sfvec3f & resultVec = *boost::polymorphic_downcast<openvrml::sfvec3f *>( &robj_sfdata.field_value()); @@ -3858,10 +3879,10 @@ OPENVRML_DEFINE_MEMBER_JSNATIVE(SFRotation, setAxis) { - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); openvrml::sfrotation & thisRot = *boost::polymorphic_downcast<openvrml::sfrotation *>( &obj_sfdata.field_value()); @@ -3876,9 +3897,9 @@ return JS_FALSE; } - assert(JS_GetPrivate(cx, vec_obj)); + assert(js_get_private(cx, vec_obj)); const sfield::sfdata & arg_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, vec_obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, vec_obj)); const openvrml::sfvec3f & argVec = *boost::polymorphic_downcast<openvrml::sfvec3f *>( &arg_sfdata.field_value()); @@ -3898,10 +3919,10 @@ OPENVRML_DEFINE_MEMBER_JSNATIVE(SFRotation, slerp) { - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const openvrml::sfrotation & thisRot = *boost::polymorphic_downcast<openvrml::sfrotation *>( &obj_sfdata.field_value()); @@ -3917,9 +3938,9 @@ return JS_FALSE; } - assert(JS_GetPrivate(cx, dest_obj)); + assert(js_get_private(cx, dest_obj)); const sfield::sfdata & dest_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, dest_obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, dest_obj)); const openvrml::sfrotation & dest = *boost::polymorphic_downcast<openvrml::sfrotation *>( &dest_sfdata.field_value()); @@ -3934,9 +3955,9 @@ js_construct_object(cx, &SFRotation::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); openvrml::sfrotation & resultRot = *boost::polymorphic_downcast<openvrml::sfrotation *>( &robj_sfdata.field_value()); @@ -4011,9 +4032,9 @@ JSObject * const sfvec2Obj = js_construct_object(cx, &jsclass, 0, obj); if (!sfvec2Obj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, sfvec2Obj)); + assert(js_get_private(cx, sfvec2Obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, sfvec2Obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, sfvec2Obj)); try { boost::polymorphic_downcast<field_type *>(&sfdata.field_value()) @@ -4036,9 +4057,9 @@ if (!JS_InstanceOf(cx, obj, &jsclass, 0)) { throw bad_conversion("SFVec2f object expected."); } - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); return auto_ptr<field_type>(boost::polymorphic_downcast<field_type *>( sfdata.field_value().clone().release())); } @@ -4095,7 +4116,7 @@ auto_ptr<sfvec2_t> sfvec2(new sfvec2_t(vec2)); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfvec2.get())); sfvec2.release(); - if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; } + if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; } sfdata.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -4116,9 +4137,9 @@ if (jspropertyop_id_is_int(id) && jspropertyop_id_to_int(id) >= 0 && jspropertyop_id_to_int(id) < 2) { - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); const sfvec2_t & thisVec = *boost::polymorphic_downcast<sfvec2_t *>(&sfdata.field_value()); @@ -4139,9 +4160,9 @@ if (jspropertyop_id_is_int(id) && jspropertyop_id_to_int(id) >= 0 && jspropertyop_id_to_int(id) < 2) { - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); sfvec2_t & thisVec = *boost::polymorphic_downcast<sfvec2_t *>(&sfdata.field_value()); @@ -4174,10 +4195,10 @@ { typedef typename SFVec2::field_type sfvec2_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec2_t & thisVec = *boost::polymorphic_downcast<sfvec2_t *>(&obj_sfdata.field_value()); @@ -4195,9 +4216,9 @@ return JS_FALSE; } - assert(JS_GetPrivate(cx, arg_obj)); + assert(js_get_private(cx, arg_obj)); const sfield::sfdata & arg_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, arg_obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, arg_obj)); const sfvec2_t & argVec = *boost::polymorphic_downcast<sfvec2_t *>(&arg_sfdata.field_value()); @@ -4211,9 +4232,9 @@ js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); sfvec2_t & resultVec = *boost::polymorphic_downcast<sfvec2_t *>(&robj_sfdata.field_value()); @@ -4228,10 +4249,10 @@ { typedef typename SFVec2::field_type sfvec2_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec2_t & thisVec = *boost::polymorphic_downcast<sfvec2_t *>(&obj_sfdata.field_value()); @@ -4254,9 +4275,9 @@ js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); sfvec2_t & resultVec = *boost::polymorphic_downcast<sfvec2_t *>(&robj_sfdata.field_value()); @@ -4271,10 +4292,10 @@ { typedef typename SFVec2::field_type sfvec2_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec2_t & thisVec = *boost::polymorphic_downcast<sfvec2_t *>(&sfdata.field_value()); @@ -4292,9 +4313,9 @@ return JS_FALSE; } - assert(JS_GetPrivate(cx, arg_obj)); + assert(js_get_private(cx, arg_obj)); const sfield::sfdata & arg_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, arg_obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, arg_obj)); const sfvec2_t & argVec = *boost::polymorphic_downcast<sfvec2_t *>(&arg_sfdata.field_value()); @@ -4310,10 +4331,10 @@ { typedef typename SFVec2::field_type sfvec2_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec2_t & thisVec = *boost::polymorphic_downcast<sfvec2_t *>(&sfdata.field_value()); @@ -4329,10 +4350,10 @@ { typedef typename SFVec2::field_type sfvec2_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec2_t & thisVec = *boost::polymorphic_downcast<sfvec2_t *>(&obj_sfdata.field_value()); @@ -4355,9 +4376,9 @@ js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); sfvec2_t & resultVec = *boost::polymorphic_downcast<sfvec2_t *>(&robj_sfdata.field_value()); @@ -4372,10 +4393,10 @@ { typedef typename SFVec2::field_type sfvec2_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec2_t & thisVec = *boost::polymorphic_downcast<sfvec2_t *>(&obj_sfdata.field_value()); @@ -4389,9 +4410,9 @@ js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); sfvec2_t & resultVec = *boost::polymorphic_downcast<sfvec2_t *>(&robj_sfdata.field_value()); @@ -4406,10 +4427,10 @@ { typedef typename SFVec2::field_type sfvec2_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec2_t & thisVec = *boost::polymorphic_downcast<sfvec2_t *>(&obj_sfdata.field_value()); @@ -4423,9 +4444,9 @@ js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); sfvec2_t & resultVec = *boost::polymorphic_downcast<sfvec2_t *>(&robj_sfdata.field_value()); @@ -4440,10 +4461,10 @@ { typedef typename SFVec2::field_type sfvec2_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec2_t & thisVec = *boost::polymorphic_downcast<sfvec2_t *>(&obj_sfdata.field_value()); @@ -4461,9 +4482,9 @@ return JS_FALSE; } - assert(JS_GetPrivate(cx, arg_obj)); + assert(js_get_private(cx, arg_obj)); const sfield::sfdata & arg_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, arg_obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, arg_obj)); const sfvec2_t & argVec = *boost::polymorphic_downcast<sfvec2_t *>(&arg_sfdata.field_value()); @@ -4477,9 +4498,9 @@ js_construct_object(cx, &SFVec2::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); sfvec2_t & resultVec = *boost::polymorphic_downcast<sfvec2_t *>(&robj_sfdata.field_value()); @@ -4519,9 +4540,9 @@ JSObject * const sfvec2dObj = js_construct_object(cx, &jsclass, 0, obj); if (!sfvec2dObj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, sfvec2dObj)); + assert(js_get_private(cx, sfvec2dObj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, sfvec2dObj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, sfvec2dObj)); try { boost::polymorphic_downcast<openvrml::sfvec2d *>( @@ -4544,9 +4565,9 @@ if (!JS_InstanceOf(cx, obj, &SFVec2d::jsclass, 0)) { throw bad_conversion("SFVec2d object expected"); } - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); return auto_ptr<openvrml::sfvec2d>( boost::polymorphic_downcast<openvrml::sfvec2d *>( sfdata.field_value().clone().release())); @@ -4618,9 +4639,9 @@ JSObject * const sfvec3fObj = js_construct_object(cx, &jsclass, 0, obj); if (!sfvec3fObj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, sfvec3fObj)); + assert(js_get_private(cx, sfvec3fObj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, sfvec3fObj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, sfvec3fObj)); try { boost::polymorphic_downcast<openvrml::sfvec3f *>( @@ -4643,9 +4664,9 @@ if (!JS_InstanceOf(cx, obj, &SFVec3f::jsclass, 0)) { throw bad_conversion("SFVec3f object expected."); } - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); return auto_ptr<openvrml::sfvec3f>( boost::polymorphic_downcast<openvrml::sfvec3f *>( sfdata.field_value().clone().release())); @@ -4704,7 +4725,7 @@ auto_ptr<sfvec3_t> sfvec3(new sfvec3_t(vec3)); auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfvec3.get())); sfvec3.release(); - if (!JS_SetPrivate(cx, obj, sfdata.get())) { return JS_FALSE; } + if (!js_set_private(cx, obj, sfdata.get())) { return JS_FALSE; } sfdata.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -4724,9 +4745,9 @@ if (jspropertyop_id_is_int(id) && jspropertyop_id_to_int(id) >= 0 && jspropertyop_id_to_int(id) < 3) { - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); const sfvec3_t & thisVec = *boost::polymorphic_downcast<sfvec3_t *>(&sfdata.field_value()); @@ -4747,9 +4768,9 @@ if (jspropertyop_id_is_int(id) && jspropertyop_id_to_int(id) >= 0 && jspropertyop_id_to_int(id) < 3) { - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); sfvec3_t & thisVec = *boost::polymorphic_downcast<sfvec3_t *>(&sfdata.field_value()); @@ -4785,10 +4806,10 @@ { typedef typename SFVec3::field_type sfvec3_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec3_t & thisVec = *boost::polymorphic_downcast<sfvec3_t *>(&obj_sfdata.field_value()); @@ -4806,9 +4827,9 @@ return JS_FALSE; } - assert(JS_GetPrivate(cx, arg_obj)); + assert(js_get_private(cx, arg_obj)); const sfield::sfdata & arg_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, arg_obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, arg_obj)); const sfvec3_t & argVec = *boost::polymorphic_downcast<sfvec3_t *>(&arg_sfdata.field_value()); @@ -4822,9 +4843,9 @@ js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); sfvec3_t & resultVec = *boost::polymorphic_downcast<sfvec3_t *>(&robj_sfdata.field_value()); @@ -4839,10 +4860,10 @@ { typedef typename SFVec3::field_type sfvec3_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec3_t & thisVec = *boost::polymorphic_downcast<sfvec3_t *>(&obj_sfdata.field_value()); @@ -4860,9 +4881,9 @@ return JS_FALSE; } - assert(JS_GetPrivate(cx, arg_obj)); + assert(js_get_private(cx, arg_obj)); const sfield::sfdata & arg_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, arg_obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, arg_obj)); const sfvec3_t & argVec = *boost::polymorphic_downcast<sfvec3_t *>(&arg_sfdata.field_value()); @@ -4876,9 +4897,9 @@ js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) {return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); sfield::sfdata & robj_sfdata = - *static_cast<sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfdata *>(js_get_private(cx, robj)); sfvec3_t & resultVec = *boost::polymorphic_downcast<sfvec3_t *>(&robj_sfdata.field_value()); @@ -4893,10 +4914,10 @@ { typedef typename SFVec3::field_type sfvec3_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec3_t & thisVec = *boost::polymorphic_downcast<sfvec3_t *>(&obj_sfdata.field_value()); @@ -4919,9 +4940,9 @@ js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); sfvec3_t & resultVec = *boost::polymorphic_downcast<sfvec3_t *>(&robj_sfdata.field_value()); @@ -4936,10 +4957,10 @@ { typedef typename SFVec3::field_type sfvec3_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec3_t & thisVec = *boost::polymorphic_downcast<sfvec3_t *>(&obj_sfdata.field_value()); @@ -4957,9 +4978,9 @@ return JS_FALSE; } - assert(JS_GetPrivate(cx, arg_obj)); + assert(js_get_private(cx, arg_obj)); const sfield::sfdata & arg_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, arg_obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, arg_obj)); const sfvec3_t & argVec = *boost::polymorphic_downcast<sfvec3_t *>(&arg_sfdata.field_value()); @@ -4975,10 +4996,10 @@ { typedef typename SFVec3::field_type sfvec3_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec3_t & thisVec = *boost::polymorphic_downcast<sfvec3_t *>(&sfdata.field_value()); @@ -4994,10 +5015,10 @@ { typedef typename SFVec3::field_type sfvec3_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec3_t & thisVec = *boost::polymorphic_downcast<sfvec3_t *>(&obj_sfdata.field_value()); @@ -5020,9 +5041,9 @@ js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); const sfield::sfdata & arg_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); sfvec3_t & resultVec = *boost::polymorphic_downcast<sfvec3_t *>(&arg_sfdata.field_value()); @@ -5037,10 +5058,10 @@ { typedef typename SFVec3::field_type sfvec3_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec3_t & thisVec = *boost::polymorphic_downcast<sfvec3_t *>(&obj_sfdata.field_value()); @@ -5054,9 +5075,9 @@ js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); const sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); sfvec3_t & resultVec = *boost::polymorphic_downcast<sfvec3_t *>(&robj_sfdata.field_value()); @@ -5071,10 +5092,10 @@ { typedef typename SFVec3::field_type sfvec3_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec3_t & thisVec = *boost::polymorphic_downcast<sfvec3_t *>(&obj_sfdata.field_value()); @@ -5088,9 +5109,9 @@ js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); sfvec3_t & resultVec = *boost::polymorphic_downcast<sfvec3_t *>(&robj_sfdata.field_value()); @@ -5105,10 +5126,10 @@ { typedef typename SFVec3::field_type sfvec3_t; - assert(JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + assert(js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfield::sfdata & obj_sfdata = *static_cast<sfield::sfdata *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); const sfvec3_t & thisVec = *boost::polymorphic_downcast<sfvec3_t *>(&obj_sfdata.field_value()); @@ -5126,9 +5147,9 @@ return JS_FALSE; } - assert(JS_GetPrivate(cx, arg_obj)); + assert(js_get_private(cx, arg_obj)); const sfield::sfdata & arg_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, arg_obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, arg_obj)); const sfvec3_t & argVec = *boost::polymorphic_downcast<sfvec3_t *>(&arg_sfdata.field_value()); @@ -5142,9 +5163,9 @@ js_construct_object(cx, &SFVec3::jsclass, proto, parent); if (!robj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, robj)); + assert(js_get_private(cx, robj)); sfield::sfdata & robj_sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, robj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, robj)); sfvec3_t & resultVec = *boost::polymorphic_downcast<sfvec3_t *>(&robj_sfdata.field_value()); @@ -5183,9 +5204,9 @@ JSObject * const sfvec3dObj = js_construct_object(cx, &jsclass, 0, obj); if (!sfvec3dObj) { return JS_FALSE; } - assert(JS_GetPrivate(cx, sfvec3dObj)); + assert(js_get_private(cx, sfvec3dObj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, sfvec3dObj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, sfvec3dObj)); try { boost::polymorphic_downcast<openvrml::sfvec3d *>( @@ -5208,9 +5229,9 @@ if (!JS_InstanceOf(cx, obj, &SFVec3d::jsclass, 0)) { throw bad_conversion("SFVec3d object expected"); } - assert(JS_GetPrivate(cx, obj)); + assert(js_get_private(cx, obj)); const sfield::sfdata & sfdata = - *static_cast<sfield::sfdata *>(JS_GetPrivate(cx, obj)); + *static_cast<sfield::sfdata *>(js_get_private(cx, obj)); return auto_ptr<openvrml::sfvec3d>( boost::polymorphic_downcast<openvrml::sfvec3d *>( sfdata.field_value().clone().release())); @@ -5258,7 +5279,7 @@ assert(cx); assert(obj); assert(vp); - MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj)); + MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj)); assert(mfdata); if (jspropertyop_id_is_int(id) @@ -5279,7 +5300,7 @@ assert(obj); assert(vp); const MFData * const mfdata = - static_cast<MFData *>(JS_GetPrivate(cx, obj)); + static_cast<MFData *>(js_get_private(cx, obj)); assert(mfdata); *vp = INT_TO_JSVAL(mfdata->array.size()); @@ -5358,7 +5379,7 @@ // AddRoots(cx, mfdata->array); - if (!JS_SetPrivate(cx, obj, mfdata.get())) { return JS_FALSE; } + if (!js_set_private(cx, obj, mfdata.get())) { return JS_FALSE; } mfdata.release(); } catch (std::bad_alloc &) { JS_ReportOutOfMemory(cx); @@ -5375,7 +5396,7 @@ assert(vp); if (jspropertyop_id_is_int(id) && jspropertyop_id_to_int(id) > 0) { - MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj)); + MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj)); assert(mfdata); // @@ -5417,7 +5438,7 @@ assert(obj); assert(vp); - MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj)); + MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj)); assert(mfdata); uint32_t new_length; @@ -5478,7 +5499,7 @@ { MFData * const mfdata = static_cast<MFData *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); assert(mfdata); std::ostringstream out; @@ -5487,7 +5508,7 @@ assert(JSVAL_IS_OBJECT(mfdata->array[i])); const sfield::sfdata * const sfdata = static_cast<sfield::sfdata *> - (JS_GetPrivate(cx, JSVAL_TO_OBJECT(mfdata->array[i]))); + (js_get_private(cx, JSVAL_TO_OBJECT(mfdata->array[i]))); assert(sfdata); out << sfdata->field_value(); if ((i + 1) < mfdata->array.size()) { out << ", "; } @@ -5506,11 +5527,11 @@ { assert(cx); assert(obj); - MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj)); + MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj)); if (mfdata) { RemoveRoots(cx, mfdata->array); delete mfdata; - JS_SetPrivate(cx, obj, 0); + js_set_private(cx, obj, 0); } } @@ -5574,7 +5595,7 @@ } } - if (!JS_SetPrivate(cx, obj, mfdata.get())) { return JS_FALSE; } + if (!js_set_private(cx, obj, mfdata.get())) { return JS_FALSE; } // // Protect array values from gc. @@ -5594,7 +5615,7 @@ OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(MFJSDouble<Subclass>, setElement) { if (jspropertyop_id_is_int(id) && jspropertyop_id_to_int(id) >= 0) { - MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj)); + MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj)); assert(mfdata); // @@ -5635,7 +5656,7 @@ assert(obj); assert(vp); - MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj)); + MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj)); assert(mfdata); uint32_t new_length; @@ -5695,7 +5716,7 @@ { MFData * const mfdata = static_cast<MFData *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); assert(mfdata); std::ostringstream out; @@ -5717,11 +5738,11 @@ void MFJSDouble<Subclass>::finalize(JSContext * const cx, JSObject * const obj) OPENVRML_NOTHROW { - MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj)); + MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj)); if (mfdata) { RemoveRoots(cx, mfdata->array); delete mfdata; - JS_SetPrivate(cx, obj, 0); + js_set_private(cx, obj, 0); } } @@ -5758,7 +5779,7 @@ } MField::MFData * const mfdata = - static_cast<MField::MFData *>(JS_GetPrivate(cx, obj)); + static_cast<MField::MFData *>(js_get_private(cx, obj)); assert(mfdata); std::auto_ptr<openvrml::mfbool> mfbool(new openvrml::mfbool(mfdata->array.size())); @@ -5787,7 +5808,7 @@ } MFData * const mfdata = - static_cast<MFData *>(JS_GetPrivate(cx, mfboolObj)); + static_cast<MFData *>(js_get_private(cx, mfboolObj)); for (size_t i = 0; i < bools.size(); ++i) { mfdata->array[i] = BOOLEAN_TO_JSVAL(bools[i]); } @@ -5836,7 +5857,7 @@ } mfdata->array[i] = BOOLEAN_TO_JSVAL(boolean); } - if (!JS_SetPrivate(cx, obj, mfdata.get())) { return JS_FALSE; } + if (!js_set_private(cx, obj, mfdata.get())) { return JS_FALSE; } mfdata.release(); } catch (std::bad_alloc & ex) { OPENVRML_PRINT_EXCEPTION_(ex); @@ -5854,7 +5875,7 @@ if (jspropertyop_id_is_int(id) && jspropertyop_id_to_int(id) >= 0) { const size_t index = jspropertyop_id_to_int(id); - MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj)); + MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj)); assert(mfdata); // @@ -5886,7 +5907,7 @@ assert(obj); assert(vp); - MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj)); + MFData * const mfdata = static_cast<MFData *>(js_get_private(cx, obj)); assert(mfdata); uint32_t new_length; @@ -5908,7 +5929,7 @@ { MFData * const mfdata = static_cast<MFData *>( - JS_GetPrivate(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); + js_get_private(cx, OPENVRML_JS_THIS_OBJECT(cx, vp))); assert(mfdata); std::ostringstream out; @@ -5927,8 +5948,8 @@ void MFBool::finalize(JSContext * const cx, JSObject * const obj) { - delete static_cast<MFData *>(JS_GetPrivate(cx, obj)); - JS_SetPrivate(cx, obj, 0); + delete static_cast<MFData *>(js_get_private(cx, obj... [truncated message content] |
From: <br...@us...> - 2012-07-26 22:12:25
|
Revision: 4307 http://openvrml.svn.sourceforge.net/openvrml/?rev=4307&view=rev Author: braden Date: 2012-07-26 22:12:19 +0000 (Thu, 26 Jul 2012) Log Message: ----------- XULRunner 14.0 removes JS_FinalizeStub. 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,4270,4272,4274,4276,4278,4280-4281,4283,4285,4287,4292,4294,4296,4298,4300,4302,4304 + /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,4292,4294,4296,4298,4300,4302,4304,4306 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2012-07-26 22:04:51 UTC (rev 4306) +++ branches/0.18/ChangeLog 2012-07-26 22:12:19 UTC (rev 4307) @@ -1,5 +1,12 @@ 2012-07-26 Braden McDaniel <br...@en...> + XULRunner 14.0 removes JS_FinalizeStub. + + * configure.ac + * src/script/javascript.cpp + +2012-07-26 Braden McDaniel <br...@en...> + * src/script/javascript.cpp: JS_RemoveValueRoot no longer returns a value; simply change the existing wrapper to return void. Should be backward compatible (since we could never do anything Modified: branches/0.18/configure.ac =================================================================== --- branches/0.18/configure.ac 2012-07-26 22:04:51 UTC (rev 4306) +++ branches/0.18/configure.ac 2012-07-26 22:12:19 UTC (rev 4307) @@ -304,6 +304,25 @@ [Defined if JS_ConstructObject is missing the prototype argument])]) # +# XULRunner 14.0 removes JS_FinalizeStub. +# +AC_CACHE_CHECK([whether SpiderMonkey has JS_FinalizeStub], +[ov_cv_js_has_finalizestub], +[ov_cv_js_has_finalizestub=no +ov_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$JS_CFLAGS $CPPFLAGS" +AC_LANG_ASSERT([C]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM( +[[#include <jsapi.h]], +[[JS_FinalizeStub(0, 0)]])], +[ov_cv_js_has_finalizestub=yes]) +CPPFLAGS=$ov_save_CPPFLAGS +]) +AS_IF([test X$ov_cv_js_has_finalizestub = Xyes], + [AC_DEFINE([OPENVRML_JS_HAS_FINALIZESTUB], [1], + [Defined if JS_FinalizeStub is declared in jsapi.h])]) + +# # 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-07-26 22:04:51 UTC (rev 4306) +++ branches/0.18/src/script/javascript.cpp 2012-07-26 22:12:19 UTC (rev 4307) @@ -378,7 +378,11 @@ JS_EnumerateStub, // enumerate JS_ResolveStub, // resolve JS_ConvertStub, // convert +#ifdef OPENVRML_JS_HAS_FINALIZESTUB JS_FinalizeStub, // finalize +#else + 0, // finalize +#endif 0, // getObjectOps 0, // checkAccess 0, // call @@ -402,7 +406,11 @@ JS_EnumerateStub, // enumerate JS_ResolveStub, // resolve JS_ConvertStub, // convert +#ifdef OPENVRML_JS_HAS_FINALIZESTUB JS_FinalizeStub, // finalize +#else + 0, // finalize +#endif 0, // getObjectOps 0, // checkAccess 0, // call @@ -7457,7 +7465,11 @@ JS_EnumerateStub, // enumerate JS_ResolveStub, // resolve JS_ConvertStub, // convert +#ifdef OPENVRML_JS_HAS_FINALIZESTUB JS_FinalizeStub, // finalize +#else + 0, // finalize +#endif 0, // getObjectOps 0, // checkAccess 0, // call This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-07-26 22:04:58
|
Revision: 4306 http://openvrml.svn.sourceforge.net/openvrml/?rev=4306&view=rev Author: braden Date: 2012-07-26 22:04:51 +0000 (Thu, 26 Jul 2012) Log Message: ----------- XULRunner 14.0 removes JS_FinalizeStub. Modified Paths: -------------- trunk/ChangeLog trunk/configure.ac trunk/src/script/javascript.cpp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2012-07-26 06:38:18 UTC (rev 4305) +++ trunk/ChangeLog 2012-07-26 22:04:51 UTC (rev 4306) @@ -1,5 +1,12 @@ 2012-07-26 Braden McDaniel <br...@en...> + XULRunner 14.0 removes JS_FinalizeStub. + + * configure.ac + * src/script/javascript.cpp + +2012-07-26 Braden McDaniel <br...@en...> + * src/script/javascript.cpp: JS_RemoveValueRoot no longer returns a value; simply change the existing wrapper to return void. Should be backward compatible (since we could never do anything Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2012-07-26 06:38:18 UTC (rev 4305) +++ trunk/configure.ac 2012-07-26 22:04:51 UTC (rev 4306) @@ -286,6 +286,25 @@ [Defined if JS_ConstructObject is missing the prototype argument])]) # +# XULRunner 14.0 removes JS_FinalizeStub. +# +AC_CACHE_CHECK([whether SpiderMonkey has JS_FinalizeStub], +[ov_cv_js_has_finalizestub], +[ov_cv_js_has_finalizestub=no +ov_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$JS_CFLAGS $CPPFLAGS" +AC_LANG_ASSERT([C]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM( +[[#include <jsapi.h]], +[[JS_FinalizeStub(0, 0)]])], +[ov_cv_js_has_finalizestub=yes]) +CPPFLAGS=$ov_save_CPPFLAGS +]) +AS_IF([test X$ov_cv_js_has_finalizestub = Xyes], + [AC_DEFINE([OPENVRML_JS_HAS_FINALIZESTUB], [1], + [Defined if JS_FinalizeStub is declared in jsapi.h])]) + +# # 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-07-26 06:38:18 UTC (rev 4305) +++ trunk/src/script/javascript.cpp 2012-07-26 22:04:51 UTC (rev 4306) @@ -378,7 +378,11 @@ JS_EnumerateStub, // enumerate JS_ResolveStub, // resolve JS_ConvertStub, // convert +#ifdef OPENVRML_JS_HAS_FINALIZESTUB JS_FinalizeStub, // finalize +#else + 0, // finalize +#endif 0, // getObjectOps 0, // checkAccess 0, // call @@ -402,7 +406,11 @@ JS_EnumerateStub, // enumerate JS_ResolveStub, // resolve JS_ConvertStub, // convert +#ifdef OPENVRML_JS_HAS_FINALIZESTUB JS_FinalizeStub, // finalize +#else + 0, // finalize +#endif 0, // getObjectOps 0, // checkAccess 0, // call @@ -7457,7 +7465,11 @@ JS_EnumerateStub, // enumerate JS_ResolveStub, // resolve JS_ConvertStub, // convert +#ifdef OPENVRML_JS_HAS_FINALIZESTUB JS_FinalizeStub, // finalize +#else + 0, // finalize +#endif 0, // getObjectOps 0, // checkAccess 0, // call This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-07-26 06:38:27
|
Revision: 4305 http://openvrml.svn.sourceforge.net/openvrml/?rev=4305&view=rev Author: braden Date: 2012-07-26 06:38:18 +0000 (Thu, 26 Jul 2012) Log Message: ----------- JS_RemoveValueRoot no longer returns a value; simply change the existing wrapper to return void. Should be backward compatible (since we could never do anything useful with failure here). 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,4278,4280-4281,4283,4285,4287,4292,4294,4296,4298,4300,4302 + /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,4292,4294,4296,4298,4300,4302,4304 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2012-07-26 06:35:34 UTC (rev 4304) +++ branches/0.18/ChangeLog 2012-07-26 06:38:18 UTC (rev 4305) @@ -1,5 +1,12 @@ 2012-07-26 Braden McDaniel <br...@en...> + * src/script/javascript.cpp: JS_RemoveValueRoot no longer returns + a value; simply change the existing wrapper to return void. + Should be backward compatible (since we could never do anything + useful with failure here). + +2012-07-26 Braden McDaniel <br...@en...> + * src/script/javascript.cpp: Remove uses of jsdouble and uintN. Current XULRunner nolonger defines these; and this should be reasonably backward-compatible. Modified: branches/0.18/src/script/javascript.cpp =================================================================== --- branches/0.18/src/script/javascript.cpp 2012-07-26 06:35:34 UTC (rev 4304) +++ branches/0.18/src/script/javascript.cpp 2012-07-26 06:38:18 UTC (rev 4305) @@ -91,13 +91,13 @@ # endif } - OPENVRML_LOCAL JSBool remove_value_root(JSContext * const cx, - jsval * const vp) + OPENVRML_LOCAL void remove_value_root(JSContext * const cx, + jsval * const vp) { # ifdef OPENVRML_JS_HAS_TYPED_ROOT_FUNCTIONS - return JS_RemoveValueRoot(cx, vp); + JS_RemoveValueRoot(cx, vp); # else - return JS_RemoveRoot(cx, vp); + JS_RemoveRoot(cx, vp); # endif } @@ -1229,8 +1229,7 @@ for (i = 0; i < argc; ++i) { assert(jsargv[i] != JSVAL_NULL); if (JSVAL_IS_GCTHING(jsargv[i])) { - ok = remove_value_root(cx, &jsargv[i]); - assert(ok); + remove_value_root(cx, &jsargv[i]); } } @@ -5238,8 +5237,7 @@ OPENVRML_NOTHROW { for (size_t i = 0; i < jsvalArray.size(); ++i) { - const JSBool ok = remove_value_root(cx, &jsvalArray[i]); - assert(ok); + remove_value_root(cx, &jsvalArray[i]); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-07-26 06:35:42
|
Revision: 4304 http://openvrml.svn.sourceforge.net/openvrml/?rev=4304&view=rev Author: braden Date: 2012-07-26 06:35:34 +0000 (Thu, 26 Jul 2012) Log Message: ----------- JS_RemoveValueRoot no longer returns a value; simply change the existing wrapper to return void. Should be backward compatible (since we could never do anything useful with failure here). Modified Paths: -------------- trunk/ChangeLog trunk/src/script/javascript.cpp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2012-07-26 06:30:41 UTC (rev 4303) +++ trunk/ChangeLog 2012-07-26 06:35:34 UTC (rev 4304) @@ -1,5 +1,12 @@ 2012-07-26 Braden McDaniel <br...@en...> + * src/script/javascript.cpp: JS_RemoveValueRoot no longer returns + a value; simply change the existing wrapper to return void. + Should be backward compatible (since we could never do anything + useful with failure here). + +2012-07-26 Braden McDaniel <br...@en...> + * src/script/javascript.cpp: Remove uses of jsdouble and uintN. Current XULRunner nolonger defines these; and this should be reasonably backward-compatible. Modified: trunk/src/script/javascript.cpp =================================================================== --- trunk/src/script/javascript.cpp 2012-07-26 06:30:41 UTC (rev 4303) +++ trunk/src/script/javascript.cpp 2012-07-26 06:35:34 UTC (rev 4304) @@ -91,13 +91,13 @@ # endif } - OPENVRML_LOCAL JSBool remove_value_root(JSContext * const cx, - jsval * const vp) + OPENVRML_LOCAL void remove_value_root(JSContext * const cx, + jsval * const vp) { # ifdef OPENVRML_JS_HAS_TYPED_ROOT_FUNCTIONS - return JS_RemoveValueRoot(cx, vp); + JS_RemoveValueRoot(cx, vp); # else - return JS_RemoveRoot(cx, vp); + JS_RemoveRoot(cx, vp); # endif } @@ -1229,8 +1229,7 @@ for (i = 0; i < argc; ++i) { assert(jsargv[i] != JSVAL_NULL); if (JSVAL_IS_GCTHING(jsargv[i])) { - ok = remove_value_root(cx, &jsargv[i]); - assert(ok); + remove_value_root(cx, &jsargv[i]); } } @@ -5238,8 +5237,7 @@ OPENVRML_NOTHROW { for (size_t i = 0; i < jsvalArray.size(); ++i) { - const JSBool ok = remove_value_root(cx, &jsvalArray[i]); - assert(ok); + remove_value_root(cx, &jsvalArray[i]); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-07-26 06:30:47
|
Revision: 4303 http://openvrml.svn.sourceforge.net/openvrml/?rev=4303&view=rev Author: braden Date: 2012-07-26 06:30:41 +0000 (Thu, 26 Jul 2012) Log Message: ----------- Remove uses of jsdouble and uintN. Current XULRunner nolonger defines these; and this should be reasonably backward-compatible. 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,4278,4280-4281,4283,4285,4287,4292,4294,4296,4298,4300 + /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,4292,4294,4296,4298,4300,4302 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2012-07-26 06:29:02 UTC (rev 4302) +++ branches/0.18/ChangeLog 2012-07-26 06:30:41 UTC (rev 4303) @@ -1,5 +1,11 @@ 2012-07-26 Braden McDaniel <br...@en...> + * src/script/javascript.cpp: Remove uses of jsdouble and uintN. + Current XULRunner nolonger defines these; and this should be + reasonably backward-compatible. + +2012-07-26 Braden McDaniel <br...@en...> + * src/Makefile.am (EXTRA_DIST): Add missing project files javascript.vcxproj and x3d-interpolation.vcxproj. Modified: branches/0.18/src/script/javascript.cpp =================================================================== --- branches/0.18/src/script/javascript.cpp 2012-07-26 06:29:02 UTC (rev 4302) +++ branches/0.18/src/script/javascript.cpp 2012-07-26 06:30:41 UTC (rev 4303) @@ -101,7 +101,7 @@ # endif } - OPENVRML_LOCAL jsdouble jsval_to_double(const jsval val) + OPENVRML_LOCAL double jsval_to_double(const jsval val) { # if OPENVRML_JSVAL_TO_DOUBLE_RETURNS_POINTER return *JSVAL_TO_DOUBLE(val); @@ -131,7 +131,7 @@ JSClass * const clasp, JSObject * const proto, JSObject * const parent, - const uintN argc, + const unsigned argc, jsval * const argv) { assert(!proto); @@ -146,40 +146,40 @@ # ifdef OPENVRML_FAST_JSNATIVE # define OPENVRML_DECLARE_JSNATIVE(name) \ - JSBool (name)(JSContext * cx, uintN argc, jsval * vp) + JSBool (name)(JSContext * cx, unsigned argc, jsval * vp) # else # define OPENVRML_DECLARE_JSNATIVE(name) \ - JSBool (name)(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, \ + JSBool (name)(JSContext * cx, JSObject * obj, unsigned argc, jsval * argv, \ jsval * rval) # endif # ifdef OPENVRML_FAST_JSNATIVE # define OPENVRML_DECLARE_MEMBER_JSNATIVE(class_name, name) \ - JSBool class_name::name(JSContext * cx, uintN argc, jsval * vp) + JSBool class_name::name(JSContext * cx, unsigned argc, jsval * vp) # else # define OPENVRML_DECLARE_MEMBER_JSNATIVE(class_name, name) \ JSBool class_name::name(JSContext * cx, JSObject * obj, \ - uintN argc, jsval * argv, \ + unsigned argc, jsval * argv, \ jsval * rval) # endif # ifdef OPENVRML_FAST_JSNATIVE # define OPENVRML_DEFINE_JSNATIVE(name) \ - JSBool (name)(JSContext * const cx, const uintN argc, jsval * const vp) + JSBool (name)(JSContext * const cx, const unsigned argc, jsval * const vp) # else # define OPENVRML_DEFINE_JSNATIVE(name) \ JSBool (name)(JSContext * const cx, JSObject * obj, \ - const uintN argc, jsval * const argv, jsval * const rval) + const unsigned argc, jsval * const argv, jsval * const rval) # endif # ifdef OPENVRML_FAST_JSNATIVE # define OPENVRML_DEFINE_MEMBER_JSNATIVE(class_name, name) \ - JSBool class_name::name(JSContext * const cx, const uintN argc, \ + JSBool class_name::name(JSContext * const cx, const unsigned argc, \ jsval * const vp) # else # define OPENVRML_DEFINE_MEMBER_JSNATIVE(class_name, name) \ JSBool class_name::name(JSContext * const cx, JSObject * obj, \ - const uintN argc, jsval * const argv, \ + const unsigned argc, jsval * const argv, \ jsval * const rval) # endif @@ -482,7 +482,7 @@ private: static OPENVRML_DECLARE_JSNATIVE(construct); static JSBool initObject(JSContext * cx, JSObject * obj, - const jsdouble (&rgb)[3]) + const double (&rgb)[3]) OPENVRML_NOTHROW; static JSBool getProperty(JSContext * cx, JSObject * obj, jspropertyop_id id, jsval * vp) @@ -557,7 +557,7 @@ private: static OPENVRML_DECLARE_JSNATIVE(construct); static JSBool initObject(JSContext * cx, JSObject * obj, - const jsdouble (&rot)[4]) + const double (&rot)[4]) OPENVRML_NOTHROW; static JSBool getProperty(JSContext * cx, JSObject * obj, jspropertyop_id id, jsval * vp) @@ -580,7 +580,7 @@ protected: static OPENVRML_DECLARE_JSNATIVE(constructor); static JSBool initObject(JSContext * cx, JSObject * obj, - const jsdouble (&vec)[2]) + const double (&vec)[2]) OPENVRML_NOTHROW; static JSBool getProperty(JSContext * cx, JSObject * obj, jspropertyop_id id, jsval * rval) @@ -635,7 +635,7 @@ protected: static OPENVRML_DEFINE_JSNATIVE(constructor); static JSBool initObject(JSContext * cx, JSObject * obj, - const jsdouble (&vec)[3]) + const double (&vec)[3]) OPENVRML_NOTHROW; static JSBool getProperty(JSContext * cx, JSObject * obj, jspropertyop_id id, jsval * vp) @@ -730,7 +730,7 @@ private: static JSBool initObject(JSContext * cx, JSObject * obj, - uintN argc, jsval * argv) OPENVRML_NOTHROW; + unsigned argc, jsval * argv) OPENVRML_NOTHROW; }; /** @@ -753,7 +753,7 @@ private: static JSBool initObject(JSContext * cx, JSObject * obj, - uintN argc, jsval * argv) OPENVRML_NOTHROW; + unsigned argc, jsval * argv) OPENVRML_NOTHROW; }; class OPENVRML_JAVASCRIPT_LOCAL MFBool : public MField { @@ -770,7 +770,7 @@ private: static OPENVRML_DECLARE_JSNATIVE(construct); static JSBool initObject(JSContext * cx, JSObject * obj, - uintN argc, jsval * argv); + unsigned argc, jsval * argv); static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement); static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setLength); static OPENVRML_DECLARE_JSNATIVE(toString); @@ -829,7 +829,7 @@ private: static OPENVRML_DECLARE_JSNATIVE(construct); static JSBool initObject(JSContext * cx, JSObject * obj, - uintN argc, jsval * argv); + unsigned argc, jsval * argv); static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement); static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setLength); static OPENVRML_DECLARE_JSNATIVE(toString); @@ -857,7 +857,7 @@ private: static OPENVRML_DECLARE_JSNATIVE(construct); static JSBool initObject(JSContext * cx, JSObject * obj, - uintN argc, jsval * argv) OPENVRML_NOTHROW; + unsigned argc, jsval * argv) OPENVRML_NOTHROW; static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement); static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setLength); static OPENVRML_DECLARE_JSNATIVE(toString); @@ -894,7 +894,7 @@ private: static OPENVRML_DECLARE_JSNATIVE(construct); static JSBool initObject(JSContext * cx, JSObject * obj, - uintN argc, jsval * argv) OPENVRML_NOTHROW; + unsigned argc, jsval * argv) OPENVRML_NOTHROW; static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement); static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setLength); static OPENVRML_DECLARE_JSNATIVE(toString); @@ -995,7 +995,7 @@ OPENVRML_NOTHROW; static OPENVRML_DECLARE_JSNATIVE(construct); static JSBool initObject(JSContext * cx, JSObject * obj, - const jsdouble (&mat)[16]) + const double (&mat)[16]) OPENVRML_NOTHROW; static JSBool getElement(JSContext * cx, JSObject * obj, jspropertyop_id id, jsval * vp) @@ -1117,7 +1117,7 @@ /* These should indicate source location for diagnostics. */ char *filename = 0; - uintN lineno = 0; + unsigned lineno = 0; using std::string; using std::istream; @@ -1347,7 +1347,8 @@ { const openvrml::sfint32 & sfint32 = *polymorphic_downcast<const openvrml::sfint32 *>(&fieldValue); - if (!JS_NewNumberValue(cx, jsdouble(sfint32.value()), &rval)) { + if (!JS_NewNumberValue(cx, static_cast<double>(sfint32.value()), + &rval)) { rval = JSVAL_NULL; } } @@ -1970,7 +1971,7 @@ case field_value::sffloat_id: { - jsdouble d; + double d; if (!JS_ValueToNumber(cx, v, &d)) { throw bad_conversion("Numeric value expected."); } @@ -1979,7 +1980,7 @@ case field_value::sfdouble_id: { - jsdouble d; + double d; if (!JS_ValueToNumber(cx, v, &d)) { throw bad_conversion("Numeric value expected."); } @@ -2028,7 +2029,7 @@ case field_value::sftime_id: { - jsdouble d; + double d; if (!JS_ValueToNumber(cx, v, &d)) { throw bad_conversion("Numeric value expected."); } @@ -2133,7 +2134,7 @@ script * const s = static_cast<script *>(JS_GetContextPrivate(cx)); assert(s); - for (uintN i = 0; i < argc; i++) { + for (unsigned i = 0; i < argc; i++) { JSString * const str = JS_ValueToString(cx, OPENVRML_JS_ARGV(cx, vp)[i]); if (!str) { return JS_FALSE; } @@ -2176,7 +2177,7 @@ script * const s = static_cast<script *>(JS_GetContextPrivate(cx)); assert(s); - const jsdouble speed = + const double speed = s->script_node().type().metatype().browser().current_speed(); jsval result_val; const JSBool result = JS_NewNumberValue(cx, speed, &result_val); @@ -2189,7 +2190,7 @@ script * const s = static_cast<script *>(JS_GetContextPrivate(cx)); assert(s); - const jsdouble frame_rate = + const double frame_rate = s->script_node().type().metatype().browser().frame_rate(); jsval result_val; const JSBool result = @@ -2653,7 +2654,7 @@ construct, 0, // constructor function, min arg count properties, methods, 0, 0); // static properties and methods - static const jsdouble rgb[3] = {}; + static const double rgb[3] = {}; if (!proto || !initObject(cx, proto, rgb)) { return 0; } return proto; } @@ -2704,7 +2705,7 @@ OPENVRML_DEFINE_MEMBER_JSNATIVE(SFColor, construct) { - jsdouble rgb[3] = {}; + double rgb[3] = {}; if (!JS_ConvertArguments(cx, argc, OPENVRML_JS_ARGV(cx, vp), "/ddd", &rgb[0], &rgb[1], &rgb[2])) { return JS_FALSE; @@ -2730,7 +2731,7 @@ JSBool SFColor::initObject(JSContext * const cx, JSObject * const obj, - const jsdouble (&rgb)[3]) + const double (&rgb)[3]) OPENVRML_NOTHROW { for (size_t i = 0; i < 3; ++i) { @@ -2802,7 +2803,7 @@ return JS_FALSE; } - jsdouble d; + double d; if (!JS_ValueToNumber(cx, *vp, &d)) { return JS_FALSE; } if (!(d >= 0.0 && d <= 1.0)) { @@ -2843,7 +2844,7 @@ *boost::polymorphic_downcast<openvrml::sfcolor *>( &sfdata.field_value()); - jsdouble h = 0.0, s = 0.0, v = 0.0; + double h = 0.0, s = 0.0, v = 0.0; if (!JS_ConvertArguments(cx, argc, OPENVRML_JS_ARGV(cx, vp), "/ddd", &h, &s, &v)) { return JS_FALSE; @@ -3452,7 +3453,7 @@ construct, 0, // constructor function, min arg count properties, methods, // instance properties, methods 0, 0); // static properties and methods - static const jsdouble rot[4] = { 0.0, 1.0, 0.0, 0.0 }; + static const double rot[4] = { 0.0, 1.0, 0.0, 0.0 }; if (!proto || !initObject(cx, proto, rot)) { return 0; } return proto; } @@ -3502,7 +3503,7 @@ OPENVRML_DEFINE_MEMBER_JSNATIVE(SFRotation, construct) { - jsdouble rot[4] = { 0.0, 1.0, 0.0, 0.0 }; + double rot[4] = { 0.0, 1.0, 0.0, 0.0 }; if (argc > 1 && JSVAL_IS_OBJECT(OPENVRML_JS_ARGV(cx, vp)[0]) && JSVAL_IS_NUMBER(OPENVRML_JS_ARGV(cx, vp)[1])) { JSObject * axis_obj = 0; @@ -3592,7 +3593,7 @@ JSBool SFRotation::initObject(JSContext * const cx, JSObject * const obj, - const jsdouble (&rot)[4]) + const double (&rot)[4]) OPENVRML_NOTHROW { const openvrml::vec3f axis = openvrml::make_vec3f(float(rot[0]), @@ -3659,7 +3660,7 @@ if (jspropertyop_id_is_int(id) && jspropertyop_id_to_int(id) >= 0 && jspropertyop_id_to_int(id) < 4) { - jsdouble d; + double d; if (!JS_ValueToNumber(cx, *vp, &d)) { return JS_FALSE; } openvrml::vec3f axis = thisRot.value().axis(); @@ -3899,7 +3900,7 @@ &obj_sfdata.field_value()); JSObject * dest_obj = 0; - jsdouble t = 0.0; + double t = 0.0; if (!JS_ConvertArguments(cx, argc, OPENVRML_JS_ARGV(cx, vp), "od", &dest_obj, &t)) { return JS_FALSE; @@ -3989,7 +3990,7 @@ constructor, 0, // constructor function, min arg count properties, methods, 0, 0); // static properties and methods - const jsdouble vec[2] = {}; + const double vec[2] = {}; if (!proto || !initObject(cx, proto, vec)) { return 0; } return proto; } @@ -4038,7 +4039,7 @@ template <typename SFVec2> OPENVRML_DEFINE_MEMBER_JSNATIVE(sfvec2_jsobject<SFVec2>, constructor) { - jsdouble vec[2] = {}; + double vec[2] = {}; if (!JS_ConvertArguments(cx, argc, OPENVRML_JS_ARGV(cx, vp), "/dd", &vec[0], &vec[1])) { return JS_FALSE; @@ -4065,7 +4066,7 @@ template <typename SFVec2> JSBool sfvec2_jsobject<SFVec2>::initObject(JSContext * const cx, JSObject * const obj, - const jsdouble (&vec)[2]) + const double (&vec)[2]) OPENVRML_NOTHROW { for (size_t i = 0; i < 2; ++i) { @@ -4137,7 +4138,7 @@ sfvec2_t & thisVec = *boost::polymorphic_downcast<sfvec2_t *>(&sfdata.field_value()); - jsdouble d; + double d; if (!JS_ValueToNumber(cx, *vp, &d)) { return JS_FALSE; } if (d != d) { JS_ReportError(cx, "cannot set SFVec2f component to NaN"); @@ -4230,7 +4231,7 @@ // // Make sure our argument is a number. // - jsdouble divisor = 0.0; + double divisor = 0.0; if (!JS_ConvertArguments(cx, argc, OPENVRML_JS_ARGV(cx, vp), "d", &divisor)) { return JS_FALSE; @@ -4290,7 +4291,7 @@ const sfvec2_t & argVec = *boost::polymorphic_downcast<sfvec2_t *>(&arg_sfdata.field_value()); - const jsdouble result = thisVec.value().dot(argVec.value()); + const double result = thisVec.value().dot(argVec.value()); jsval result_val; const JSBool retval = JS_NewNumberValue(cx, result, &result_val); OPENVRML_JS_SET_RVAL(cx, vp, result_val); @@ -4331,7 +4332,7 @@ // // Make sure our argument is a number. // - jsdouble factor = 0.0; + double factor = 0.0; if (!JS_ConvertArguments(cx, argc, OPENVRML_JS_ARGV(cx, vp), "d", &factor)) { return JS_FALSE; @@ -4596,7 +4597,7 @@ constructor, 0, // constructor function, min arg count properties, methods, 0, 0); // static properties and methods - const jsdouble vec[3] = {}; + const double vec[3] = {}; if (!proto || !initObject(cx, proto, vec)) { return 0; } return proto; } @@ -4646,7 +4647,7 @@ template <typename SFVec3> OPENVRML_DEFINE_MEMBER_JSNATIVE(sfvec3_jsobject<SFVec3>, constructor) { - jsdouble vec[3] = {}; + double vec[3] = {}; if (!JS_ConvertArguments(cx, argc, OPENVRML_JS_ARGV(cx, vp), "/ddd", &vec[0], &vec[1], &vec[2])) { return JS_FALSE; @@ -4673,13 +4674,13 @@ template <typename SFVec3> JSBool sfvec3_jsobject<SFVec3>::initObject(JSContext * const cx, JSObject * obj, - const jsdouble (&vec)[3]) + const double (&vec)[3]) OPENVRML_NOTHROW { typedef typename SFVec3::field_type sfvec3_t; typedef typename SFVec3::value_type vec3_t; - for (uintN i = 0; i < 3; ++i) { + for (unsigned i = 0; i < 3; ++i) { if (vec[i] != vec[i]) { JS_ReportError(cx, "argument %d of constructor is NaN", i + 1); @@ -4745,7 +4746,7 @@ sfvec3_t & thisVec = *boost::polymorphic_downcast<sfvec3_t *>(&sfdata.field_value()); - jsdouble d; + double d; if (!JS_ValueToNumber(cx, *vp, &d)) { return JS_FALSE; } if (d != d) { JS_ReportError(cx, "cannot set component to NaN"); @@ -4895,7 +4896,7 @@ // // Make sure our argument is a number. // - jsdouble divisor = 0.0; + double divisor = 0.0; if (!JS_ConvertArguments(cx, argc, OPENVRML_JS_ARGV(cx, vp), "d", &divisor)) { return JS_FALSE; @@ -4955,7 +4956,7 @@ const sfvec3_t & argVec = *boost::polymorphic_downcast<sfvec3_t *>(&arg_sfdata.field_value()); - const jsdouble result = thisVec.value().dot(argVec.value()); + const double result = thisVec.value().dot(argVec.value()); jsval result_val; const JSBool retval = JS_NewNumberValue(cx, result, &result_val); OPENVRML_JS_SET_RVAL(cx, vp, result_val); @@ -4996,7 +4997,7 @@ // // Make sure our argument is a number. // - jsdouble factor = 0.0; + double factor = 0.0; if (!JS_ConvertArguments(cx, argc, OPENVRML_JS_ARGV(cx, vp), "d", &factor)) { return JS_FALSE; @@ -5328,7 +5329,7 @@ template <typename Subclass> JSBool MFJSObject<Subclass>::initObject(JSContext * const cx, JSObject * const obj, - const uintN argc, + const unsigned argc, jsval * const argv) OPENVRML_NOTHROW { @@ -5337,7 +5338,7 @@ try { std::auto_ptr<MFData> mfdata(new MFData(argc)); - for (uintN i = 0; i < argc; ++i) { + for (unsigned i = 0; i < argc; ++i) { if (!JSVAL_IS_OBJECT(argv[i]) || !JS_InstanceOf(cx, JSVAL_TO_OBJECT(argv[i]), &Subclass::sfjsclass, argv)) { @@ -5553,14 +5554,14 @@ template <typename Subclass> JSBool MFJSDouble<Subclass>::initObject(JSContext * const cx, JSObject * const obj, - const uintN argc, + const unsigned argc, jsval * const argv) OPENVRML_NOTHROW { try { std::auto_ptr<MFData> mfdata(new MFData(argc)); - for (uintN i = 0; i < argc; ++i) { - jsdouble number; + for (unsigned i = 0; i < argc; ++i) { + double number; if (!JS_ValueToNumber(cx, argv[i], &number)) { return JS_FALSE; } if (!JS_NewNumberValue(cx, number, &mfdata->array[i])) { return JS_FALSE; @@ -5593,7 +5594,7 @@ // // Make sure new value is a number. // - jsdouble number; + double number; if (!JS_ValueToNumber(cx, *vp, &number)) { return JS_FALSE; } // @@ -5810,7 +5811,7 @@ JSBool MFBool::initObject(JSContext * const cx, JSObject * const obj, - const uintN argc, + const unsigned argc, jsval * const argv) { assert(cx); @@ -5818,7 +5819,7 @@ try { std::auto_ptr<MFData> mfdata(new MFData(argc)); - for (uintN i = 0; i < argc; ++i) { + for (unsigned i = 0; i < argc; ++i) { // // Convert the jsval to an int32 and back to a jsval in order // to remove any decimal part. @@ -6273,7 +6274,7 @@ JSBool MFInt32::initObject(JSContext * const cx, JSObject * const obj, - const uintN argc, + const unsigned argc, jsval * const argv) { assert(cx); @@ -6281,7 +6282,7 @@ try { std::auto_ptr<MFData> mfdata(new MFData(argc)); - for (uintN i = 0; i < argc; ++i) { + for (unsigned i = 0; i < argc; ++i) { // // Convert the jsval to an int32 and back to a jsval in order // to remove any decimal part. @@ -6290,7 +6291,8 @@ if (!JS_ValueToECMAInt32(cx, argv[i], &integer)) { return JS_FALSE; } - if (!JS_NewNumberValue(cx, jsdouble(integer), &mfdata->array[i])) { + if (!JS_NewNumberValue(cx, static_cast<double>(integer), + &mfdata->array[i])) { return JS_FALSE; } } @@ -6331,7 +6333,8 @@ // int32_t i; if (!JS_ValueToECMAInt32(cx, *vp, &i)) { return JS_FALSE; } - if (!JS_NewNumberValue(cx, jsdouble(i), &mfdata->array[index])) { + if (!JS_NewNumberValue(cx, static_cast<double>(i), + &mfdata->array[index])) { return JS_FALSE; } mfdata->changed = true; @@ -6434,7 +6437,7 @@ } JSBool MFNode::initObject(JSContext * const cx, JSObject * const obj, - const uintN argc, jsval * const argv) + const unsigned argc, jsval * const argv) OPENVRML_NOTHROW { assert(cx); @@ -6446,7 +6449,7 @@ script & s = *static_cast<script *>(JS_GetContextPrivate(cx)); JSClass & sfnode_jsclass = s.sfnode_class; - for (uintN i = 0; i < argc; ++i) { + for (unsigned i = 0; i < argc; ++i) { // // Make sure all args are SFNodes. // @@ -6900,7 +6903,7 @@ JSBool MFString::initObject(JSContext * const cx, JSObject * const obj, - const uintN argc, + const unsigned argc, jsval * const argv) OPENVRML_NOTHROW { @@ -6909,7 +6912,7 @@ try { std::auto_ptr<MFData> mfdata(new MFData(argc)); - for (uintN i = 0; i < argc; ++i) { + for (unsigned i = 0; i < argc; ++i) { JSString * const str = JS_ValueToString(cx, argv[i]); if (!str) { return JS_FALSE; } mfdata->array[i] = STRING_TO_JSVAL(str); @@ -7524,7 +7527,7 @@ assert(obj); if (jspropertyop_id_is_int(id) && jspropertyop_id_to_int(id) >= 0 && jspropertyop_id_to_int(id) < 4) { - jsdouble d; + double d; if (!JS_ValueToNumber(cx, *vp, &d)) { return JS_FALSE; } assert(JS_GetPrivate(cx, obj)); @@ -7574,14 +7577,14 @@ construct, 0, 0, methods, 0, 0); - const jsdouble mat[16] = {}; + const double mat[16] = {}; if (!proto || !initObject(cx, proto, mat)) { return 0; } return proto; } OPENVRML_DEFINE_MEMBER_JSNATIVE(VrmlMatrix, construct) { - jsdouble mat[16] = {}; + double mat[16] = {}; if (!JS_ConvertArguments(cx, argc, OPENVRML_JS_ARGV(cx, vp), "dddddddddddddddd", &mat[0], &mat[1], &mat[2], &mat[3], @@ -7611,7 +7614,7 @@ JSBool VrmlMatrix::initObject(JSContext * const cx, JSObject * const obj, - const jsdouble (&mat)[16]) + const double (&mat)[16]) OPENVRML_NOTHROW { assert(cx); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-07-26 06:29:08
|
Revision: 4302 http://openvrml.svn.sourceforge.net/openvrml/?rev=4302&view=rev Author: braden Date: 2012-07-26 06:29:02 +0000 (Thu, 26 Jul 2012) Log Message: ----------- Remove uses of jsdouble and uintN. Current XULRunner nolonger defines these; and this should be reasonably backward-compatible. Modified Paths: -------------- trunk/ChangeLog trunk/src/script/javascript.cpp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2012-07-26 06:26:45 UTC (rev 4301) +++ trunk/ChangeLog 2012-07-26 06:29:02 UTC (rev 4302) @@ -1,5 +1,11 @@ 2012-07-26 Braden McDaniel <br...@en...> + * src/script/javascript.cpp: Remove uses of jsdouble and uintN. + Current XULRunner nolonger defines these; and this should be + reasonably backward-compatible. + +2012-07-26 Braden McDaniel <br...@en...> + * src/Makefile.am (EXTRA_DIST): Add missing project files javascript.vcxproj and x3d-interpolation.vcxproj. Modified: trunk/src/script/javascript.cpp =================================================================== --- trunk/src/script/javascript.cpp 2012-07-26 06:26:45 UTC (rev 4301) +++ trunk/src/script/javascript.cpp 2012-07-26 06:29:02 UTC (rev 4302) @@ -101,7 +101,7 @@ # endif } - OPENVRML_LOCAL jsdouble jsval_to_double(const jsval val) + OPENVRML_LOCAL double jsval_to_double(const jsval val) { # if OPENVRML_JSVAL_TO_DOUBLE_RETURNS_POINTER return *JSVAL_TO_DOUBLE(val); @@ -131,7 +131,7 @@ JSClass * const clasp, JSObject * const proto, JSObject * const parent, - const uintN argc, + const unsigned argc, jsval * const argv) { assert(!proto); @@ -146,40 +146,40 @@ # ifdef OPENVRML_FAST_JSNATIVE # define OPENVRML_DECLARE_JSNATIVE(name) \ - JSBool (name)(JSContext * cx, uintN argc, jsval * vp) + JSBool (name)(JSContext * cx, unsigned argc, jsval * vp) # else # define OPENVRML_DECLARE_JSNATIVE(name) \ - JSBool (name)(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, \ + JSBool (name)(JSContext * cx, JSObject * obj, unsigned argc, jsval * argv, \ jsval * rval) # endif # ifdef OPENVRML_FAST_JSNATIVE # define OPENVRML_DECLARE_MEMBER_JSNATIVE(class_name, name) \ - JSBool class_name::name(JSContext * cx, uintN argc, jsval * vp) + JSBool class_name::name(JSContext * cx, unsigned argc, jsval * vp) # else # define OPENVRML_DECLARE_MEMBER_JSNATIVE(class_name, name) \ JSBool class_name::name(JSContext * cx, JSObject * obj, \ - uintN argc, jsval * argv, \ + unsigned argc, jsval * argv, \ jsval * rval) # endif # ifdef OPENVRML_FAST_JSNATIVE # define OPENVRML_DEFINE_JSNATIVE(name) \ - JSBool (name)(JSContext * const cx, const uintN argc, jsval * const vp) + JSBool (name)(JSContext * const cx, const unsigned argc, jsval * const vp) # else # define OPENVRML_DEFINE_JSNATIVE(name) \ JSBool (name)(JSContext * const cx, JSObject * obj, \ - const uintN argc, jsval * const argv, jsval * const rval) + const unsigned argc, jsval * const argv, jsval * const rval) # endif # ifdef OPENVRML_FAST_JSNATIVE # define OPENVRML_DEFINE_MEMBER_JSNATIVE(class_name, name) \ - JSBool class_name::name(JSContext * const cx, const uintN argc, \ + JSBool class_name::name(JSContext * const cx, const unsigned argc, \ jsval * const vp) # else # define OPENVRML_DEFINE_MEMBER_JSNATIVE(class_name, name) \ JSBool class_name::name(JSContext * const cx, JSObject * obj, \ - const uintN argc, jsval * const argv, \ + const unsigned argc, jsval * const argv, \ jsval * const rval) # endif @@ -482,7 +482,7 @@ private: static OPENVRML_DECLARE_JSNATIVE(construct); static JSBool initObject(JSContext * cx, JSObject * obj, - const jsdouble (&rgb)[3]) + const double (&rgb)[3]) OPENVRML_NOTHROW; static JSBool getProperty(JSContext * cx, JSObject * obj, jspropertyop_id id, jsval * vp) @@ -557,7 +557,7 @@ private: static OPENVRML_DECLARE_JSNATIVE(construct); static JSBool initObject(JSContext * cx, JSObject * obj, - const jsdouble (&rot)[4]) + const double (&rot)[4]) OPENVRML_NOTHROW; static JSBool getProperty(JSContext * cx, JSObject * obj, jspropertyop_id id, jsval * vp) @@ -580,7 +580,7 @@ protected: static OPENVRML_DECLARE_JSNATIVE(constructor); static JSBool initObject(JSContext * cx, JSObject * obj, - const jsdouble (&vec)[2]) + const double (&vec)[2]) OPENVRML_NOTHROW; static JSBool getProperty(JSContext * cx, JSObject * obj, jspropertyop_id id, jsval * rval) @@ -635,7 +635,7 @@ protected: static OPENVRML_DEFINE_JSNATIVE(constructor); static JSBool initObject(JSContext * cx, JSObject * obj, - const jsdouble (&vec)[3]) + const double (&vec)[3]) OPENVRML_NOTHROW; static JSBool getProperty(JSContext * cx, JSObject * obj, jspropertyop_id id, jsval * vp) @@ -730,7 +730,7 @@ private: static JSBool initObject(JSContext * cx, JSObject * obj, - uintN argc, jsval * argv) OPENVRML_NOTHROW; + unsigned argc, jsval * argv) OPENVRML_NOTHROW; }; /** @@ -753,7 +753,7 @@ private: static JSBool initObject(JSContext * cx, JSObject * obj, - uintN argc, jsval * argv) OPENVRML_NOTHROW; + unsigned argc, jsval * argv) OPENVRML_NOTHROW; }; class OPENVRML_JAVASCRIPT_LOCAL MFBool : public MField { @@ -770,7 +770,7 @@ private: static OPENVRML_DECLARE_JSNATIVE(construct); static JSBool initObject(JSContext * cx, JSObject * obj, - uintN argc, jsval * argv); + unsigned argc, jsval * argv); static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement); static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setLength); static OPENVRML_DECLARE_JSNATIVE(toString); @@ -829,7 +829,7 @@ private: static OPENVRML_DECLARE_JSNATIVE(construct); static JSBool initObject(JSContext * cx, JSObject * obj, - uintN argc, jsval * argv); + unsigned argc, jsval * argv); static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement); static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setLength); static OPENVRML_DECLARE_JSNATIVE(toString); @@ -857,7 +857,7 @@ private: static OPENVRML_DECLARE_JSNATIVE(construct); static JSBool initObject(JSContext * cx, JSObject * obj, - uintN argc, jsval * argv) OPENVRML_NOTHROW; + unsigned argc, jsval * argv) OPENVRML_NOTHROW; static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement); static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setLength); static OPENVRML_DECLARE_JSNATIVE(toString); @@ -894,7 +894,7 @@ private: static OPENVRML_DECLARE_JSNATIVE(construct); static JSBool initObject(JSContext * cx, JSObject * obj, - uintN argc, jsval * argv) OPENVRML_NOTHROW; + unsigned argc, jsval * argv) OPENVRML_NOTHROW; static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setElement); static OPENVRML_DECLARE_JSSTRICTPROPERTYOP(setLength); static OPENVRML_DECLARE_JSNATIVE(toString); @@ -995,7 +995,7 @@ OPENVRML_NOTHROW; static OPENVRML_DECLARE_JSNATIVE(construct); static JSBool initObject(JSContext * cx, JSObject * obj, - const jsdouble (&mat)[16]) + const double (&mat)[16]) OPENVRML_NOTHROW; static JSBool getElement(JSContext * cx, JSObject * obj, jspropertyop_id id, jsval * vp) @@ -1117,7 +1117,7 @@ /* These should indicate source location for diagnostics. */ char *filename = 0; - uintN lineno = 0; + unsigned lineno = 0; using std::string; using std::istream; @@ -1347,7 +1347,8 @@ { const openvrml::sfint32 & sfint32 = *polymorphic_downcast<const openvrml::sfint32 *>(&fieldValue); - if (!JS_NewNumberValue(cx, jsdouble(sfint32.value()), &rval)) { + if (!JS_NewNumberValue(cx, static_cast<double>(sfint32.value()), + &rval)) { rval = JSVAL_NULL; } } @@ -1970,7 +1971,7 @@ case field_value::sffloat_id: { - jsdouble d; + double d; if (!JS_ValueToNumber(cx, v, &d)) { throw bad_conversion("Numeric value expected."); } @@ -1979,7 +1980,7 @@ case field_value::sfdouble_id: { - jsdouble d; + double d; if (!JS_ValueToNumber(cx, v, &d)) { throw bad_conversion("Numeric value expected."); } @@ -2028,7 +2029,7 @@ case field_value::sftime_id: { - jsdouble d; + double d; if (!JS_ValueToNumber(cx, v, &d)) { throw bad_conversion("Numeric value expected."); } @@ -2133,7 +2134,7 @@ script * const s = static_cast<script *>(JS_GetContextPrivate(cx)); assert(s); - for (uintN i = 0; i < argc; i++) { + for (unsigned i = 0; i < argc; i++) { JSString * const str = JS_ValueToString(cx, OPENVRML_JS_ARGV(cx, vp)[i]); if (!str) { return JS_FALSE; } @@ -2176,7 +2177,7 @@ script * const s = static_cast<script *>(JS_GetContextPrivate(cx)); assert(s); - const jsdouble speed = + const double speed = s->script_node().type().metatype().browser().current_speed(); jsval result_val; const JSBool result = JS_NewNumberValue(cx, speed, &result_val); @@ -2189,7 +2190,7 @@ script * const s = static_cast<script *>(JS_GetContextPrivate(cx)); assert(s); - const jsdouble frame_rate = + const double frame_rate = s->script_node().type().metatype().browser().frame_rate(); jsval result_val; const JSBool result = @@ -2653,7 +2654,7 @@ construct, 0, // constructor function, min arg count properties, methods, 0, 0); // static properties and methods - static const jsdouble rgb[3] = {}; + static const double rgb[3] = {}; if (!proto || !initObject(cx, proto, rgb)) { return 0; } return proto; } @@ -2704,7 +2705,7 @@ OPENVRML_DEFINE_MEMBER_JSNATIVE(SFColor, construct) { - jsdouble rgb[3] = {}; + double rgb[3] = {}; if (!JS_ConvertArguments(cx, argc, OPENVRML_JS_ARGV(cx, vp), "/ddd", &rgb[0], &rgb[1], &rgb[2])) { return JS_FALSE; @@ -2730,7 +2731,7 @@ JSBool SFColor::initObject(JSContext * const cx, JSObject * const obj, - const jsdouble (&rgb)[3]) + const double (&rgb)[3]) OPENVRML_NOTHROW { for (size_t i = 0; i < 3; ++i) { @@ -2802,7 +2803,7 @@ return JS_FALSE; } - jsdouble d; + double d; if (!JS_ValueToNumber(cx, *vp, &d)) { return JS_FALSE; } if (!(d >= 0.0 && d <= 1.0)) { @@ -2843,7 +2844,7 @@ *boost::polymorphic_downcast<openvrml::sfcolor *>( &sfdata.field_value()); - jsdouble h = 0.0, s = 0.0, v = 0.0; + double h = 0.0, s = 0.0, v = 0.0; if (!JS_ConvertArguments(cx, argc, OPENVRML_JS_ARGV(cx, vp), "/ddd", &h, &s, &v)) { return JS_FALSE; @@ -3452,7 +3453,7 @@ construct, 0, // constructor function, min arg count properties, methods, // instance properties, methods 0, 0); // static properties and methods - static const jsdouble rot[4] = { 0.0, 1.0, 0.0, 0.0 }; + static const double rot[4] = { 0.0, 1.0, 0.0, 0.0 }; if (!proto || !initObject(cx, proto, rot)) { return 0; } return proto; } @@ -3502,7 +3503,7 @@ OPENVRML_DEFINE_MEMBER_JSNATIVE(SFRotation, construct) { - jsdouble rot[4] = { 0.0, 1.0, 0.0, 0.0 }; + double rot[4] = { 0.0, 1.0, 0.0, 0.0 }; if (argc > 1 && JSVAL_IS_OBJECT(OPENVRML_JS_ARGV(cx, vp)[0]) && JSVAL_IS_NUMBER(OPENVRML_JS_ARGV(cx, vp)[1])) { JSObject * axis_obj = 0; @@ -3592,7 +3593,7 @@ JSBool SFRotation::initObject(JSContext * const cx, JSObject * const obj, - const jsdouble (&rot)[4]) + const double (&rot)[4]) OPENVRML_NOTHROW { const openvrml::vec3f axis = openvrml::make_vec3f(float(rot[0]), @@ -3659,7 +3660,7 @@ if (jspropertyop_id_is_int(id) && jspropertyop_id_to_int(id) >= 0 && jspropertyop_id_to_int(id) < 4) { - jsdouble d; + double d; if (!JS_ValueToNumber(cx, *vp, &d)) { return JS_FALSE; } openvrml::vec3f axis = thisRot.value().axis(); @@ -3899,7 +3900,7 @@ &obj_sfdata.field_value()); JSObject * dest_obj = 0; - jsdouble t = 0.0; + double t = 0.0; if (!JS_ConvertArguments(cx, argc, OPENVRML_JS_ARGV(cx, vp), "od", &dest_obj, &t)) { return JS_FALSE; @@ -3989,7 +3990,7 @@ constructor, 0, // constructor function, min arg count properties, methods, 0, 0); // static properties and methods - const jsdouble vec[2] = {}; + const double vec[2] = {}; if (!proto || !initObject(cx, proto, vec)) { return 0; } return proto; } @@ -4038,7 +4039,7 @@ template <typename SFVec2> OPENVRML_DEFINE_MEMBER_JSNATIVE(sfvec2_jsobject<SFVec2>, constructor) { - jsdouble vec[2] = {}; + double vec[2] = {}; if (!JS_ConvertArguments(cx, argc, OPENVRML_JS_ARGV(cx, vp), "/dd", &vec[0], &vec[1])) { return JS_FALSE; @@ -4065,7 +4066,7 @@ template <typename SFVec2> JSBool sfvec2_jsobject<SFVec2>::initObject(JSContext * const cx, JSObject * const obj, - const jsdouble (&vec)[2]) + const double (&vec)[2]) OPENVRML_NOTHROW { for (size_t i = 0; i < 2; ++i) { @@ -4137,7 +4138,7 @@ sfvec2_t & thisVec = *boost::polymorphic_downcast<sfvec2_t *>(&sfdata.field_value()); - jsdouble d; + double d; if (!JS_ValueToNumber(cx, *vp, &d)) { return JS_FALSE; } if (d != d) { JS_ReportError(cx, "cannot set SFVec2f component to NaN"); @@ -4230,7 +4231,7 @@ // // Make sure our argument is a number. // - jsdouble divisor = 0.0; + double divisor = 0.0; if (!JS_ConvertArguments(cx, argc, OPENVRML_JS_ARGV(cx, vp), "d", &divisor)) { return JS_FALSE; @@ -4290,7 +4291,7 @@ const sfvec2_t & argVec = *boost::polymorphic_downcast<sfvec2_t *>(&arg_sfdata.field_value()); - const jsdouble result = thisVec.value().dot(argVec.value()); + const double result = thisVec.value().dot(argVec.value()); jsval result_val; const JSBool retval = JS_NewNumberValue(cx, result, &result_val); OPENVRML_JS_SET_RVAL(cx, vp, result_val); @@ -4331,7 +4332,7 @@ // // Make sure our argument is a number. // - jsdouble factor = 0.0; + double factor = 0.0; if (!JS_ConvertArguments(cx, argc, OPENVRML_JS_ARGV(cx, vp), "d", &factor)) { return JS_FALSE; @@ -4596,7 +4597,7 @@ constructor, 0, // constructor function, min arg count properties, methods, 0, 0); // static properties and methods - const jsdouble vec[3] = {}; + const double vec[3] = {}; if (!proto || !initObject(cx, proto, vec)) { return 0; } return proto; } @@ -4646,7 +4647,7 @@ template <typename SFVec3> OPENVRML_DEFINE_MEMBER_JSNATIVE(sfvec3_jsobject<SFVec3>, constructor) { - jsdouble vec[3] = {}; + double vec[3] = {}; if (!JS_ConvertArguments(cx, argc, OPENVRML_JS_ARGV(cx, vp), "/ddd", &vec[0], &vec[1], &vec[2])) { return JS_FALSE; @@ -4673,13 +4674,13 @@ template <typename SFVec3> JSBool sfvec3_jsobject<SFVec3>::initObject(JSContext * const cx, JSObject * obj, - const jsdouble (&vec)[3]) + const double (&vec)[3]) OPENVRML_NOTHROW { typedef typename SFVec3::field_type sfvec3_t; typedef typename SFVec3::value_type vec3_t; - for (uintN i = 0; i < 3; ++i) { + for (unsigned i = 0; i < 3; ++i) { if (vec[i] != vec[i]) { JS_ReportError(cx, "argument %d of constructor is NaN", i + 1); @@ -4745,7 +4746,7 @@ sfvec3_t & thisVec = *boost::polymorphic_downcast<sfvec3_t *>(&sfdata.field_value()); - jsdouble d; + double d; if (!JS_ValueToNumber(cx, *vp, &d)) { return JS_FALSE; } if (d != d) { JS_ReportError(cx, "cannot set component to NaN"); @@ -4895,7 +4896,7 @@ // // Make sure our argument is a number. // - jsdouble divisor = 0.0; + double divisor = 0.0; if (!JS_ConvertArguments(cx, argc, OPENVRML_JS_ARGV(cx, vp), "d", &divisor)) { return JS_FALSE; @@ -4955,7 +4956,7 @@ const sfvec3_t & argVec = *boost::polymorphic_downcast<sfvec3_t *>(&arg_sfdata.field_value()); - const jsdouble result = thisVec.value().dot(argVec.value()); + const double result = thisVec.value().dot(argVec.value()); jsval result_val; const JSBool retval = JS_NewNumberValue(cx, result, &result_val); OPENVRML_JS_SET_RVAL(cx, vp, result_val); @@ -4996,7 +4997,7 @@ // // Make sure our argument is a number. // - jsdouble factor = 0.0; + double factor = 0.0; if (!JS_ConvertArguments(cx, argc, OPENVRML_JS_ARGV(cx, vp), "d", &factor)) { return JS_FALSE; @@ -5328,7 +5329,7 @@ template <typename Subclass> JSBool MFJSObject<Subclass>::initObject(JSContext * const cx, JSObject * const obj, - const uintN argc, + const unsigned argc, jsval * const argv) OPENVRML_NOTHROW { @@ -5337,7 +5338,7 @@ try { std::auto_ptr<MFData> mfdata(new MFData(argc)); - for (uintN i = 0; i < argc; ++i) { + for (unsigned i = 0; i < argc; ++i) { if (!JSVAL_IS_OBJECT(argv[i]) || !JS_InstanceOf(cx, JSVAL_TO_OBJECT(argv[i]), &Subclass::sfjsclass, argv)) { @@ -5553,14 +5554,14 @@ template <typename Subclass> JSBool MFJSDouble<Subclass>::initObject(JSContext * const cx, JSObject * const obj, - const uintN argc, + const unsigned argc, jsval * const argv) OPENVRML_NOTHROW { try { std::auto_ptr<MFData> mfdata(new MFData(argc)); - for (uintN i = 0; i < argc; ++i) { - jsdouble number; + for (unsigned i = 0; i < argc; ++i) { + double number; if (!JS_ValueToNumber(cx, argv[i], &number)) { return JS_FALSE; } if (!JS_NewNumberValue(cx, number, &mfdata->array[i])) { return JS_FALSE; @@ -5593,7 +5594,7 @@ // // Make sure new value is a number. // - jsdouble number; + double number; if (!JS_ValueToNumber(cx, *vp, &number)) { return JS_FALSE; } // @@ -5810,7 +5811,7 @@ JSBool MFBool::initObject(JSContext * const cx, JSObject * const obj, - const uintN argc, + const unsigned argc, jsval * const argv) { assert(cx); @@ -5818,7 +5819,7 @@ try { std::auto_ptr<MFData> mfdata(new MFData(argc)); - for (uintN i = 0; i < argc; ++i) { + for (unsigned i = 0; i < argc; ++i) { // // Convert the jsval to an int32 and back to a jsval in order // to remove any decimal part. @@ -6273,7 +6274,7 @@ JSBool MFInt32::initObject(JSContext * const cx, JSObject * const obj, - const uintN argc, + const unsigned argc, jsval * const argv) { assert(cx); @@ -6281,7 +6282,7 @@ try { std::auto_ptr<MFData> mfdata(new MFData(argc)); - for (uintN i = 0; i < argc; ++i) { + for (unsigned i = 0; i < argc; ++i) { // // Convert the jsval to an int32 and back to a jsval in order // to remove any decimal part. @@ -6290,7 +6291,8 @@ if (!JS_ValueToECMAInt32(cx, argv[i], &integer)) { return JS_FALSE; } - if (!JS_NewNumberValue(cx, jsdouble(integer), &mfdata->array[i])) { + if (!JS_NewNumberValue(cx, static_cast<double>(integer), + &mfdata->array[i])) { return JS_FALSE; } } @@ -6331,7 +6333,8 @@ // int32_t i; if (!JS_ValueToECMAInt32(cx, *vp, &i)) { return JS_FALSE; } - if (!JS_NewNumberValue(cx, jsdouble(i), &mfdata->array[index])) { + if (!JS_NewNumberValue(cx, static_cast<double>(i), + &mfdata->array[index])) { return JS_FALSE; } mfdata->changed = true; @@ -6434,7 +6437,7 @@ } JSBool MFNode::initObject(JSContext * const cx, JSObject * const obj, - const uintN argc, jsval * const argv) + const unsigned argc, jsval * const argv) OPENVRML_NOTHROW { assert(cx); @@ -6446,7 +6449,7 @@ script & s = *static_cast<script *>(JS_GetContextPrivate(cx)); JSClass & sfnode_jsclass = s.sfnode_class; - for (uintN i = 0; i < argc; ++i) { + for (unsigned i = 0; i < argc; ++i) { // // Make sure all args are SFNodes. // @@ -6900,7 +6903,7 @@ JSBool MFString::initObject(JSContext * const cx, JSObject * const obj, - const uintN argc, + const unsigned argc, jsval * const argv) OPENVRML_NOTHROW { @@ -6909,7 +6912,7 @@ try { std::auto_ptr<MFData> mfdata(new MFData(argc)); - for (uintN i = 0; i < argc; ++i) { + for (unsigned i = 0; i < argc; ++i) { JSString * const str = JS_ValueToString(cx, argv[i]); if (!str) { return JS_FALSE; } mfdata->array[i] = STRING_TO_JSVAL(str); @@ -7524,7 +7527,7 @@ assert(obj); if (jspropertyop_id_is_int(id) && jspropertyop_id_to_int(id) >= 0 && jspropertyop_id_to_int(id) < 4) { - jsdouble d; + double d; if (!JS_ValueToNumber(cx, *vp, &d)) { return JS_FALSE; } assert(JS_GetPrivate(cx, obj)); @@ -7574,14 +7577,14 @@ construct, 0, 0, methods, 0, 0); - const jsdouble mat[16] = {}; + const double mat[16] = {}; if (!proto || !initObject(cx, proto, mat)) { return 0; } return proto; } OPENVRML_DEFINE_MEMBER_JSNATIVE(VrmlMatrix, construct) { - jsdouble mat[16] = {}; + double mat[16] = {}; if (!JS_ConvertArguments(cx, argc, OPENVRML_JS_ARGV(cx, vp), "dddddddddddddddd", &mat[0], &mat[1], &mat[2], &mat[3], @@ -7611,7 +7614,7 @@ JSBool VrmlMatrix::initObject(JSContext * const cx, JSObject * const obj, - const jsdouble (&mat)[16]) + const double (&mat)[16]) OPENVRML_NOTHROW { assert(cx); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-07-26 06:26:54
|
Revision: 4301 http://openvrml.svn.sourceforge.net/openvrml/?rev=4301&view=rev Author: braden Date: 2012-07-26 06:26:45 +0000 (Thu, 26 Jul 2012) Log Message: ----------- Add missing project files javascript.vcxproj and x3d-interpolation.vcxproj. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/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,4268,4270,4272,4274,4276,4278,4280-4281,4283,4285,4287,4292,4294,4296,4298 + /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,4292,4294,4296,4298,4300 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2012-07-26 06:22:50 UTC (rev 4300) +++ branches/0.18/ChangeLog 2012-07-26 06:26:45 UTC (rev 4301) @@ -1,3 +1,8 @@ +2012-07-26 Braden McDaniel <br...@en...> + + * src/Makefile.am (EXTRA_DIST): Add missing project files + javascript.vcxproj and x3d-interpolation.vcxproj. + 2012-05-21 Braden McDaniel <br...@en...> Apply /Ox consistently in all projects. In the absense of any Modified: branches/0.18/src/Makefile.am =================================================================== --- branches/0.18/src/Makefile.am 2012-07-26 06:22:50 UTC (rev 4300) +++ branches/0.18/src/Makefile.am 2012-07-26 06:26:45 UTC (rev 4301) @@ -928,22 +928,24 @@ libopenvrml-gl/openvrml-gl.vcxproj \ local/libopenvrml-dl/openvrml-dl.vcxproj \ node/vrml97/vrml97.vcxproj \ + node/x3d-cad-geometry/x3d-cad-geometry.vcxproj \ node/x3d-core/x3d-core.vcxproj \ + node/x3d-dis/x3d-dis.vcxproj \ + node/x3d-environmental-effects/x3d-environmental-effects.vcxproj \ node/x3d-event-utilities/x3d-event-utilities.vcxproj \ + node/x3d-h-anim/x3d-h-anim.vcxproj \ + node/x3d-geometry2d/x3d-geometry2d.vcxproj \ + node/x3d-geospatial/x3d-geospatial.vcxproj \ node/x3d-grouping/x3d-grouping.vcxproj \ + node/x3d-interpolation/x3d-interpolation.vcxproj \ + node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj \ + node/x3d-networking/x3d-networking.vcxproj \ + node/x3d-nurbs/x3d-nurbs.vcxproj \ + node/x3d-rendering/x3d-rendering.vcxproj \ node/x3d-shape/x3d-shape.vcxproj \ - node/x3d-rendering/x3d-rendering.vcxproj \ - node/x3d-geometry2d/x3d-geometry2d.vcxproj \ node/x3d-texturing/x3d-texturing.vcxproj \ - node/x3d-environmental-effects/x3d-environmental-effects.vcxproj \ - node/x3d-networking/x3d-networking.vcxproj \ - node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj \ - node/x3d-nurbs/x3d-nurbs.vcxproj \ - node/x3d-geospatial/x3d-geospatial.vcxproj \ - node/x3d-h-anim/x3d-h-anim.vcxproj \ - node/x3d-dis/x3d-dis.vcxproj \ - node/x3d-cad-geometry/x3d-cad-geometry.vcxproj \ - openvrml-xembed/org.openvrml.BrowserControl.service.in + openvrml-xembed/org.openvrml.BrowserControl.service.in \ + script/javascript.vcxproj CLEANFILES = $(BUILT_SOURCES) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-07-26 06:22:59
|
Revision: 4300 http://openvrml.svn.sourceforge.net/openvrml/?rev=4300&view=rev Author: braden Date: 2012-07-26 06:22:50 +0000 (Thu, 26 Jul 2012) Log Message: ----------- Add missing project files javascript.vcxproj and x3d-interpolation.vcxproj. Modified Paths: -------------- trunk/ChangeLog trunk/src/Makefile.am Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2012-05-21 23:21:47 UTC (rev 4299) +++ trunk/ChangeLog 2012-07-26 06:22:50 UTC (rev 4300) @@ -1,3 +1,8 @@ +2012-07-26 Braden McDaniel <br...@en...> + + * src/Makefile.am (EXTRA_DIST): Add missing project files + javascript.vcxproj and x3d-interpolation.vcxproj. + 2012-05-21 Braden McDaniel <br...@en...> Apply /Ox consistently in all projects. In the absense of any Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2012-05-21 23:21:47 UTC (rev 4299) +++ trunk/src/Makefile.am 2012-07-26 06:22:50 UTC (rev 4300) @@ -928,22 +928,24 @@ libopenvrml-gl/openvrml-gl.vcxproj \ local/libopenvrml-dl/openvrml-dl.vcxproj \ node/vrml97/vrml97.vcxproj \ + node/x3d-cad-geometry/x3d-cad-geometry.vcxproj \ node/x3d-core/x3d-core.vcxproj \ + node/x3d-dis/x3d-dis.vcxproj \ + node/x3d-environmental-effects/x3d-environmental-effects.vcxproj \ node/x3d-event-utilities/x3d-event-utilities.vcxproj \ + node/x3d-h-anim/x3d-h-anim.vcxproj \ + node/x3d-geometry2d/x3d-geometry2d.vcxproj \ + node/x3d-geospatial/x3d-geospatial.vcxproj \ node/x3d-grouping/x3d-grouping.vcxproj \ + node/x3d-interpolation/x3d-interpolation.vcxproj \ + node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj \ + node/x3d-networking/x3d-networking.vcxproj \ + node/x3d-nurbs/x3d-nurbs.vcxproj \ + node/x3d-rendering/x3d-rendering.vcxproj \ node/x3d-shape/x3d-shape.vcxproj \ - node/x3d-rendering/x3d-rendering.vcxproj \ - node/x3d-geometry2d/x3d-geometry2d.vcxproj \ node/x3d-texturing/x3d-texturing.vcxproj \ - node/x3d-environmental-effects/x3d-environmental-effects.vcxproj \ - node/x3d-networking/x3d-networking.vcxproj \ - node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj \ - node/x3d-nurbs/x3d-nurbs.vcxproj \ - node/x3d-geospatial/x3d-geospatial.vcxproj \ - node/x3d-h-anim/x3d-h-anim.vcxproj \ - node/x3d-dis/x3d-dis.vcxproj \ - node/x3d-cad-geometry/x3d-cad-geometry.vcxproj \ - openvrml-xembed/org.openvrml.BrowserControl.service.in + openvrml-xembed/org.openvrml.BrowserControl.service.in \ + script/javascript.vcxproj CLEANFILES = $(BUILT_SOURCES) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-05-21 23:21:54
|
Revision: 4299 http://openvrml.svn.sourceforge.net/openvrml/?rev=4299&view=rev Author: braden Date: 2012-05-21 23:21:47 +0000 (Mon, 21 May 2012) Log Message: ----------- Apply /Ox consistently in all projects. In the absense of any data pointing to the value of particular optimization settings, this seems appropriate. 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,4280-4281,4283,4285,4287,4292,4294,4296 + /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,4292,4294,4296,4298 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2012-05-21 23:19:44 UTC (rev 4298) +++ branches/0.18/ChangeLog 2012-05-21 23:21:47 UTC (rev 4299) @@ -1,3 +1,35 @@ +2012-05-21 Braden McDaniel <br...@en...> + + Apply /Ox consistently in all projects. In the absense of any + data pointing to the value of particular optimization settings, + this seems appropriate. + + * 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-x3dvrml.vcxproj + * tests/parse-vrml97.vcxproj + 2012-05-20 Braden McDaniel <br...@en...> More project file clean-up. Use /fp:fast consistently across Modified: branches/0.18/examples/pretty-print.vcxproj =================================================================== --- branches/0.18/examples/pretty-print.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) +++ branches/0.18/examples/pretty-print.vcxproj 2012-05-21 23:21:47 UTC (rev 4299) @@ -67,8 +67,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: branches/0.18/examples/sdl-viewer.vcxproj =================================================================== --- branches/0.18/examples/sdl-viewer.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) +++ branches/0.18/examples/sdl-viewer.vcxproj 2012-05-21 23:21:47 UTC (rev 4299) @@ -72,7 +72,6 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <Optimization>Full</Optimization> - <WholeProgramOptimization>true</WholeProgramOptimization> <AdditionalIncludeDirectories>..\src\libopenvrml-gl;..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: branches/0.18/src/libopenvrml/openvrml.vcxproj =================================================================== --- branches/0.18/src/libopenvrml/openvrml.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) +++ branches/0.18/src/libopenvrml/openvrml.vcxproj 2012-05-21 23:21:47 UTC (rev 4299) @@ -87,17 +87,13 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <AdditionalOptions>/Zm400 %(AdditionalOptions)</AdditionalOptions> - <Optimization>Full</Optimization> - <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.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> <AdditionalUsingDirectories> </AdditionalUsingDirectories> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Size</FavorSizeOrSpeed> <StringPooling>true</StringPooling> <FloatingPointModel>Fast</FloatingPointModel> + <Optimization>Full</Optimization> </ClCompile> <ResourceCompile> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> Modified: branches/0.18/src/libopenvrml-gl/openvrml-gl.vcxproj =================================================================== --- branches/0.18/src/libopenvrml-gl/openvrml-gl.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) +++ branches/0.18/src/libopenvrml-gl/openvrml-gl.vcxproj 2012-05-21 23:21:47 UTC (rev 4299) @@ -77,8 +77,6 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <Optimization>Full</Optimization> - <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>.;..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_GL_BUILD_DLL;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> Modified: branches/0.18/src/local/libopenvrml-dl/openvrml-dl.vcxproj =================================================================== --- branches/0.18/src/local/libopenvrml-dl/openvrml-dl.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) +++ branches/0.18/src/local/libopenvrml-dl/openvrml-dl.vcxproj 2012-05-21 23:21:47 UTC (rev 4299) @@ -79,8 +79,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: branches/0.18/src/node/vrml97/vrml97.vcxproj =================================================================== --- branches/0.18/src/node/vrml97/vrml97.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) +++ branches/0.18/src/node/vrml97/vrml97.vcxproj 2012-05-21 23:21:47 UTC (rev 4299) @@ -72,8 +72,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> 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-21 23:19:44 UTC (rev 4298) +++ branches/0.18/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj 2012-05-21 23:21:47 UTC (rev 4299) @@ -71,8 +71,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: branches/0.18/src/node/x3d-core/x3d-core.vcxproj =================================================================== --- branches/0.18/src/node/x3d-core/x3d-core.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) +++ branches/0.18/src/node/x3d-core/x3d-core.vcxproj 2012-05-21 23:21:47 UTC (rev 4299) @@ -71,8 +71,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: branches/0.18/src/node/x3d-dis/x3d-dis.vcxproj =================================================================== --- branches/0.18/src/node/x3d-dis/x3d-dis.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) +++ branches/0.18/src/node/x3d-dis/x3d-dis.vcxproj 2012-05-21 23:21:47 UTC (rev 4299) @@ -71,8 +71,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> 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-21 23:19:44 UTC (rev 4298) +++ branches/0.18/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj 2012-05-21 23:21:47 UTC (rev 4299) @@ -71,8 +71,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> 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-21 23:19:44 UTC (rev 4298) +++ branches/0.18/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj 2012-05-21 23:21:47 UTC (rev 4299) @@ -71,8 +71,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: branches/0.18/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj =================================================================== --- branches/0.18/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) +++ branches/0.18/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj 2012-05-21 23:21:47 UTC (rev 4299) @@ -71,8 +71,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: branches/0.18/src/node/x3d-geospatial/x3d-geospatial.vcxproj =================================================================== --- branches/0.18/src/node/x3d-geospatial/x3d-geospatial.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) +++ branches/0.18/src/node/x3d-geospatial/x3d-geospatial.vcxproj 2012-05-21 23:21:47 UTC (rev 4299) @@ -71,8 +71,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: branches/0.18/src/node/x3d-grouping/x3d-grouping.vcxproj =================================================================== --- branches/0.18/src/node/x3d-grouping/x3d-grouping.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) +++ branches/0.18/src/node/x3d-grouping/x3d-grouping.vcxproj 2012-05-21 23:21:47 UTC (rev 4299) @@ -71,8 +71,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> 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-21 23:19:44 UTC (rev 4298) +++ branches/0.18/src/node/x3d-h-anim/x3d-h-anim.vcxproj 2012-05-21 23:21:47 UTC (rev 4299) @@ -71,8 +71,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: branches/0.18/src/node/x3d-interpolation/x3d-interpolation.vcxproj =================================================================== --- branches/0.18/src/node/x3d-interpolation/x3d-interpolation.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) +++ branches/0.18/src/node/x3d-interpolation/x3d-interpolation.vcxproj 2012-05-21 23:21:47 UTC (rev 4299) @@ -71,8 +71,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> 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-21 23:19:44 UTC (rev 4298) +++ branches/0.18/src/node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj 2012-05-21 23:21:47 UTC (rev 4299) @@ -71,8 +71,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: branches/0.18/src/node/x3d-networking/x3d-networking.vcxproj =================================================================== --- branches/0.18/src/node/x3d-networking/x3d-networking.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) +++ branches/0.18/src/node/x3d-networking/x3d-networking.vcxproj 2012-05-21 23:21:47 UTC (rev 4299) @@ -73,8 +73,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: branches/0.18/src/node/x3d-nurbs/x3d-nurbs.vcxproj =================================================================== --- branches/0.18/src/node/x3d-nurbs/x3d-nurbs.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) +++ branches/0.18/src/node/x3d-nurbs/x3d-nurbs.vcxproj 2012-05-21 23:21:47 UTC (rev 4299) @@ -73,8 +73,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: branches/0.18/src/node/x3d-rendering/x3d-rendering.vcxproj =================================================================== --- branches/0.18/src/node/x3d-rendering/x3d-rendering.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) +++ branches/0.18/src/node/x3d-rendering/x3d-rendering.vcxproj 2012-05-21 23:21:47 UTC (rev 4299) @@ -73,8 +73,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: branches/0.18/src/node/x3d-shape/x3d-shape.vcxproj =================================================================== --- branches/0.18/src/node/x3d-shape/x3d-shape.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) +++ branches/0.18/src/node/x3d-shape/x3d-shape.vcxproj 2012-05-21 23:21:47 UTC (rev 4299) @@ -73,8 +73,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: branches/0.18/src/node/x3d-texturing/x3d-texturing.vcxproj =================================================================== --- branches/0.18/src/node/x3d-texturing/x3d-texturing.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) +++ branches/0.18/src/node/x3d-texturing/x3d-texturing.vcxproj 2012-05-21 23:21:47 UTC (rev 4299) @@ -73,8 +73,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: branches/0.18/src/script/javascript.vcxproj =================================================================== --- branches/0.18/src/script/javascript.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) +++ branches/0.18/src/script/javascript.vcxproj 2012-05-21 23:21:47 UTC (rev 4299) @@ -72,8 +72,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> Modified: branches/0.18/tests/parse-vrml97.vcxproj =================================================================== --- branches/0.18/tests/parse-vrml97.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) +++ branches/0.18/tests/parse-vrml97.vcxproj 2012-05-21 23:21:47 UTC (rev 4299) @@ -68,8 +68,6 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <Optimization>Full</Optimization> - <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: branches/0.18/tests/parse-x3dvrml.vcxproj =================================================================== --- branches/0.18/tests/parse-x3dvrml.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) +++ branches/0.18/tests/parse-x3dvrml.vcxproj 2012-05-21 23:21:47 UTC (rev 4299) @@ -68,8 +68,6 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <Optimization>Full</Optimization> - <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-05-21 23:19:52
|
Revision: 4298 http://openvrml.svn.sourceforge.net/openvrml/?rev=4298&view=rev Author: braden Date: 2012-05-21 23:19:44 +0000 (Mon, 21 May 2012) Log Message: ----------- Apply /Ox consistently in all projects. In the absense of any data pointing to the value of particular optimization settings, this seems appropriate. Modified Paths: -------------- trunk/ChangeLog 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/ChangeLog =================================================================== --- trunk/ChangeLog 2012-05-20 08:23:37 UTC (rev 4297) +++ trunk/ChangeLog 2012-05-21 23:19:44 UTC (rev 4298) @@ -1,3 +1,35 @@ +2012-05-21 Braden McDaniel <br...@en...> + + Apply /Ox consistently in all projects. In the absense of any + data pointing to the value of particular optimization settings, + this seems appropriate. + + * 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-x3dvrml.vcxproj + * tests/parse-vrml97.vcxproj + 2012-05-20 Braden McDaniel <br...@en...> More project file clean-up. Use /fp:fast consistently across Modified: trunk/examples/pretty-print.vcxproj =================================================================== --- trunk/examples/pretty-print.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) +++ trunk/examples/pretty-print.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) @@ -67,8 +67,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: trunk/examples/sdl-viewer.vcxproj =================================================================== --- trunk/examples/sdl-viewer.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) +++ trunk/examples/sdl-viewer.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) @@ -72,7 +72,6 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <Optimization>Full</Optimization> - <WholeProgramOptimization>true</WholeProgramOptimization> <AdditionalIncludeDirectories>..\src\libopenvrml-gl;..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: trunk/src/libopenvrml/openvrml.vcxproj =================================================================== --- trunk/src/libopenvrml/openvrml.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) +++ trunk/src/libopenvrml/openvrml.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) @@ -87,17 +87,13 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <AdditionalOptions>/Zm400 %(AdditionalOptions)</AdditionalOptions> - <Optimization>Full</Optimization> - <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.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> <AdditionalUsingDirectories> </AdditionalUsingDirectories> - <IntrinsicFunctions>true</IntrinsicFunctions> - <FavorSizeOrSpeed>Size</FavorSizeOrSpeed> <StringPooling>true</StringPooling> <FloatingPointModel>Fast</FloatingPointModel> + <Optimization>Full</Optimization> </ClCompile> <ResourceCompile> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> Modified: trunk/src/libopenvrml-gl/openvrml-gl.vcxproj =================================================================== --- trunk/src/libopenvrml-gl/openvrml-gl.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) +++ trunk/src/libopenvrml-gl/openvrml-gl.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) @@ -77,8 +77,6 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <Optimization>Full</Optimization> - <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>.;..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_GL_BUILD_DLL;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> Modified: trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj =================================================================== --- trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) +++ trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) @@ -79,8 +79,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: trunk/src/node/vrml97/vrml97.vcxproj =================================================================== --- trunk/src/node/vrml97/vrml97.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) +++ trunk/src/node/vrml97/vrml97.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) @@ -72,8 +72,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> Modified: trunk/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj =================================================================== --- trunk/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) +++ trunk/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) @@ -71,8 +71,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: trunk/src/node/x3d-core/x3d-core.vcxproj =================================================================== --- trunk/src/node/x3d-core/x3d-core.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) +++ trunk/src/node/x3d-core/x3d-core.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) @@ -71,8 +71,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: trunk/src/node/x3d-dis/x3d-dis.vcxproj =================================================================== --- trunk/src/node/x3d-dis/x3d-dis.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) +++ trunk/src/node/x3d-dis/x3d-dis.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) @@ -71,8 +71,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: trunk/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj =================================================================== --- trunk/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) +++ trunk/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) @@ -71,8 +71,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: trunk/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj =================================================================== --- trunk/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) +++ trunk/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) @@ -71,8 +71,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: trunk/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj =================================================================== --- trunk/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) +++ trunk/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) @@ -71,8 +71,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: trunk/src/node/x3d-geospatial/x3d-geospatial.vcxproj =================================================================== --- trunk/src/node/x3d-geospatial/x3d-geospatial.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) +++ trunk/src/node/x3d-geospatial/x3d-geospatial.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) @@ -71,8 +71,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: trunk/src/node/x3d-grouping/x3d-grouping.vcxproj =================================================================== --- trunk/src/node/x3d-grouping/x3d-grouping.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) +++ trunk/src/node/x3d-grouping/x3d-grouping.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) @@ -71,8 +71,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: trunk/src/node/x3d-h-anim/x3d-h-anim.vcxproj =================================================================== --- trunk/src/node/x3d-h-anim/x3d-h-anim.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) +++ trunk/src/node/x3d-h-anim/x3d-h-anim.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) @@ -71,8 +71,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: trunk/src/node/x3d-interpolation/x3d-interpolation.vcxproj =================================================================== --- trunk/src/node/x3d-interpolation/x3d-interpolation.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) +++ trunk/src/node/x3d-interpolation/x3d-interpolation.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) @@ -71,8 +71,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> 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-05-20 08:23:37 UTC (rev 4297) +++ trunk/src/node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) @@ -71,8 +71,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: trunk/src/node/x3d-networking/x3d-networking.vcxproj =================================================================== --- trunk/src/node/x3d-networking/x3d-networking.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) +++ trunk/src/node/x3d-networking/x3d-networking.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) @@ -73,8 +73,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: trunk/src/node/x3d-nurbs/x3d-nurbs.vcxproj =================================================================== --- trunk/src/node/x3d-nurbs/x3d-nurbs.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) +++ trunk/src/node/x3d-nurbs/x3d-nurbs.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) @@ -73,8 +73,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: trunk/src/node/x3d-rendering/x3d-rendering.vcxproj =================================================================== --- trunk/src/node/x3d-rendering/x3d-rendering.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) +++ trunk/src/node/x3d-rendering/x3d-rendering.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) @@ -73,8 +73,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: trunk/src/node/x3d-shape/x3d-shape.vcxproj =================================================================== --- trunk/src/node/x3d-shape/x3d-shape.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) +++ trunk/src/node/x3d-shape/x3d-shape.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) @@ -73,8 +73,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: trunk/src/node/x3d-texturing/x3d-texturing.vcxproj =================================================================== --- trunk/src/node/x3d-texturing/x3d-texturing.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) +++ trunk/src/node/x3d-texturing/x3d-texturing.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) @@ -73,8 +73,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: trunk/src/script/javascript.vcxproj =================================================================== --- trunk/src/script/javascript.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) +++ trunk/src/script/javascript.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) @@ -72,8 +72,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> + <Optimization>Full</Optimization> <AdditionalIncludeDirectories>..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> Modified: trunk/tests/parse-vrml97.vcxproj =================================================================== --- trunk/tests/parse-vrml97.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) +++ trunk/tests/parse-vrml97.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) @@ -68,8 +68,6 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <Optimization>Full</Optimization> - <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> Modified: trunk/tests/parse-x3dvrml.vcxproj =================================================================== --- trunk/tests/parse-x3dvrml.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) +++ trunk/tests/parse-x3dvrml.vcxproj 2012-05-21 23:19:44 UTC (rev 4298) @@ -68,8 +68,6 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <Optimization>Full</Optimization> - <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> - <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-05-20 08:23:45
|
Revision: 4297 http://openvrml.svn.sourceforge.net/openvrml/?rev=4297&view=rev Author: braden Date: 2012-05-20 08:23:37 +0000 (Sun, 20 May 2012) Log Message: ----------- More project file clean-up. Use /fp:fast consistently across projects and configurations. 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,4280-4281,4283,4285,4287,4292,4294 + /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,4292,4294,4296 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2012-05-20 07:37:35 UTC (rev 4296) +++ branches/0.18/ChangeLog 2012-05-20 08:23:37 UTC (rev 4297) @@ -1,5 +1,36 @@ 2012-05-20 Braden McDaniel <br...@en...> + More project file clean-up. Use /fp:fast consistently across + projects and configurations. + + * examples/sdl-viewer.vcxproj + * examples/pretty-print.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-05-20 Braden McDaniel <br...@en...> + More project file clean-up. Mostly, remove more settings that should be deferred to user properties. Modified: branches/0.18/examples/pretty-print.vcxproj =================================================================== --- branches/0.18/examples/pretty-print.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) +++ branches/0.18/examples/pretty-print.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) @@ -48,6 +48,7 @@ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -57,6 +58,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -70,6 +72,7 @@ <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: branches/0.18/examples/sdl-viewer.vcxproj =================================================================== --- branches/0.18/examples/sdl-viewer.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) +++ branches/0.18/examples/sdl-viewer.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) @@ -24,7 +24,9 @@ <Keyword>Win32Proj</Keyword> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <WholeProgramOptimization>true</WholeProgramOptimization> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -39,7 +41,6 @@ <PropertyGroup> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir> - <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> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir> @@ -57,6 +58,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <AdditionalDependencies>opengl32.lib;glu32.lib;SDLmain.lib;SDL.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -74,6 +76,7 @@ <AdditionalIncludeDirectories>..\src\libopenvrml-gl;..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <AdditionalDependencies>opengl32.lib;glu32.lib;SDLmain.lib;SDL.lib;%(AdditionalDependencies)</AdditionalDependencies> Modified: branches/0.18/src/libopenvrml/openvrml.vcxproj =================================================================== --- branches/0.18/src/libopenvrml/openvrml.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) +++ branches/0.18/src/libopenvrml/openvrml.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) @@ -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"> @@ -59,6 +59,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -70,6 +71,7 @@ <AdditionalUsingDirectories> </AdditionalUsingDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <ResourceCompile> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> @@ -107,6 +109,8 @@ </DataExecutionPrevention> <ImportLibrary>$(SolutionDir)$(Platform)\$(Configuration)\lib\$(TargetName).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> @@ -181,4 +185,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-20 07:37:35 UTC (rev 4296) +++ branches/0.18/src/libopenvrml-gl/openvrml-gl.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) @@ -51,6 +51,7 @@ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -60,6 +61,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <ResourceCompile> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> @@ -90,6 +92,8 @@ <DataExecutionPrevention> </DataExecutionPrevention> <ImportLibrary>$(SolutionDir)$(Platform)\$(Configuration)\lib\$(TargetName).lib</ImportLibrary> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: branches/0.18/src/local/libopenvrml-dl/openvrml-dl.vcxproj =================================================================== --- branches/0.18/src/local/libopenvrml-dl/openvrml-dl.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) +++ branches/0.18/src/local/libopenvrml-dl/openvrml-dl.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) @@ -74,6 +74,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -83,6 +84,7 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> Modified: branches/0.18/src/node/vrml97/vrml97.vcxproj =================================================================== --- branches/0.18/src/node/vrml97/vrml97.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) +++ branches/0.18/src/node/vrml97/vrml97.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -62,6 +63,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <AdditionalDependencies>libpng15.lib;zlib.lib;freetype249_D.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -75,10 +77,13 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <AdditionalDependencies>libpng15.lib;zlib.lib;freetype249.lib;%(AdditionalDependencies)</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> 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-20 07:37:35 UTC (rev 4296) +++ branches/0.18/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -62,6 +63,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -74,9 +76,12 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: branches/0.18/src/node/x3d-core/x3d-core.vcxproj =================================================================== --- branches/0.18/src/node/x3d-core/x3d-core.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) +++ branches/0.18/src/node/x3d-core/x3d-core.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) @@ -30,7 +30,6 @@ </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <WholeProgramOptimization>false</WholeProgramOptimization> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -54,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -63,6 +63,7 @@ <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -75,9 +76,12 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: branches/0.18/src/node/x3d-dis/x3d-dis.vcxproj =================================================================== --- branches/0.18/src/node/x3d-dis/x3d-dis.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) +++ branches/0.18/src/node/x3d-dis/x3d-dis.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -62,6 +63,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -74,9 +76,12 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> 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-20 07:37:35 UTC (rev 4296) +++ branches/0.18/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -62,6 +63,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -74,9 +76,12 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> 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-20 07:37:35 UTC (rev 4296) +++ branches/0.18/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -62,6 +63,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -74,9 +76,12 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: branches/0.18/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj =================================================================== --- branches/0.18/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) +++ branches/0.18/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -62,6 +63,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -74,9 +76,12 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: branches/0.18/src/node/x3d-geospatial/x3d-geospatial.vcxproj =================================================================== --- branches/0.18/src/node/x3d-geospatial/x3d-geospatial.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) +++ branches/0.18/src/node/x3d-geospatial/x3d-geospatial.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -62,6 +63,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -74,9 +76,12 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: branches/0.18/src/node/x3d-grouping/x3d-grouping.vcxproj =================================================================== --- branches/0.18/src/node/x3d-grouping/x3d-grouping.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) +++ branches/0.18/src/node/x3d-grouping/x3d-grouping.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -62,6 +63,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -74,9 +76,12 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> 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-20 07:37:35 UTC (rev 4296) +++ branches/0.18/src/node/x3d-h-anim/x3d-h-anim.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -62,6 +63,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -74,9 +76,12 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: branches/0.18/src/node/x3d-interpolation/x3d-interpolation.vcxproj =================================================================== --- branches/0.18/src/node/x3d-interpolation/x3d-interpolation.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) +++ branches/0.18/src/node/x3d-interpolation/x3d-interpolation.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -62,6 +63,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -74,9 +76,12 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> 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-20 07:37:35 UTC (rev 4296) +++ branches/0.18/src/node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -62,6 +63,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -74,9 +76,12 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: branches/0.18/src/node/x3d-networking/x3d-networking.vcxproj =================================================================== --- branches/0.18/src/node/x3d-networking/x3d-networking.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) +++ branches/0.18/src/node/x3d-networking/x3d-networking.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -64,6 +65,7 @@ <PrecompiledHeader> </PrecompiledHeader> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -78,9 +80,12 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <PrecompiledHeader> </PrecompiledHeader> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: branches/0.18/src/node/x3d-nurbs/x3d-nurbs.vcxproj =================================================================== --- branches/0.18/src/node/x3d-nurbs/x3d-nurbs.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) +++ branches/0.18/src/node/x3d-nurbs/x3d-nurbs.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -64,6 +65,7 @@ <PrecompiledHeader> </PrecompiledHeader> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -78,9 +80,12 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <PrecompiledHeader> </PrecompiledHeader> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: branches/0.18/src/node/x3d-rendering/x3d-rendering.vcxproj =================================================================== --- branches/0.18/src/node/x3d-rendering/x3d-rendering.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) +++ branches/0.18/src/node/x3d-rendering/x3d-rendering.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -64,6 +65,7 @@ <PrecompiledHeader> </PrecompiledHeader> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -78,9 +80,12 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <PrecompiledHeader> </PrecompiledHeader> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: branches/0.18/src/node/x3d-shape/x3d-shape.vcxproj =================================================================== --- branches/0.18/src/node/x3d-shape/x3d-shape.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) +++ branches/0.18/src/node/x3d-shape/x3d-shape.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -64,6 +65,7 @@ <PrecompiledHeader> </PrecompiledHeader> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -78,9 +80,12 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <PrecompiledHeader> </PrecompiledHeader> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: branches/0.18/src/node/x3d-texturing/x3d-texturing.vcxproj =================================================================== --- branches/0.18/src/node/x3d-texturing/x3d-texturing.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) +++ branches/0.18/src/node/x3d-texturing/x3d-texturing.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) @@ -26,7 +26,6 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -54,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -65,6 +65,7 @@ <PrecompiledHeader> </PrecompiledHeader> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -79,9 +80,12 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <PrecompiledHeader> </PrecompiledHeader> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: branches/0.18/src/script/javascript.vcxproj =================================================================== --- branches/0.18/src/script/javascript.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) +++ branches/0.18/src/script/javascript.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) @@ -44,7 +44,6 @@ <PropertyGroup> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\bin\script\</OutDir> - <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> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\script\</OutDir> @@ -64,11 +63,11 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <AdditionalDependencies>mozjs.lib;%(AdditionalDependencies)</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -78,13 +77,13 @@ <AdditionalIncludeDirectories>..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <AdditionalDependencies>mozjs.lib;%(AdditionalDependencies)</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <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-20 07:37:35 UTC (rev 4296) +++ branches/0.18/tests/parse-vrml97.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) @@ -41,7 +41,6 @@ <PropertyGroup> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir> - <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> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir> @@ -59,6 +58,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -73,6 +73,7 @@ <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: branches/0.18/tests/parse-x3dvrml.vcxproj =================================================================== --- branches/0.18/tests/parse-x3dvrml.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) +++ branches/0.18/tests/parse-x3dvrml.vcxproj 2012-05-20 08:23:37 UTC (rev 4297) @@ -41,7 +41,6 @@ <PropertyGroup> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir> - <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> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir> @@ -59,6 +58,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -73,6 +73,7 @@ <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-05-20 07:37:43
|
Revision: 4296 http://openvrml.svn.sourceforge.net/openvrml/?rev=4296&view=rev Author: braden Date: 2012-05-20 07:37:35 +0000 (Sun, 20 May 2012) Log Message: ----------- More project file clean-up. Use /fp:fast consistently across projects and configurations. Modified Paths: -------------- trunk/ChangeLog 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/ChangeLog =================================================================== --- trunk/ChangeLog 2012-05-20 04:14:52 UTC (rev 4295) +++ trunk/ChangeLog 2012-05-20 07:37:35 UTC (rev 4296) @@ -1,5 +1,36 @@ 2012-05-20 Braden McDaniel <br...@en...> + More project file clean-up. Use /fp:fast consistently across + projects and configurations. + + * examples/sdl-viewer.vcxproj + * examples/pretty-print.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-05-20 Braden McDaniel <br...@en...> + More project file clean-up. Mostly, remove more settings that should be deferred to user properties. Modified: trunk/examples/pretty-print.vcxproj =================================================================== --- trunk/examples/pretty-print.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) +++ trunk/examples/pretty-print.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) @@ -48,6 +48,7 @@ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -57,6 +58,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -70,6 +72,7 @@ <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: trunk/examples/sdl-viewer.vcxproj =================================================================== --- trunk/examples/sdl-viewer.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) +++ trunk/examples/sdl-viewer.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) @@ -24,7 +24,9 @@ <Keyword>Win32Proj</Keyword> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <WholeProgramOptimization>true</WholeProgramOptimization> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -39,7 +41,6 @@ <PropertyGroup> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir> - <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> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir> @@ -57,6 +58,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <AdditionalDependencies>opengl32.lib;glu32.lib;SDLmain.lib;SDL.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -74,6 +76,7 @@ <AdditionalIncludeDirectories>..\src\libopenvrml-gl;..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <AdditionalDependencies>opengl32.lib;glu32.lib;SDLmain.lib;SDL.lib;%(AdditionalDependencies)</AdditionalDependencies> Modified: trunk/src/libopenvrml/openvrml.vcxproj =================================================================== --- trunk/src/libopenvrml/openvrml.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) +++ trunk/src/libopenvrml/openvrml.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) @@ -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"> @@ -59,6 +59,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -70,6 +71,7 @@ <AdditionalUsingDirectories> </AdditionalUsingDirectories> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <ResourceCompile> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> @@ -107,6 +109,8 @@ </DataExecutionPrevention> <ImportLibrary>$(SolutionDir)$(Platform)\$(Configuration)\lib\$(TargetName).lib</ImportLibrary> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> @@ -181,4 +185,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-05-20 04:14:52 UTC (rev 4295) +++ trunk/src/libopenvrml-gl/openvrml-gl.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) @@ -51,6 +51,7 @@ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -60,6 +61,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <ResourceCompile> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> @@ -90,6 +92,8 @@ <DataExecutionPrevention> </DataExecutionPrevention> <ImportLibrary>$(SolutionDir)$(Platform)\$(Configuration)\lib\$(TargetName).lib</ImportLibrary> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj =================================================================== --- trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) +++ trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) @@ -74,6 +74,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -83,6 +84,7 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> Modified: trunk/src/node/vrml97/vrml97.vcxproj =================================================================== --- trunk/src/node/vrml97/vrml97.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) +++ trunk/src/node/vrml97/vrml97.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -62,6 +63,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <AdditionalDependencies>libpng15.lib;zlib.lib;freetype249_D.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -75,10 +77,13 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <AdditionalDependencies>libpng15.lib;zlib.lib;freetype249.lib;%(AdditionalDependencies)</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj =================================================================== --- trunk/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) +++ trunk/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -62,6 +63,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -74,9 +76,12 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/src/node/x3d-core/x3d-core.vcxproj =================================================================== --- trunk/src/node/x3d-core/x3d-core.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) +++ trunk/src/node/x3d-core/x3d-core.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) @@ -30,7 +30,6 @@ </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <WholeProgramOptimization>false</WholeProgramOptimization> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -54,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -63,6 +63,7 @@ <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -75,9 +76,12 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/src/node/x3d-dis/x3d-dis.vcxproj =================================================================== --- trunk/src/node/x3d-dis/x3d-dis.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) +++ trunk/src/node/x3d-dis/x3d-dis.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -62,6 +63,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -74,9 +76,12 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj =================================================================== --- trunk/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) +++ trunk/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -62,6 +63,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -74,9 +76,12 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj =================================================================== --- trunk/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) +++ trunk/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -62,6 +63,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -74,9 +76,12 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj =================================================================== --- trunk/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) +++ trunk/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -62,6 +63,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -74,9 +76,12 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/src/node/x3d-geospatial/x3d-geospatial.vcxproj =================================================================== --- trunk/src/node/x3d-geospatial/x3d-geospatial.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) +++ trunk/src/node/x3d-geospatial/x3d-geospatial.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -62,6 +63,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -74,9 +76,12 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/src/node/x3d-grouping/x3d-grouping.vcxproj =================================================================== --- trunk/src/node/x3d-grouping/x3d-grouping.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) +++ trunk/src/node/x3d-grouping/x3d-grouping.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -62,6 +63,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -74,9 +76,12 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/src/node/x3d-h-anim/x3d-h-anim.vcxproj =================================================================== --- trunk/src/node/x3d-h-anim/x3d-h-anim.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) +++ trunk/src/node/x3d-h-anim/x3d-h-anim.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -62,6 +63,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -74,9 +76,12 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/src/node/x3d-interpolation/x3d-interpolation.vcxproj =================================================================== --- trunk/src/node/x3d-interpolation/x3d-interpolation.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) +++ trunk/src/node/x3d-interpolation/x3d-interpolation.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -62,6 +63,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -74,9 +76,12 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> 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-05-20 04:14:52 UTC (rev 4295) +++ trunk/src/node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -62,6 +63,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -74,9 +76,12 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/src/node/x3d-networking/x3d-networking.vcxproj =================================================================== --- trunk/src/node/x3d-networking/x3d-networking.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) +++ trunk/src/node/x3d-networking/x3d-networking.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -64,6 +65,7 @@ <PrecompiledHeader> </PrecompiledHeader> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -78,9 +80,12 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <PrecompiledHeader> </PrecompiledHeader> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/src/node/x3d-nurbs/x3d-nurbs.vcxproj =================================================================== --- trunk/src/node/x3d-nurbs/x3d-nurbs.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) +++ trunk/src/node/x3d-nurbs/x3d-nurbs.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -64,6 +65,7 @@ <PrecompiledHeader> </PrecompiledHeader> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -78,9 +80,12 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <PrecompiledHeader> </PrecompiledHeader> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/src/node/x3d-rendering/x3d-rendering.vcxproj =================================================================== --- trunk/src/node/x3d-rendering/x3d-rendering.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) +++ trunk/src/node/x3d-rendering/x3d-rendering.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -64,6 +65,7 @@ <PrecompiledHeader> </PrecompiledHeader> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -78,9 +80,12 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <PrecompiledHeader> </PrecompiledHeader> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/src/node/x3d-shape/x3d-shape.vcxproj =================================================================== --- trunk/src/node/x3d-shape/x3d-shape.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) +++ trunk/src/node/x3d-shape/x3d-shape.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) @@ -53,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -64,6 +65,7 @@ <PrecompiledHeader> </PrecompiledHeader> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -78,9 +80,12 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <PrecompiledHeader> </PrecompiledHeader> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/src/node/x3d-texturing/x3d-texturing.vcxproj =================================================================== --- trunk/src/node/x3d-texturing/x3d-texturing.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) +++ trunk/src/node/x3d-texturing/x3d-texturing.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) @@ -26,7 +26,6 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <CharacterSet>Unicode</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -54,6 +53,7 @@ <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> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -65,6 +65,7 @@ <PrecompiledHeader> </PrecompiledHeader> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -79,9 +80,12 @@ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <PrecompiledHeader> </PrecompiledHeader> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/src/script/javascript.vcxproj =================================================================== --- trunk/src/script/javascript.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) +++ trunk/src/script/javascript.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) @@ -44,7 +44,6 @@ <PropertyGroup> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\bin\script\</OutDir> - <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> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\script\</OutDir> @@ -64,11 +63,11 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <AdditionalDependencies>mozjs.lib;%(AdditionalDependencies)</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -78,13 +77,13 @@ <AdditionalIncludeDirectories>..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <AdditionalDependencies>mozjs.lib;%(AdditionalDependencies)</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <OptimizeReferences>true</OptimizeReferences> <EnableCOMDATFolding>true</EnableCOMDATFolding> - <SubSystem>Windows</SubSystem> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/tests/parse-vrml97.vcxproj =================================================================== --- trunk/tests/parse-vrml97.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) +++ trunk/tests/parse-vrml97.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) @@ -41,7 +41,6 @@ <PropertyGroup> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir> - <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> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir> @@ -59,6 +58,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -73,6 +73,7 @@ <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: trunk/tests/parse-x3dvrml.vcxproj =================================================================== --- trunk/tests/parse-x3dvrml.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) +++ trunk/tests/parse-x3dvrml.vcxproj 2012-05-20 07:37:35 UTC (rev 4296) @@ -41,7 +41,6 @@ <PropertyGroup> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir> - <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> <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir> @@ -59,6 +58,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -73,6 +73,7 @@ <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-05-20 04:14:59
|
Revision: 4295 http://openvrml.svn.sourceforge.net/openvrml/?rev=4295&view=rev Author: braden Date: 2012-05-20 04:14:52 +0000 (Sun, 20 May 2012) Log Message: ----------- More project file clean-up. Mostly, remove more settings that should be deferred to user properties. 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,4280-4281,4283,4285,4287,4292 + /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,4292,4294 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2012-05-20 04:12:19 UTC (rev 4294) +++ branches/0.18/ChangeLog 2012-05-20 04:14:52 UTC (rev 4295) @@ -1,3 +1,34 @@ +2012-05-20 Braden McDaniel <br...@en...> + + More project file clean-up. Mostly, remove more settings that + should be deferred to user properties. + + * examples/pretty-print.vcxproj + * examples/sdl-viewer.vcxproj + * tests/parse-vrml97.vcxproj + * tests/parse-x3dvrml.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 + 2012-05-19 Braden McDaniel <br...@en...> * src/Makefile.am (EXTRA_DIST): Add openvrml-dl project file to Modified: branches/0.18/examples/pretty-print.vcxproj =================================================================== --- branches/0.18/examples/pretty-print.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) +++ branches/0.18/examples/pretty-print.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) @@ -57,7 +57,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -71,9 +70,6 @@ <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: branches/0.18/examples/sdl-viewer.vcxproj =================================================================== --- branches/0.18/examples/sdl-viewer.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) +++ branches/0.18/examples/sdl-viewer.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) @@ -54,13 +54,9 @@ <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\src\libopenvrml-gl;..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <BasicRuntimeChecks>Default</BasicRuntimeChecks> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> - <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> - <RuntimeTypeInfo>true</RuntimeTypeInfo> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <AdditionalDependencies>opengl32.lib;glu32.lib;SDLmain.lib;SDL.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -78,11 +74,6 @@ <AdditionalIncludeDirectories>..\src\libopenvrml-gl;..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> - <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> - <RuntimeTypeInfo>true</RuntimeTypeInfo> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <AdditionalDependencies>opengl32.lib;glu32.lib;SDLmain.lib;SDL.lib;%(AdditionalDependencies)</AdditionalDependencies> Modified: branches/0.18/src/libopenvrml/openvrml.vcxproj =================================================================== --- branches/0.18/src/libopenvrml/openvrml.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) +++ branches/0.18/src/libopenvrml/openvrml.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) @@ -27,7 +27,6 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>Windows7.1SDK</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> @@ -66,12 +65,11 @@ <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.;..\local\libopenvrml-dl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <MultiProcessorCompilation>true</MultiProcessorCompilation> <AdditionalUsingDirectories> </AdditionalUsingDirectories> - <RuntimeTypeInfo>true</RuntimeTypeInfo> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> </ClCompile> <ResourceCompile> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> @@ -92,12 +90,8 @@ <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>.;..\local\libopenvrml-dl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> <AdditionalUsingDirectories> </AdditionalUsingDirectories> - <RuntimeTypeInfo>true</RuntimeTypeInfo> <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Size</FavorSizeOrSpeed> <StringPooling>true</StringPooling> Modified: branches/0.18/src/libopenvrml-gl/openvrml-gl.vcxproj =================================================================== --- branches/0.18/src/libopenvrml-gl/openvrml-gl.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) +++ branches/0.18/src/libopenvrml-gl/openvrml-gl.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) @@ -57,11 +57,8 @@ <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.;..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_GL_BUILD_DLL;OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <BasicRuntimeChecks>Default</BasicRuntimeChecks> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> - <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> - <RuntimeTypeInfo>true</RuntimeTypeInfo> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> </ClCompile> <ResourceCompile> @@ -84,11 +81,6 @@ <PreprocessorDefinitions>OPENVRML_GL_BUILD_DLL;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> - <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> - <RuntimeTypeInfo>true</RuntimeTypeInfo> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> Modified: branches/0.18/src/local/libopenvrml-dl/openvrml-dl.vcxproj =================================================================== --- branches/0.18/src/local/libopenvrml-dl/openvrml-dl.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) +++ branches/0.18/src/local/libopenvrml-dl/openvrml-dl.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) @@ -74,7 +74,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -84,9 +83,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> Modified: branches/0.18/src/node/vrml97/vrml97.vcxproj =================================================================== --- branches/0.18/src/node/vrml97/vrml97.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) +++ branches/0.18/src/node/vrml97/vrml97.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) @@ -62,7 +62,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <AdditionalDependencies>libpng15.lib;zlib.lib;freetype249_D.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -76,9 +75,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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>libpng15.lib;zlib.lib;freetype249.lib;%(AdditionalDependencies)</AdditionalDependencies> 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-20 04:12:19 UTC (rev 4294) +++ branches/0.18/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) @@ -62,7 +62,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -75,9 +74,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: branches/0.18/src/node/x3d-core/x3d-core.vcxproj =================================================================== --- branches/0.18/src/node/x3d-core/x3d-core.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) +++ branches/0.18/src/node/x3d-core/x3d-core.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) @@ -61,7 +61,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> </ClCompile> @@ -76,9 +75,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: branches/0.18/src/node/x3d-dis/x3d-dis.vcxproj =================================================================== --- branches/0.18/src/node/x3d-dis/x3d-dis.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) +++ branches/0.18/src/node/x3d-dis/x3d-dis.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) @@ -62,7 +62,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -75,9 +74,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> 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-20 04:12:19 UTC (rev 4294) +++ branches/0.18/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) @@ -62,7 +62,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -75,9 +74,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> 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-20 04:12:19 UTC (rev 4294) +++ branches/0.18/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) @@ -62,7 +62,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -75,9 +74,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: branches/0.18/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj =================================================================== --- branches/0.18/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) +++ branches/0.18/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) @@ -62,7 +62,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -75,9 +74,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: branches/0.18/src/node/x3d-geospatial/x3d-geospatial.vcxproj =================================================================== --- branches/0.18/src/node/x3d-geospatial/x3d-geospatial.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) +++ branches/0.18/src/node/x3d-geospatial/x3d-geospatial.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) @@ -62,7 +62,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -75,9 +74,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: branches/0.18/src/node/x3d-grouping/x3d-grouping.vcxproj =================================================================== --- branches/0.18/src/node/x3d-grouping/x3d-grouping.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) +++ branches/0.18/src/node/x3d-grouping/x3d-grouping.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) @@ -62,7 +62,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -75,9 +74,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> 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-20 04:12:19 UTC (rev 4294) +++ branches/0.18/src/node/x3d-h-anim/x3d-h-anim.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) @@ -62,7 +62,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -75,9 +74,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: branches/0.18/src/node/x3d-interpolation/x3d-interpolation.vcxproj =================================================================== --- branches/0.18/src/node/x3d-interpolation/x3d-interpolation.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) +++ branches/0.18/src/node/x3d-interpolation/x3d-interpolation.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) @@ -62,7 +62,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -75,9 +74,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> 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-20 04:12:19 UTC (rev 4294) +++ branches/0.18/src/node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) @@ -74,8 +74,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: branches/0.18/src/node/x3d-networking/x3d-networking.vcxproj =================================================================== --- branches/0.18/src/node/x3d-networking/x3d-networking.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) +++ branches/0.18/src/node/x3d-networking/x3d-networking.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) @@ -59,7 +59,6 @@ <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <PrecompiledHeader> @@ -77,10 +76,8 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> <PrecompiledHeader> </PrecompiledHeader> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: branches/0.18/src/node/x3d-nurbs/x3d-nurbs.vcxproj =================================================================== --- branches/0.18/src/node/x3d-nurbs/x3d-nurbs.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) +++ branches/0.18/src/node/x3d-nurbs/x3d-nurbs.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) @@ -59,7 +59,6 @@ <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <PrecompiledHeader> @@ -77,10 +76,8 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> <PrecompiledHeader> </PrecompiledHeader> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: branches/0.18/src/node/x3d-rendering/x3d-rendering.vcxproj =================================================================== --- branches/0.18/src/node/x3d-rendering/x3d-rendering.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) +++ branches/0.18/src/node/x3d-rendering/x3d-rendering.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) @@ -59,7 +59,6 @@ <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <PrecompiledHeader> @@ -77,10 +76,8 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> <PrecompiledHeader> </PrecompiledHeader> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: branches/0.18/src/node/x3d-shape/x3d-shape.vcxproj =================================================================== --- branches/0.18/src/node/x3d-shape/x3d-shape.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) +++ branches/0.18/src/node/x3d-shape/x3d-shape.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) @@ -59,7 +59,6 @@ <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <PrecompiledHeader> @@ -77,10 +76,8 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> <PrecompiledHeader> </PrecompiledHeader> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: branches/0.18/src/node/x3d-texturing/x3d-texturing.vcxproj =================================================================== --- branches/0.18/src/node/x3d-texturing/x3d-texturing.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) +++ branches/0.18/src/node/x3d-texturing/x3d-texturing.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) @@ -60,7 +60,6 @@ <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <PrecompiledHeader> @@ -78,12 +77,8 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> <PrecompiledHeader> </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <DisableSpecificWarnings>4226;4250;4251;4275;4290;4355;4661;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: branches/0.18/src/script/javascript.vcxproj =================================================================== --- branches/0.18/src/script/javascript.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) +++ branches/0.18/src/script/javascript.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) @@ -64,7 +64,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <AdditionalDependencies>mozjs.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -79,9 +78,6 @@ <AdditionalIncludeDirectories>..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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>mozjs.lib;%(AdditionalDependencies)</AdditionalDependencies> Modified: branches/0.18/tests/parse-vrml97.vcxproj =================================================================== --- branches/0.18/tests/parse-vrml97.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) +++ branches/0.18/tests/parse-vrml97.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) @@ -59,7 +59,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -74,9 +73,6 @@ <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: branches/0.18/tests/parse-x3dvrml.vcxproj =================================================================== --- branches/0.18/tests/parse-x3dvrml.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) +++ branches/0.18/tests/parse-x3dvrml.vcxproj 2012-05-20 04:14:52 UTC (rev 4295) @@ -59,7 +59,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -74,9 +73,6 @@ <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-05-20 04:12:27
|
Revision: 4294 http://openvrml.svn.sourceforge.net/openvrml/?rev=4294&view=rev Author: braden Date: 2012-05-20 04:12:19 +0000 (Sun, 20 May 2012) Log Message: ----------- More project file clean-up. Mostly, remove more settings that should be deferred to user properties. Modified Paths: -------------- trunk/ChangeLog 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/ChangeLog =================================================================== --- trunk/ChangeLog 2012-05-19 15:20:42 UTC (rev 4293) +++ trunk/ChangeLog 2012-05-20 04:12:19 UTC (rev 4294) @@ -1,3 +1,34 @@ +2012-05-20 Braden McDaniel <br...@en...> + + More project file clean-up. Mostly, remove more settings that + should be deferred to user properties. + + * examples/pretty-print.vcxproj + * examples/sdl-viewer.vcxproj + * tests/parse-vrml97.vcxproj + * tests/parse-x3dvrml.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 + 2012-05-19 Braden McDaniel <br...@en...> * src/Makefile.am (EXTRA_DIST): Add openvrml-dl project file to Modified: trunk/examples/pretty-print.vcxproj =================================================================== --- trunk/examples/pretty-print.vcxproj 2012-05-19 15:20:42 UTC (rev 4293) +++ trunk/examples/pretty-print.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) @@ -57,7 +57,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -71,9 +70,6 @@ <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: trunk/examples/sdl-viewer.vcxproj =================================================================== --- trunk/examples/sdl-viewer.vcxproj 2012-05-19 15:20:42 UTC (rev 4293) +++ trunk/examples/sdl-viewer.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) @@ -54,13 +54,9 @@ <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\src\libopenvrml-gl;..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <BasicRuntimeChecks>Default</BasicRuntimeChecks> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> - <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> - <RuntimeTypeInfo>true</RuntimeTypeInfo> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <AdditionalDependencies>opengl32.lib;glu32.lib;SDLmain.lib;SDL.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -78,11 +74,6 @@ <AdditionalIncludeDirectories>..\src\libopenvrml-gl;..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> - <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> - <RuntimeTypeInfo>true</RuntimeTypeInfo> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <AdditionalDependencies>opengl32.lib;glu32.lib;SDLmain.lib;SDL.lib;%(AdditionalDependencies)</AdditionalDependencies> Modified: trunk/src/libopenvrml/openvrml.vcxproj =================================================================== --- trunk/src/libopenvrml/openvrml.vcxproj 2012-05-19 15:20:42 UTC (rev 4293) +++ trunk/src/libopenvrml/openvrml.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) @@ -27,7 +27,6 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>Windows7.1SDK</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> @@ -66,12 +65,11 @@ <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.;..\local\libopenvrml-dl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <MultiProcessorCompilation>true</MultiProcessorCompilation> <AdditionalUsingDirectories> </AdditionalUsingDirectories> - <RuntimeTypeInfo>true</RuntimeTypeInfo> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> </ClCompile> <ResourceCompile> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> @@ -92,12 +90,8 @@ <OmitFramePointers>true</OmitFramePointers> <AdditionalIncludeDirectories>.;..\local\libopenvrml-dl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> <AdditionalUsingDirectories> </AdditionalUsingDirectories> - <RuntimeTypeInfo>true</RuntimeTypeInfo> <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Size</FavorSizeOrSpeed> <StringPooling>true</StringPooling> Modified: trunk/src/libopenvrml-gl/openvrml-gl.vcxproj =================================================================== --- trunk/src/libopenvrml-gl/openvrml-gl.vcxproj 2012-05-19 15:20:42 UTC (rev 4293) +++ trunk/src/libopenvrml-gl/openvrml-gl.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) @@ -57,11 +57,8 @@ <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>.;..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_GL_BUILD_DLL;OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <BasicRuntimeChecks>Default</BasicRuntimeChecks> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> - <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> - <RuntimeTypeInfo>true</RuntimeTypeInfo> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> </ClCompile> <ResourceCompile> @@ -84,11 +81,6 @@ <PreprocessorDefinitions>OPENVRML_GL_BUILD_DLL;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> - <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> - <RuntimeTypeInfo>true</RuntimeTypeInfo> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <FloatingPointModel>Fast</FloatingPointModel> </ClCompile> <Link> Modified: trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj =================================================================== --- trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj 2012-05-19 15:20:42 UTC (rev 4293) +++ trunk/src/local/libopenvrml-dl/openvrml-dl.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) @@ -74,7 +74,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -84,9 +83,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> Modified: trunk/src/node/vrml97/vrml97.vcxproj =================================================================== --- trunk/src/node/vrml97/vrml97.vcxproj 2012-05-19 15:20:42 UTC (rev 4293) +++ trunk/src/node/vrml97/vrml97.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) @@ -62,7 +62,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <AdditionalDependencies>libpng15.lib;zlib.lib;freetype249_D.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -76,9 +75,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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>libpng15.lib;zlib.lib;freetype249.lib;%(AdditionalDependencies)</AdditionalDependencies> Modified: trunk/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj =================================================================== --- trunk/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj 2012-05-19 15:20:42 UTC (rev 4293) +++ trunk/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) @@ -62,7 +62,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -75,9 +74,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: trunk/src/node/x3d-core/x3d-core.vcxproj =================================================================== --- trunk/src/node/x3d-core/x3d-core.vcxproj 2012-05-19 15:20:42 UTC (rev 4293) +++ trunk/src/node/x3d-core/x3d-core.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) @@ -61,7 +61,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> </ClCompile> @@ -76,9 +75,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: trunk/src/node/x3d-dis/x3d-dis.vcxproj =================================================================== --- trunk/src/node/x3d-dis/x3d-dis.vcxproj 2012-05-19 15:20:42 UTC (rev 4293) +++ trunk/src/node/x3d-dis/x3d-dis.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) @@ -62,7 +62,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -75,9 +74,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: trunk/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj =================================================================== --- trunk/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj 2012-05-19 15:20:42 UTC (rev 4293) +++ trunk/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) @@ -62,7 +62,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -75,9 +74,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: trunk/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj =================================================================== --- trunk/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj 2012-05-19 15:20:42 UTC (rev 4293) +++ trunk/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) @@ -62,7 +62,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -75,9 +74,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: trunk/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj =================================================================== --- trunk/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj 2012-05-19 15:20:42 UTC (rev 4293) +++ trunk/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) @@ -62,7 +62,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -75,9 +74,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: trunk/src/node/x3d-geospatial/x3d-geospatial.vcxproj =================================================================== --- trunk/src/node/x3d-geospatial/x3d-geospatial.vcxproj 2012-05-19 15:20:42 UTC (rev 4293) +++ trunk/src/node/x3d-geospatial/x3d-geospatial.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) @@ -62,7 +62,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -75,9 +74,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: trunk/src/node/x3d-grouping/x3d-grouping.vcxproj =================================================================== --- trunk/src/node/x3d-grouping/x3d-grouping.vcxproj 2012-05-19 15:20:42 UTC (rev 4293) +++ trunk/src/node/x3d-grouping/x3d-grouping.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) @@ -62,7 +62,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -75,9 +74,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: trunk/src/node/x3d-h-anim/x3d-h-anim.vcxproj =================================================================== --- trunk/src/node/x3d-h-anim/x3d-h-anim.vcxproj 2012-05-19 15:20:42 UTC (rev 4293) +++ trunk/src/node/x3d-h-anim/x3d-h-anim.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) @@ -62,7 +62,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -75,9 +74,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: trunk/src/node/x3d-interpolation/x3d-interpolation.vcxproj =================================================================== --- trunk/src/node/x3d-interpolation/x3d-interpolation.vcxproj 2012-05-19 15:20:42 UTC (rev 4293) +++ trunk/src/node/x3d-interpolation/x3d-interpolation.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) @@ -62,7 +62,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -75,9 +74,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> 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-05-19 15:20:42 UTC (rev 4293) +++ trunk/src/node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) @@ -74,8 +74,6 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: trunk/src/node/x3d-networking/x3d-networking.vcxproj =================================================================== --- trunk/src/node/x3d-networking/x3d-networking.vcxproj 2012-05-19 15:20:42 UTC (rev 4293) +++ trunk/src/node/x3d-networking/x3d-networking.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) @@ -59,7 +59,6 @@ <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <PrecompiledHeader> @@ -77,10 +76,8 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> <PrecompiledHeader> </PrecompiledHeader> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: trunk/src/node/x3d-nurbs/x3d-nurbs.vcxproj =================================================================== --- trunk/src/node/x3d-nurbs/x3d-nurbs.vcxproj 2012-05-19 15:20:42 UTC (rev 4293) +++ trunk/src/node/x3d-nurbs/x3d-nurbs.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) @@ -59,7 +59,6 @@ <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <PrecompiledHeader> @@ -77,10 +76,8 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> <PrecompiledHeader> </PrecompiledHeader> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: trunk/src/node/x3d-rendering/x3d-rendering.vcxproj =================================================================== --- trunk/src/node/x3d-rendering/x3d-rendering.vcxproj 2012-05-19 15:20:42 UTC (rev 4293) +++ trunk/src/node/x3d-rendering/x3d-rendering.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) @@ -59,7 +59,6 @@ <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <PrecompiledHeader> @@ -77,10 +76,8 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> <PrecompiledHeader> </PrecompiledHeader> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: trunk/src/node/x3d-shape/x3d-shape.vcxproj =================================================================== --- trunk/src/node/x3d-shape/x3d-shape.vcxproj 2012-05-19 15:20:42 UTC (rev 4293) +++ trunk/src/node/x3d-shape/x3d-shape.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) @@ -59,7 +59,6 @@ <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <PrecompiledHeader> @@ -77,10 +76,8 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> <PrecompiledHeader> </PrecompiledHeader> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: trunk/src/node/x3d-texturing/x3d-texturing.vcxproj =================================================================== --- trunk/src/node/x3d-texturing/x3d-texturing.vcxproj 2012-05-19 15:20:42 UTC (rev 4293) +++ trunk/src/node/x3d-texturing/x3d-texturing.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) @@ -60,7 +60,6 @@ <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <PrecompiledHeader> @@ -78,12 +77,8 @@ <AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> <PrecompiledHeader> </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <DisableSpecificWarnings>4226;4250;4251;4275;4290;4355;4661;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: trunk/src/script/javascript.vcxproj =================================================================== --- trunk/src/script/javascript.vcxproj 2012-05-19 15:20:42 UTC (rev 4293) +++ trunk/src/script/javascript.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) @@ -64,7 +64,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <AdditionalDependencies>mozjs.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -79,9 +78,6 @@ <AdditionalIncludeDirectories>..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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>mozjs.lib;%(AdditionalDependencies)</AdditionalDependencies> Modified: trunk/tests/parse-vrml97.vcxproj =================================================================== --- trunk/tests/parse-vrml97.vcxproj 2012-05-19 15:20:42 UTC (rev 4293) +++ trunk/tests/parse-vrml97.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) @@ -59,7 +59,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -74,9 +73,6 @@ <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> Modified: trunk/tests/parse-x3dvrml.vcxproj =================================================================== --- trunk/tests/parse-x3dvrml.vcxproj 2012-05-19 15:20:42 UTC (rev 4293) +++ trunk/tests/parse-x3dvrml.vcxproj 2012-05-20 04:12:19 UTC (rev 4294) @@ -59,7 +59,6 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -74,9 +73,6 @@ <AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-05-19 15:20:49
|
Revision: 4293 http://openvrml.svn.sourceforge.net/openvrml/?rev=4293&view=rev Author: braden Date: 2012-05-19 15:20:42 +0000 (Sat, 19 May 2012) Log Message: ----------- Add openvrml-dl project file to the distribution. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/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,4268,4270,4272,4274,4276,4278,4280-4281,4283,4285,4287 + /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,4292 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2012-05-19 15:07:27 UTC (rev 4292) +++ branches/0.18/ChangeLog 2012-05-19 15:20:42 UTC (rev 4293) @@ -1,3 +1,8 @@ +2012-05-19 Braden McDaniel <br...@en...> + + * src/Makefile.am (EXTRA_DIST): Add openvrml-dl project file to + the distribution. + 2012-05-05 Braden McDaniel <br...@en...> Updates for 0.18.9 release. Modified: branches/0.18/src/Makefile.am =================================================================== --- branches/0.18/src/Makefile.am 2012-05-19 15:07:27 UTC (rev 4292) +++ branches/0.18/src/Makefile.am 2012-05-19 15:20:42 UTC (rev 4293) @@ -926,6 +926,7 @@ libopenvrml-gl/openvrml-gl-config-win32.h \ libopenvrml-gl/openvrml-gl.rc \ libopenvrml-gl/openvrml-gl.vcxproj \ + local/libopenvrml-dl/openvrml-dl.vcxproj \ node/vrml97/vrml97.vcxproj \ node/x3d-core/x3d-core.vcxproj \ node/x3d-event-utilities/x3d-event-utilities.vcxproj \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2012-05-19 15:07:34
|
Revision: 4292 http://openvrml.svn.sourceforge.net/openvrml/?rev=4292&view=rev Author: braden Date: 2012-05-19 15:07:27 +0000 (Sat, 19 May 2012) Log Message: ----------- Add openvrml-dl project file to the distribution. Modified Paths: -------------- trunk/ChangeLog trunk/src/Makefile.am Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2012-05-19 05:37:09 UTC (rev 4291) +++ trunk/ChangeLog 2012-05-19 15:07:27 UTC (rev 4292) @@ -1,3 +1,8 @@ +2012-05-19 Braden McDaniel <br...@en...> + + * src/Makefile.am (EXTRA_DIST): Add openvrml-dl project file to + the distribution. + 2012-05-05 Braden McDaniel <br...@en...> Updates for 0.18.9 release. Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2012-05-19 05:37:09 UTC (rev 4291) +++ trunk/src/Makefile.am 2012-05-19 15:07:27 UTC (rev 4292) @@ -926,6 +926,7 @@ libopenvrml-gl/openvrml-gl-config-win32.h \ libopenvrml-gl/openvrml-gl.rc \ libopenvrml-gl/openvrml-gl.vcxproj \ + local/libopenvrml-dl/openvrml-dl.vcxproj \ node/vrml97/vrml97.vcxproj \ node/x3d-core/x3d-core.vcxproj \ node/x3d-event-utilities/x3d-event-utilities.vcxproj \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |