Menu
▾
▴
openvrml-commit
|
From: <br...@us...> - 2012-04-23 07:40:17
|
Revision: 4250
http://openvrml.svn.sourceforge.net/openvrml/?rev=4250&view=rev
Author: braden
Date: 2012-04-23 07:40:06 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
libpng 1.5 removes direct access to struct members; use accessor functions instead.
Modified Paths:
--------------
branches/0.18/ChangeLog
branches/0.18/src/node/vrml97/image_stream_listener.cpp
branches/0.18/src/node/vrml97/image_stream_listener.h
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,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
+ /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,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
Modified: branches/0.18/ChangeLog
===================================================================
--- branches/0.18/ChangeLog 2012-04-23 07:37:06 UTC (rev 4249)
+++ branches/0.18/ChangeLog 2012-04-23 07:40:06 UTC (rev 4250)
@@ -1,7 +1,15 @@
+2012-04-23 Tom Callaway <tca...@re...>
+
+ libpng 1.5 removes direct access to struct members; use accessor
+ functions instead.
+
+ * src/node/vrml97/image_stream_listener.cpp
+ * src/node/vrml97/image_stream_listener.h
+
2012-04-23 Braden McDaniel <br...@en...>
- NP[P]_GetMIMEDescription returns const char * in recent variations of
- NPAPI.
+ NP[P]_GetMIMEDescription returns const char * in recent variations
+ of NPAPI.
* configure.ac
* src/mozilla-plugin/openvrml.cpp
Modified: branches/0.18/src/node/vrml97/image_stream_listener.cpp
===================================================================
--- branches/0.18/src/node/vrml97/image_stream_listener.cpp 2012-04-23 07:37:06 UTC (rev 4249)
+++ branches/0.18/src/node/vrml97/image_stream_listener.cpp 2012-04-23 07:40:06 UTC (rev 4250)
@@ -136,7 +136,9 @@
png_read_update_info(png_ptr, info_ptr);
- reader.old_row.resize(png_ptr->rowbytes);
+ reader.width = png_get_image_width(png_ptr, info_ptr);
+ reader.rowbytes = png_get_rowbytes(png_ptr, info_ptr);
+ reader.old_row.resize(reader.rowbytes);
}
void openvrml_png_row_callback(png_structp png_ptr,
@@ -166,9 +168,7 @@
// openvrml::image pixels start at the bottom left.
//
const size_t image_row = (image.y() - 1) - row_num;
- const size_t bytes_per_row = png_ptr->rowbytes;
- const size_t image_width = png_ptr->width;
- for (size_t pixel_index = 0, byte_index = 0; pixel_index < image_width;
+ for (size_t pixel_index = 0, byte_index = 0; pixel_index < reader.width;
++pixel_index) {
using openvrml::int32;
int32 pixel = 0x00000000;
@@ -188,14 +188,14 @@
++byte_index;
}
}
- image.pixel(image_row * image_width + pixel_index, pixel);
+ image.pixel(image_row * reader.width + pixel_index, pixel);
}
reader.stream_listener.node_.modified(true);
- assert(reader.old_row.size() >= bytes_per_row);
+ assert(reader.old_row.size() >= reader.rowbytes);
- copy(new_row, new_row + bytes_per_row, reader.old_row.begin());
+ copy(new_row, new_row + reader.rowbytes, reader.old_row.begin());
}
void openvrml_png_end_callback(png_structp, png_infop)
Modified: branches/0.18/src/node/vrml97/image_stream_listener.h
===================================================================
--- branches/0.18/src/node/vrml97/image_stream_listener.h 2012-04-23 07:37:06 UTC (rev 4249)
+++ branches/0.18/src/node/vrml97/image_stream_listener.h 2012-04-23 07:40:06 UTC (rev 4250)
@@ -88,6 +88,8 @@
image_stream_listener & stream_listener;
std::vector<png_byte> old_row;
bool gray_palette;
+ png_uint_32 width;
+ png_size_t rowbytes;
explicit png_reader(image_stream_listener & stream_listener);
virtual ~png_reader() OPENVRML_NOTHROW;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2012-04-23 08:22:47
|
Revision: 4252
http://openvrml.svn.sourceforge.net/openvrml/?rev=4252&view=rev
Author: braden
Date: 2012-04-23 08:22:36 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
More fallout from SpiderMonkey moves away from using jsvals as ids. Just mitigate this for now.
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,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
+ /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,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
Modified: branches/0.18/ChangeLog
===================================================================
--- branches/0.18/ChangeLog 2012-04-23 08:19:23 UTC (rev 4251)
+++ branches/0.18/ChangeLog 2012-04-23 08:22:36 UTC (rev 4252)
@@ -1,3 +1,8 @@
+2012-04-23 Braden McDaniel <br...@en...>
+
+ * src/script/javascript.cpp: More fallout from SpiderMonkey moves
+ away from using jsvals as ids. Just mitigate this for now.
+
2012-04-23 Tom Callaway <tca...@re...>
libpng 1.5 removes direct access to struct members; use accessor
Modified: branches/0.18/src/script/javascript.cpp
===================================================================
--- branches/0.18/src/script/javascript.cpp 2012-04-23 08:19:23 UTC (rev 4251)
+++ branches/0.18/src/script/javascript.cpp 2012-04-23 08:22:36 UTC (rev 4252)
@@ -53,7 +53,7 @@
# endif
}
- ::int32 jspropertyop_id_to_int(const jspropertyop_id id)
+ int32_t jspropertyop_id_to_int(const jspropertyop_id id)
{
# if OPENVRML_JSPROPERTYOP_USES_JSID
return JSID_TO_INT(id);
@@ -62,6 +62,25 @@
# endif
}
+ JSBool jspropertyop_id_is_string(const jspropertyop_id id)
+ {
+# if OPENVRML_JSPROPERTYOP_USES_JSID
+ return JSID_IS_STRING(id);
+# else
+ return JSVAL_IS_STRING(id);
+# endif
+ }
+
+ JSString * jspropertyop_id_to_string(JSContext * const cx,
+ const jspropertyop_id id)
+ {
+# if OPENVRML_JSPROPERTYOP_USES_JSID
+ return JSID_TO_STRING(id);
+# else
+ return JS_ValueToString(cx, id);
+# endif
+ }
+
OPENVRML_LOCAL JSBool add_value_root(JSContext * const cx,
jsval * const vp)
{
@@ -453,7 +472,7 @@
private:
static OPENVRML_DECLARE_JSNATIVE(construct);
static JSBool initObject(JSContext * cx, JSObject * obj,
- uint32 x, uint32 y, uint32 comp,
+ uint32_t x, uint32_t y, uint32_t comp,
JSObject * pixels_obj)
OPENVRML_NOTHROW;
static JSBool getProperty(JSContext * cx, JSObject * obj,
@@ -1553,7 +1572,7 @@
{
using std::find_if;
- JSString * const str = JS_ValueToString(cx, id);
+ JSString * const str = jspropertyop_id_to_string(cx, id);
if (!str) { return JS_FALSE; }
const char * const eventId = JS_EncodeString(cx, str);
@@ -1604,7 +1623,7 @@
{
using std::find_if;
- JSString * const str = JS_ValueToString(cx, id);
+ JSString * const str = jspropertyop_id_to_string(cx, id);
if (!str) { return JS_FALSE; }
const char * const fieldId = JS_EncodeString(cx, str);
@@ -1945,7 +1964,7 @@
case field_value::sfint32_id:
{
- ::int32 i;
+ int32_t i;
if (!JS_ValueToECMAInt32(cx, v, &i)) {
throw bad_conversion("Numeric value expected.");
}
@@ -2944,7 +2963,7 @@
OPENVRML_DEFINE_MEMBER_JSNATIVE(SFImage, construct)
{
- uint32 x = 0, y = 0, comp = 0;
+ uint32_t x = 0, y = 0, comp = 0;
JSObject * pixels = 0;
if (!JS_ConvertArguments(cx, argc, OPENVRML_JS_ARGV(cx, vp), "uuuo",
&x, &y, &comp, &pixels)) {
@@ -2981,9 +3000,9 @@
//
JSBool SFImage::initObject(JSContext * const cx,
JSObject * const obj,
- const uint32 x,
- const uint32 y,
- const uint32 comp,
+ const uint32_t x,
+ const uint32_t y,
+ const uint32_t comp,
JSObject * const pixels_obj)
OPENVRML_NOTHROW
{
@@ -3009,7 +3028,7 @@
assert(JSVAL_IS_INT(mfdata->array[i]));
static const long byteMask[] =
{ 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000 };
- ::int32 pixel;
+ int32_t pixel;
if (!JS_ValueToInt32(cx, mfdata->array[i], &pixel)) {
return JS_FALSE;
}
@@ -3281,7 +3300,7 @@
jsval * const vp)
OPENVRML_NOTHROW
{
- if (!JSVAL_IS_STRING(id)) { return JS_TRUE; }
+ if (!jspropertyop_id_is_string(id)) { return JS_TRUE; }
assert(JS_GetPrivate(cx, obj));
const sfield::sfdata & sfdata =
@@ -3296,7 +3315,8 @@
script & s = *static_cast<script *>(JS_GetContextPrivate(cx));
try {
- const char * eventOut = JS_EncodeString(cx, JSVAL_TO_STRING(id));
+ const char * eventOut =
+ JS_EncodeString(cx, jspropertyop_id_to_string(cx, id));
openvrml::event_emitter & emitter =
thisNode.value()->event_emitter(eventOut);
*vp = s.vrmlFieldToJSVal(emitter.value());
@@ -3309,7 +3329,7 @@
OPENVRML_DEFINE_MEMBER_JSSTRICTPROPERTYOP(SFNode, setProperty)
{
- if (JSVAL_IS_STRING(id)) {
+ if (jspropertyop_id_is_string(id)) {
using std::auto_ptr;
using std::string;
@@ -3325,7 +3345,7 @@
boost::intrusive_ptr<openvrml::node> nodePtr = thisNode.value();
const char * const eventInId =
- JS_EncodeString(cx, JSVAL_TO_STRING(id));
+ JS_EncodeString(cx, jspropertyop_id_to_string(cx, id));
try {
using boost::shared_ptr;
@@ -5366,7 +5386,7 @@
MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj));
assert(mfdata);
- uint32 new_length;
+ uint32_t new_length;
if (!JS_ValueToECMAUint32(cx, *vp, &new_length)) { return JS_FALSE; }
if (new_length == mfdata->array.size()) {
@@ -5584,7 +5604,7 @@
MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj));
assert(mfdata);
- uint32 new_length;
+ uint32_t new_length;
if (!JS_ValueToECMAUint32(cx, *vp, &new_length)) { return JS_FALSE; }
if (size_t(JSVAL_TO_INT(*vp)) == mfdata->array.size()) {
@@ -5835,7 +5855,7 @@
MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj));
assert(mfdata);
- uint32 new_length;
+ uint32_t new_length;
if (!JS_ValueToECMAUint32(cx, *vp, &new_length)) { return JS_FALSE; }
try {
@@ -6239,7 +6259,7 @@
// Convert the jsval to an int32 and back to a jsval in order
// to remove any decimal part.
//
- ::int32 integer;
+ int32_t integer;
if (!JS_ValueToECMAInt32(cx, argv[i], &integer)) {
return JS_FALSE;
}
@@ -6282,7 +6302,7 @@
// Convert the jsval to an int32 and back to a jsval in order
// to remove any decimal part.
//
- ::int32 i;
+ int32_t i;
if (!JS_ValueToECMAInt32(cx, *vp, &i)) { return JS_FALSE; }
if (!JS_NewNumberValue(cx, jsdouble(i), &mfdata->array[index])) {
return JS_FALSE;
@@ -6301,7 +6321,7 @@
MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj));
assert(mfdata);
- uint32 new_length;
+ uint32_t new_length;
if (!JS_ValueToECMAUint32(cx, *vp, &new_length)) { return JS_FALSE; }
try {
@@ -6557,7 +6577,7 @@
MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj));
assert(mfdata);
- uint32 new_length;
+ uint32_t new_length;
if (!JS_ValueToECMAUint32(cx, *vp, &new_length)) { return JS_FALSE; }
try {
@@ -6918,7 +6938,7 @@
MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj));
assert(mfdata);
- uint32 new_length;
+ uint32_t new_length;
if (!JS_ValueToECMAUint32(cx, *vp, &new_length)) { return JS_FALSE; }
try {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2012-04-24 02:03:36
|
Revision: 4254
http://openvrml.svn.sourceforge.net/openvrml/?rev=4254&view=rev
Author: braden
Date: 2012-04-24 02:03:29 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
gcc 4.7 insists that intrusive_ptr_add_ref/release declarations occur before inclusion of <boost/intrusive_ptr.hpp>.
Modified Paths:
--------------
branches/0.18/ChangeLog
branches/0.18/src/openvrml-xembed/browserfactory.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,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
+ /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,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
Modified: branches/0.18/ChangeLog
===================================================================
--- branches/0.18/ChangeLog 2012-04-24 02:01:18 UTC (rev 4253)
+++ branches/0.18/ChangeLog 2012-04-24 02:03:29 UTC (rev 4254)
@@ -1,3 +1,9 @@
+2012-04-23 Tom Callaway <tca...@re...>
+
+ * src/openvrml-xembed/browserfactory.cpp: gcc 4.7 insists that
+ intrusive_ptr_add_ref/release declarations occur before inclusion
+ of <boost/intrusive_ptr.hpp>.
+
2012-04-23 Braden McDaniel <br...@en...>
* src/script/javascript.cpp: More fallout from SpiderMonkey moves
Modified: branches/0.18/src/openvrml-xembed/browserfactory.cpp
===================================================================
--- branches/0.18/src/openvrml-xembed/browserfactory.cpp 2012-04-24 02:01:18 UTC (rev 4253)
+++ branches/0.18/src/openvrml-xembed/browserfactory.cpp 2012-04-24 02:03:29 UTC (rev 4254)
@@ -18,7 +18,6 @@
// with this library; if not, see <http://www.gnu.org/licenses/>.
//
-# include <boost/intrusive_ptr.hpp>
# include <boost/scope_exit.hpp>
# include <boost/ref.hpp>
# include <gtk/gtk.h>
@@ -34,6 +33,20 @@
# include "browser-factory-server-glue.h"
# include "browser.h"
+namespace {
+ G_GNUC_INTERNAL void intrusive_ptr_add_ref(GObject * const obj)
+ {
+ g_object_ref(obj);
+ }
+
+ G_GNUC_INTERNAL void intrusive_ptr_release(GObject * const obj)
+ {
+ g_object_unref(obj);
+ }
+}
+
+# include <boost/intrusive_ptr.hpp>
+
G_DEFINE_TYPE(OpenvrmlXembedBrowserFactory,
openvrml_xembed_browser_factory,
G_TYPE_OBJECT)
@@ -51,18 +64,6 @@
GParamSpec * pspec);
}
-namespace {
- G_GNUC_INTERNAL void intrusive_ptr_add_ref(GObject * const obj)
- {
- g_object_ref(obj);
- }
-
- G_GNUC_INTERNAL void intrusive_ptr_release(GObject * const obj)
- {
- g_object_unref(obj);
- }
-}
-
//
// hosts maps the unique bus identifiers of hosts to a controls_map_t; a
// controls_map_t maps an object path to an OpenvrmlXembedBrowser instance.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2012-04-24 03:23:20
|
Revision: 4256
http://openvrml.svn.sourceforge.net/openvrml/?rev=4256&view=rev
Author: braden
Date: 2012-04-24 03:23:13 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
Quell warnings from gcc 4.7.
Modified Paths:
--------------
branches/0.18/ChangeLog
branches/0.18/src/libopenvrml-gl/openvrml/gl/viewer.cpp
branches/0.18/src/openvrml-player/curlbrowserhost.cpp
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,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
+ /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,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
Modified: branches/0.18/ChangeLog
===================================================================
--- branches/0.18/ChangeLog 2012-04-24 02:40:32 UTC (rev 4255)
+++ branches/0.18/ChangeLog 2012-04-24 03:23:13 UTC (rev 4256)
@@ -1,3 +1,11 @@
+2012-04-23 Braden McDaniel <br...@en...>
+
+ Quell warnings from gcc 4.7.
+
+ * src/libopenvrml-gl/openvrml/gl/viewer.cpp
+ * src/openvrml-player/curlbrowserhost.cpp
+ * src/script/javascript.cpp
+
2012-04-23 Tom Callaway <tca...@re...>
* src/openvrml-xembed/browserfactory.cpp: gcc 4.7 insists that
Modified: branches/0.18/src/libopenvrml-gl/openvrml/gl/viewer.cpp
===================================================================
--- branches/0.18/src/libopenvrml-gl/openvrml/gl/viewer.cpp 2012-04-24 02:40:32 UTC (rev 4255)
+++ branches/0.18/src/libopenvrml-gl/openvrml/gl/viewer.cpp 2012-04-24 03:23:13 UTC (rev 4256)
@@ -1236,20 +1236,19 @@
c0 = c1;
++c1;
- double circ_angle0, circ_angle1 = 0.0;
+ double circ_angle = 0.0;
double sha0 = sin(height_angle0), cha0 = cos(height_angle0);
double sha1 = sin(height_angle1), cha1 = cos(height_angle1);
double sca0, cca0;
- double sca1 = sin(circ_angle1), cca1 = cos(circ_angle1);
+ double sca1 = sin(circ_angle), cca1 = cos(circ_angle);
glBegin(GL_QUADS);
for (size_t nc = 0; nc < nCirc; ++nc) {
- circ_angle0 = circ_angle1;
- circ_angle1 = (nc + 1) * cd;
+ circ_angle = (nc + 1) * cd;
sca0 = sca1;
- sca1 = sin(circ_angle1);
+ sca1 = sin(circ_angle);
cca0 = cca1;
- cca1 = cos(circ_angle1);
+ cca1 = cos(circ_angle);
glColor3fv(&(*c1)[0]);
glVertex3f(GLfloat(sha1 * cca0),
@@ -1281,20 +1280,19 @@
c0 = c1;
++c1;
- double circ_angle0, circ_angle1 = 0.0;
+ double circ_angle = 0.0;
double sha0 = sin(height_angle0), cha0 = cos(height_angle0);
double sha1 = sin(height_angle1), cha1 = cos(height_angle1);
double sca0, cca0;
- double sca1 = sin(circ_angle1), cca1 = cos(circ_angle1);
+ double sca1 = sin(circ_angle), cca1 = cos(circ_angle);
glBegin(GL_QUADS);
for (size_t nc = 0; nc < nCirc; ++nc) {
- circ_angle0 = circ_angle1;
- circ_angle1 = (nc + 1) * cd;
+ circ_angle = (nc + 1) * cd;
sca0 = sca1;
- sca1 = sin(circ_angle1);
+ sca1 = sin(circ_angle);
cca0 = cca1;
- cca1 = cos(circ_angle1);
+ cca1 = cos(circ_angle);
glColor3fv(&(*c1)[0]);
glVertex3f(GLfloat(sha1 * cca1),
Modified: branches/0.18/src/openvrml-player/curlbrowserhost.cpp
===================================================================
--- branches/0.18/src/openvrml-player/curlbrowserhost.cpp 2012-04-24 02:40:32 UTC (rev 4255)
+++ branches/0.18/src/openvrml-player/curlbrowserhost.cpp 2012-04-24 03:23:13 UTC (rev 4256)
@@ -808,14 +808,14 @@
//
if (!stream_data->initialized()) {
const char * type = 0;
- CURLcode result = curl_easy_getinfo(msg->easy_handle,
- CURLINFO_CONTENT_TYPE,
- &type);
+ curl_easy_getinfo(msg->easy_handle,
+ CURLINFO_CONTENT_TYPE,
+ &type);
if (!type) { type = "application/octet-stream"; }
const char * url = 0;
- result = curl_easy_getinfo(msg->easy_handle,
- CURLINFO_EFFECTIVE_URL,
- &url);
+ curl_easy_getinfo(msg->easy_handle,
+ CURLINFO_EFFECTIVE_URL,
+ &url);
dbus_g_proxy_call_no_reply(
browser_host->priv->browser,
"NewStream",
Modified: branches/0.18/src/script/javascript.cpp
===================================================================
--- branches/0.18/src/script/javascript.cpp 2012-04-24 02:40:32 UTC (rev 4255)
+++ branches/0.18/src/script/javascript.cpp 2012-04-24 03:23:13 UTC (rev 4256)
@@ -4058,7 +4058,8 @@
typedef typename SFVec2::field_type sfvec2_t;
typedef typename SFVec2::value_type vec2_t;
- const vec2_t vec2 = { { vec[0], vec[1] } };
+ const vec2_t vec2 = { { static_cast<float>(vec[0]),
+ static_cast<float>(vec[1]) } };
auto_ptr<sfvec2_t> sfvec2(new sfvec2_t(vec2));
auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfvec2.get()));
sfvec2.release();
@@ -4665,7 +4666,9 @@
try {
using std::auto_ptr;
- const vec3_t vec3 = { { vec[0], vec[1], vec[2] } };
+ const vec3_t vec3 = { { static_cast<float>(vec[0]),
+ static_cast<float>(vec[1]),
+ static_cast<float>(vec[2]) } };
auto_ptr<sfvec3_t> sfvec3(new sfvec3_t(vec3));
auto_ptr<sfield::sfdata> sfdata(new sfield::sfdata(sfvec3.get()));
sfvec3.release();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2012-04-26 06:57:43
|
Revision: 4258
http://openvrml.svn.sourceforge.net/openvrml/?rev=4258&view=rev
Author: braden
Date: 2012-04-26 06:57:32 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
Applying the stream output operator to a boost::filesystem::path now yields a string within quotes; use boost::filesystem::path::generic_string instead.
Modified Paths:
--------------
branches/0.18/ChangeLog
branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp
Property Changed:
----------------
branches/0.18/
Property changes on: branches/0.18
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,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
+ /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,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
Modified: branches/0.18/ChangeLog
===================================================================
--- branches/0.18/ChangeLog 2012-04-26 06:55:28 UTC (rev 4257)
+++ branches/0.18/ChangeLog 2012-04-26 06:57:32 UTC (rev 4258)
@@ -1,3 +1,12 @@
+2012-04-26 Braden McDaniel <br...@en...>
+
+ * src/local/libopenvrml-dl/openvrml/local/dl.cpp
+ (openvrml::local::dl::foreachfile(const
+ std::vector<boost::filesystem::path> &, int (*)(const std::string
+ &, void *), void *): Applying the stream output operator to a
+ boost::filesystem::path now yields a string within quotes; use
+ boost::filesystem::path::generic_string instead.
+
2012-04-23 Braden McDaniel <br...@en...>
Quell warnings from gcc 4.7.
Modified: branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp
===================================================================
--- branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp 2012-04-26 06:55:28 UTC (rev 4257)
+++ branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp 2012-04-26 06:57:32 UTC (rev 4258)
@@ -85,7 +85,7 @@
std::vector<boost::filesystem::path>::const_iterator dir =
search_path.begin();
while (dir != search_path.end()) {
- path << *dir;
+ path << dir->generic_string();
if (++dir != search_path.end()) { path << LT_PATHSEP_CHAR; }
}
ltforeachfile_data ltdata = { func, data };
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2012-04-26 22:54:08
|
Revision: 4260
http://openvrml.svn.sourceforge.net/openvrml/?rev=4260&view=rev
Author: braden
Date: 2012-04-26 22:54:02 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
Symlinks don't work well if the source directory is shared by multiple hosts.
Modified Paths:
--------------
branches/0.18/bootstrap
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,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
+ /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,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
Modified: branches/0.18/bootstrap
===================================================================
--- branches/0.18/bootstrap 2012-04-26 22:52:29 UTC (rev 4259)
+++ branches/0.18/bootstrap 2012-04-26 22:54:02 UTC (rev 4260)
@@ -1,2 +1,2 @@
#!/bin/sh
-autoreconf --install --symlink
+autoreconf --install
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2012-04-26 23:15:48
|
Revision: 4262
http://openvrml.svn.sourceforge.net/openvrml/?rev=4262&view=rev
Author: braden
Date: 2012-04-26 23:15:42 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
Build with -fvisibility=hidden to quell attribute warnings about inconsistent visibility of member types.
Modified Paths:
--------------
branches/0.18/configure-gcc-dbg
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,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
+ /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,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
Modified: branches/0.18/configure-gcc-dbg
===================================================================
--- branches/0.18/configure-gcc-dbg 2012-04-26 23:07:47 UTC (rev 4261)
+++ branches/0.18/configure-gcc-dbg 2012-04-26 23:15:42 UTC (rev 4262)
@@ -1,3 +1,3 @@
#!/bin/bash
-./$(dirname $0)/configure -C --prefix=$HOME --disable-static CXX='g++ -pipe' CPPFLAGS="-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -DG_ERRORCHECK_MUTEXES -I$HOME/include -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux" CXXFLAGS='-g3 -O0 -Wall -Wextra -Wno-missing-braces -Wno-missing-field-initializers -Wno-long-long' LDFLAGS="-L$HOME/lib64 -L$HOME/lib" JAVA_HOME=/usr/lib/jvm/jre "$*"
+./$(dirname $0)/configure -C --prefix=$HOME --disable-static CXX='g++ -pipe' CPPFLAGS="-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -DG_ERRORCHECK_MUTEXES -I$HOME/include -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux" CXXFLAGS='-g3 -O0 -Wall -Wextra -Wno-missing-braces -Wno-missing-field-initializers -Wno-long-long -fvisibility=hidden' LDFLAGS="-L$HOME/lib64 -L$HOME/lib" JAVA_HOME=/usr/lib/jvm/jre "$*"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2012-04-27 00:35:13
|
Revision: 4263
http://openvrml.svn.sourceforge.net/openvrml/?rev=4263&view=rev
Author: braden
Date: 2012-04-27 00:35:07 +0000 (Fri, 27 Apr 2012)
Log Message:
-----------
Fixed path to avoid a double slash.
Modified Paths:
--------------
branches/0.18/configure-gcc-dbg
branches/0.18/configure-gcc-opt
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,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
+ /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
Modified: branches/0.18/configure-gcc-dbg
===================================================================
--- branches/0.18/configure-gcc-dbg 2012-04-26 23:15:42 UTC (rev 4262)
+++ branches/0.18/configure-gcc-dbg 2012-04-27 00:35:07 UTC (rev 4263)
@@ -1,3 +1,3 @@
#!/bin/bash
-./$(dirname $0)/configure -C --prefix=$HOME --disable-static CXX='g++ -pipe' CPPFLAGS="-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -DG_ERRORCHECK_MUTEXES -I$HOME/include -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux" CXXFLAGS='-g3 -O0 -Wall -Wextra -Wno-missing-braces -Wno-missing-field-initializers -Wno-long-long -fvisibility=hidden' LDFLAGS="-L$HOME/lib64 -L$HOME/lib" JAVA_HOME=/usr/lib/jvm/jre "$*"
+$(dirname $0)/configure -C --prefix=$HOME --disable-static CXX='g++ -pipe' CPPFLAGS="-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -DG_ERRORCHECK_MUTEXES -I$HOME/include -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux" CXXFLAGS='-g3 -O0 -Wall -Wextra -Wno-missing-braces -Wno-missing-field-initializers -Wno-long-long -fvisibility=hidden' LDFLAGS="-L$HOME/lib64 -L$HOME/lib" JAVA_HOME=/usr/lib/jvm/jre "$*"
Modified: branches/0.18/configure-gcc-opt
===================================================================
--- branches/0.18/configure-gcc-opt 2012-04-26 23:15:42 UTC (rev 4262)
+++ branches/0.18/configure-gcc-opt 2012-04-27 00:35:07 UTC (rev 4263)
@@ -1,3 +1,3 @@
#!/bin/bash
-./$(dirname $0)/configure -C --prefix=$HOME --disable-static --enable-exception-specs=nothrow CXX='g++ -pipe' CPPFLAGS="-I$HOME/include -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -DNDEBUG" CXXFLAGS='-O3 -Wall -Wextra -Wno-missing-braces -Wno-unused-variable -fvisibility=hidden -fvisibility-inlines-hidden' LDFLAGS="-L$HOME/lib64 -L$HOME/lib" JAVA_HOME=/usr/lib/jvm/jre "$*"
+$(dirname $0)/configure -C --prefix=$HOME --disable-static --enable-exception-specs=nothrow CXX='g++ -pipe' CPPFLAGS="-I$HOME/include -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -DNDEBUG" CXXFLAGS='-O3 -Wall -Wextra -Wno-missing-braces -Wno-unused-variable -fvisibility=hidden -fvisibility-inlines-hidden' LDFLAGS="-L$HOME/lib64 -L$HOME/lib" JAVA_HOME=/usr/lib/jvm/jre "$*"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2012-04-27 02:47:03
|
Revision: 4265
http://openvrml.svn.sourceforge.net/openvrml/?rev=4265&view=rev
Author: braden
Date: 2012-04-27 02:46:56 +0000 (Fri, 27 Apr 2012)
Log Message:
-----------
Define BOOST_FILESYSTEM_VERSION=3 for compatibility with Boost 1.44 and later (and consistency with Makefile.am).
Modified Paths:
--------------
branches/0.18/ChangeLog
branches/0.18/src/libopenvrml/openvrml.vcxproj
branches/0.18/src/local/libopenvrml-dl/openvrml-dl.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
+ /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
Modified: branches/0.18/ChangeLog
===================================================================
--- branches/0.18/ChangeLog 2012-04-27 02:36:32 UTC (rev 4264)
+++ branches/0.18/ChangeLog 2012-04-27 02:46:56 UTC (rev 4265)
@@ -1,5 +1,13 @@
2012-04-26 Braden McDaniel <br...@en...>
+ Define BOOST_FILESYSTEM_VERSION=3 for compatibility with Boost
+ 1.44 and later (and consistency with Makefile.am).
+
+ * src/libopenvrml/openvrml.vcxproj
+ * src/local/libopenvrml-dl/openvrml-dl.vcxproj
+
+2012-04-26 Braden McDaniel <br...@en...>
+
* src/local/libopenvrml-dl/openvrml/local/dl.cpp
(openvrml::local::dl::foreachfile(const
std::vector<boost::filesystem::path> &, int (*)(const std::string
Modified: branches/0.18/src/libopenvrml/openvrml.vcxproj
===================================================================
--- branches/0.18/src/libopenvrml/openvrml.vcxproj 2012-04-27 02:36:32 UTC (rev 4264)
+++ branches/0.18/src/libopenvrml/openvrml.vcxproj 2012-04-27 02:46:56 UTC (rev 4265)
@@ -65,7 +65,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;..\local\libopenvrml-dl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=2;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -91,7 +91,7 @@
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>.;..\local\libopenvrml-dl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=2;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FunctionLevelLinking>true</FunctionLevelLinking>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -187,4 +187,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: branches/0.18/src/local/libopenvrml-dl/openvrml-dl.vcxproj
===================================================================
--- branches/0.18/src/local/libopenvrml-dl/openvrml-dl.vcxproj 2012-04-27 02:36:32 UTC (rev 4264)
+++ branches/0.18/src/local/libopenvrml-dl/openvrml-dl.vcxproj 2012-04-27 02:46:56 UTC (rev 4265)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -70,7 +70,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>BOOST_FILESYSTEM_VERSION=2;OPENVRML_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -82,7 +82,7 @@
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SECURE_SCL=0;NDEBUG;BOOST_FILESYSTEM_VERSION=2;OPENVRML_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_SECURE_SCL=0;NDEBUG;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -104,4 +104,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2012-04-27 02:54:55
|
Revision: 4267
http://openvrml.svn.sourceforge.net/openvrml/?rev=4267&view=rev
Author: braden
Date: 2012-04-27 02:54:46 +0000 (Fri, 27 Apr 2012)
Log Message:
-----------
Fix erroneous paths for Visual Studio project files.
Modified Paths:
--------------
branches/0.18/ChangeLog
Property Changed:
----------------
branches/0.18/
Property changes on: branches/0.18
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266
Modified: branches/0.18/ChangeLog
===================================================================
--- branches/0.18/ChangeLog 2012-04-27 02:52:56 UTC (rev 4266)
+++ branches/0.18/ChangeLog 2012-04-27 02:54:46 UTC (rev 4267)
@@ -116,9 +116,9 @@
* NEWS
* configure.ac
* doc/Doxyfile
- * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
- * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
- * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
+ * src/libopenvrml/openvrml.rc
+ * src/libopenvrml/openvrml.vcproj
+ * src/libopenvrml-gl/openvrml-gl.rc
* src/Makefile.am
(LIBOPENVRML_LIBRARY_VERSION): Update to 10:0:1. Previous change
was incorrect.
@@ -136,9 +136,9 @@
* NEWS
* configure.ac
* doc/Doxyfile
- * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc
- * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj
- * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc
+ * src/libopenvrml/openvrml.rc
+ * src/libopenvrml/openvrml.vcproj
+ * src/libopenvrml-gl/openvrml-gl.rc
* src/Makefile.am
(LIBOPENVRML_LIBRARY_VERSION): Update to 9:5:1.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2012-04-27 05:02:45
|
Revision: 4269
http://openvrml.svn.sourceforge.net/openvrml/?rev=4269&view=rev
Author: braden
Date: 2012-04-27 05:02:39 +0000 (Fri, 27 Apr 2012)
Log Message:
-----------
javadoc does not necessarily emit "inherit.gif"; be more generic.
Modified Paths:
--------------
branches/0.18/ChangeLog
branches/0.18/doc/Makefile.am
Property Changed:
----------------
branches/0.18/
Property changes on: branches/0.18
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268
Modified: branches/0.18/ChangeLog
===================================================================
--- branches/0.18/ChangeLog 2012-04-27 05:00:41 UTC (rev 4268)
+++ branches/0.18/ChangeLog 2012-04-27 05:02:39 UTC (rev 4269)
@@ -1,3 +1,8 @@
+2012-04-27 Braden McDaniel <br...@en...>
+
+ * doc/Makefile.am (JAVADOC_RESOURCES_FILES): javadoc does not
+ necessarily emit "inherit.gif"; be more generic.
+
2012-04-26 Braden McDaniel <br...@en...>
Define BOOST_FILESYSTEM_VERSION=3 for compatibility with Boost
Modified: branches/0.18/doc/Makefile.am
===================================================================
--- branches/0.18/doc/Makefile.am 2012-04-27 05:00:41 UTC (rev 4268)
+++ branches/0.18/doc/Makefile.am 2012-04-27 05:02:39 UTC (rev 4269)
@@ -87,7 +87,7 @@
$(srcdir)/javadoc/stylesheet.css
JAVADOC_RESOURCES_FILES = \
- $(srcdir)/javadoc/resources/inherit.gif
+ $(srcdir)/javadoc/resources/*
JAVADOC_VRML_FILES = \
$(srcdir)/javadoc/vrml/*.html
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2012-04-29 03:06:47
|
Revision: 4271
http://openvrml.svn.sourceforge.net/openvrml/?rev=4271&view=rev
Author: braden
Date: 2012-04-29 03:06:39 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
XULRunner 12.0 removes the JSObject* prototype argument from JS_ConstructObject.
Modified Paths:
--------------
branches/0.18/ChangeLog
branches/0.18/configure.ac
branches/0.18/src/script/javascript.cpp
Property Changed:
----------------
branches/0.18/
Property changes on: branches/0.18
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270
Modified: branches/0.18/ChangeLog
===================================================================
--- branches/0.18/ChangeLog 2012-04-29 03:04:50 UTC (rev 4270)
+++ branches/0.18/ChangeLog 2012-04-29 03:06:39 UTC (rev 4271)
@@ -1,3 +1,11 @@
+2012-04-28 Braden McDaniel <br...@en...>
+
+ XULRunner 12.0 removes the JSObject* prototype argument from
+ JS_ConstructObject.
+
+ * configure.ac
+ * src/script/javascript.cpp
+
2012-04-27 Braden McDaniel <br...@en...>
* doc/Makefile.am (JAVADOC_RESOURCES_FILES): javadoc does not
Modified: branches/0.18/configure.ac
===================================================================
--- branches/0.18/configure.ac 2012-04-29 03:04:50 UTC (rev 4270)
+++ branches/0.18/configure.ac 2012-04-29 03:06:39 UTC (rev 4271)
@@ -284,6 +284,26 @@
[Defined if SpiderMonkey has JSStrictPropertyOp])])
#
+# XULRunner 12.0 removes the JSObject* prototype argument from
+# JS_ConstructObject.
+#
+AC_CACHE_CHECK([whether JS_ConstructObject is missing the prototype argument],
+[ov_cv_js_constructobject_without_proto],
+[ov_cv_js_constructobject_without_proto=no
+ov_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$JS_CFLAGS $CPPFLAGS"
+AC_LANG_ASSERT([C])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+[[#include <jsapi.h>]],
+[[JS_ConstructObject(0, 0, 0)]])],
+[ov_cv_js_constructobject_without_proto=yes])
+CPPFLAGS=$ov_save_CPPFLAGS
+])
+AS_IF([test X$ov_cv_js_constructobject_without_proto = Xyes],
+ [AC_DEFINE([OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO], [1],
+ [Defined if JS_ConstructObject is missing the prototype argument])])
+
+#
# openvrml-xembed and openvrml-player both use GOption, which was
# introduced in GLib 2.6.
#
Modified: branches/0.18/src/script/javascript.cpp
===================================================================
--- branches/0.18/src/script/javascript.cpp 2012-04-29 03:04:50 UTC (rev 4270)
+++ branches/0.18/src/script/javascript.cpp 2012-04-29 03:06:39 UTC (rev 4271)
@@ -110,6 +110,40 @@
# endif
}
+ OPENVRML_LOCAL
+ JSObject *
+ js_construct_object(JSContext * const cx,
+ JSClass * const clasp,
+ JSObject * const proto,
+ JSObject * const parent)
+ {
+ assert(!proto);
+# ifndef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO
+ return JS_ConstructObject(cx, clasp, parent);
+# else
+ return JS_ConstructObject(cx, clasp, proto, parent);
+# endif
+ }
+
+ OPENVRML_LOCAL
+ JSObject *
+ js_construct_object_with_arguments(JSContext * const cx,
+ JSClass * const clasp,
+ JSObject * const proto,
+ JSObject * const parent,
+ const uintN argc,
+ jsval * const argv)
+ {
+ assert(!proto);
+# ifndef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO
+ return js_construct_object_with_arguments(cx, clasp, parent, argc, argv);
+# else
+ return js_construct_object_with_arguments(cx, clasp, proto, parent,
+ argc, argv);
+# endif
+ }
+
+
# ifdef OPENVRML_FAST_JSNATIVE
# define OPENVRML_DECLARE_JSNATIVE(name) \
JSBool (name)(JSContext * cx, uintN argc, jsval * vp)
@@ -2640,7 +2674,7 @@
jsval * const rval)
OPENVRML_NOTHROW
{
- JSObject * const sfcolorObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+ JSObject * const sfcolorObj = js_construct_object(cx, &jsclass, 0, obj);
if (!sfcolorObj) { return JS_FALSE; }
assert(JS_GetPrivate(cx, sfcolorObj));
@@ -3439,7 +3473,7 @@
jsval * const rval)
OPENVRML_NOTHROW
{
- JSObject * const sfrotationObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+ JSObject * const sfrotationObj = js_construct_object(cx, &jsclass, 0, obj);
if (!sfrotationObj) { return JS_FALSE; }
assert(JS_GetPrivate(cx, sfrotationObj));
@@ -3679,7 +3713,7 @@
&obj_sfdata.field_value());
JSObject * const robj =
- JS_ConstructObject(cx, &SFVec3f::jsclass, 0,
+ js_construct_object(cx, &SFVec3f::jsclass, 0,
OPENVRML_JS_THIS_OBJECT(cx, vp));
if (!robj) { return JS_FALSE; }
@@ -3709,7 +3743,7 @@
JSObject * const parent =
JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
JSObject * const robj =
- JS_ConstructObject(cx, &SFRotation::jsclass, proto, parent);
+ js_construct_object(cx, &SFRotation::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
assert(JS_GetPrivate(cx, robj));
@@ -3758,7 +3792,7 @@
JSObject * const parent =
JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
JSObject * const robj =
- JS_ConstructObject(cx, &SFRotation::jsclass, proto, parent);
+ js_construct_object(cx, &SFRotation::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
assert(JS_GetPrivate(cx, robj));
@@ -3807,7 +3841,7 @@
JSObject * const parent =
JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
JSObject * const robj =
- JS_ConstructObject(cx, &SFVec3f::jsclass, proto, parent);
+ js_construct_object(cx, &SFVec3f::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
assert(JS_GetPrivate(cx, robj));
@@ -3899,7 +3933,7 @@
JSObject * const parent =
JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
JSObject * const robj =
- JS_ConstructObject(cx, &SFRotation::jsclass, proto, parent);
+ js_construct_object(cx, &SFRotation::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
assert(JS_GetPrivate(cx, robj));
@@ -3976,7 +4010,7 @@
jsval * const rval)
OPENVRML_NOTHROW
{
- JSObject * const sfvec2Obj = JS_ConstructObject(cx, &jsclass, 0, obj);
+ JSObject * const sfvec2Obj = js_construct_object(cx, &jsclass, 0, obj);
if (!sfvec2Obj) { return JS_FALSE; }
assert(JS_GetPrivate(cx, sfvec2Obj));
@@ -4176,7 +4210,7 @@
JSObject * const parent =
JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
JSObject * const robj =
- JS_ConstructObject(cx, &SFVec2::jsclass, proto, parent);
+ js_construct_object(cx, &SFVec2::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
assert(JS_GetPrivate(cx, robj));
@@ -4219,7 +4253,7 @@
JSObject * const parent =
JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
JSObject * const robj =
- JS_ConstructObject(cx, &SFVec2::jsclass, proto, parent);
+ js_construct_object(cx, &SFVec2::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
assert(JS_GetPrivate(cx, robj));
@@ -4320,7 +4354,7 @@
JSObject * const parent =
JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
JSObject * const robj =
- JS_ConstructObject(cx, &SFVec2::jsclass, proto, parent);
+ js_construct_object(cx, &SFVec2::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
assert(JS_GetPrivate(cx, robj));
@@ -4354,7 +4388,7 @@
JSObject * const parent =
JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
JSObject * const robj =
- JS_ConstructObject(cx, &SFVec2::jsclass, proto, parent);
+ js_construct_object(cx, &SFVec2::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
assert(JS_GetPrivate(cx, robj));
@@ -4388,7 +4422,7 @@
JSObject * const parent =
JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
JSObject * const robj =
- JS_ConstructObject(cx, &SFVec2::jsclass, proto, parent);
+ js_construct_object(cx, &SFVec2::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
assert(JS_GetPrivate(cx, robj));
@@ -4442,7 +4476,7 @@
JSObject * const parent =
JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
JSObject * const robj =
- JS_ConstructObject(cx, &SFVec2::jsclass, proto, parent);
+ js_construct_object(cx, &SFVec2::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
assert(JS_GetPrivate(cx, robj));
@@ -4484,7 +4518,7 @@
jsval * const rval)
OPENVRML_NOTHROW
{
- JSObject * const sfvec2dObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+ JSObject * const sfvec2dObj = js_construct_object(cx, &jsclass, 0, obj);
if (!sfvec2dObj) { return JS_FALSE; }
assert(JS_GetPrivate(cx, sfvec2dObj));
@@ -4583,7 +4617,7 @@
jsval * const rval)
OPENVRML_NOTHROW
{
- JSObject * const sfvec3fObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+ JSObject * const sfvec3fObj = js_construct_object(cx, &jsclass, 0, obj);
if (!sfvec3fObj) { return JS_FALSE; }
assert(JS_GetPrivate(cx, sfvec3fObj));
@@ -4787,7 +4821,7 @@
JSObject * const parent =
JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
JSObject * const robj =
- JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent);
+ js_construct_object(cx, &SFVec3::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
assert(JS_GetPrivate(cx, robj));
@@ -4841,7 +4875,7 @@
JSObject * const parent =
JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
JSObject * const robj =
- JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent);
+ js_construct_object(cx, &SFVec3::jsclass, proto, parent);
if (!robj) {return JS_FALSE; }
assert(JS_GetPrivate(cx, robj));
@@ -4884,7 +4918,7 @@
JSObject * const parent =
JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
JSObject * const robj =
- JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent);
+ js_construct_object(cx, &SFVec3::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
assert(JS_GetPrivate(cx, robj));
@@ -4985,7 +5019,7 @@
JSObject * const parent =
JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
JSObject * const robj =
- JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent);
+ js_construct_object(cx, &SFVec3::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
assert(JS_GetPrivate(cx, robj));
@@ -5019,7 +5053,7 @@
JSObject * const parent =
JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
JSObject * const robj =
- JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent);
+ js_construct_object(cx, &SFVec3::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
assert(JS_GetPrivate(cx, robj));
@@ -5053,7 +5087,7 @@
JSObject * const parent =
JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
JSObject * const robj =
- JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent);
+ js_construct_object(cx, &SFVec3::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
assert(JS_GetPrivate(cx, robj));
@@ -5107,7 +5141,7 @@
JSObject * const parent =
JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
JSObject * const robj =
- JS_ConstructObject(cx, &SFVec3::jsclass, proto, parent);
+ js_construct_object(cx, &SFVec3::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
assert(JS_GetPrivate(cx, robj));
@@ -5148,7 +5182,7 @@
jsval * const rval)
OPENVRML_NOTHROW
{
- JSObject * const sfvec3dObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+ JSObject * const sfvec3dObj = js_construct_object(cx, &jsclass, 0, obj);
if (!sfvec3dObj) { return JS_FALSE; }
assert(JS_GetPrivate(cx, sfvec3dObj));
@@ -5416,7 +5450,7 @@
try {
for (size_t i = length; i < newArray.size(); ++i) {
JSObject * const element =
- JS_ConstructObject(cx, &Subclass::sfjsclass, 0, 0);
+ js_construct_object(cx, &Subclass::sfjsclass, 0, 0);
if (!element) { throw std::bad_alloc(); }
newArray[i] = OBJECT_TO_JSVAL(element);
}
@@ -5746,7 +5780,7 @@
jsval * const rval)
OPENVRML_NOTHROW
{
- JSObject * const mfboolObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+ JSObject * const mfboolObj = js_construct_object(cx, &jsclass, 0, obj);
if (!mfboolObj) { return JS_FALSE; }
jsval length = INT_TO_JSVAL(bools.size());
@@ -5963,7 +5997,7 @@
jsval * const rval)
OPENVRML_NOTHROW
{
- JSObject * const mfcolorObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+ JSObject * const mfcolorObj = js_construct_object(cx, &jsclass, 0, obj);
if (!mfcolorObj) { return JS_FALSE; }
jsval length = INT_TO_JSVAL(colors.size());
@@ -6014,7 +6048,7 @@
assert(obj);
assert(rval);
- JSObject * const mffloatObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+ JSObject * const mffloatObj = js_construct_object(cx, &jsclass, 0, obj);
if (!mffloatObj) { return JS_FALSE; }
jsval length = INT_TO_JSVAL(floats.size());
@@ -6089,7 +6123,7 @@
assert(obj);
assert(rval);
- JSObject * const mfdoubleObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+ JSObject * const mfdoubleObj = js_construct_object(cx, &jsclass, 0, obj);
if (!mfdoubleObj) { return JS_FALSE; }
jsval length = INT_TO_JSVAL(doubles.size());
@@ -6185,7 +6219,7 @@
assert(obj);
assert(rval);
- JSObject * const mfint32Obj = JS_ConstructObject(cx, &jsclass, 0, obj);
+ JSObject * const mfint32Obj = js_construct_object(cx, &jsclass, 0, obj);
if (!mfint32Obj) { return JS_FALSE; }
jsval length = INT_TO_JSVAL(int32s.size());
@@ -6450,7 +6484,7 @@
jsval * const rval)
OPENVRML_NOTHROW
{
- JSObject * const mfnodeObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+ JSObject * const mfnodeObj = js_construct_object(cx, &jsclass, 0, obj);
if (!mfnodeObj) { return JS_FALSE; }
jsval length = INT_TO_JSVAL(nodes.size());
@@ -6610,8 +6644,9 @@
for (size_t i = length; i < newArray.size(); ++i) {
JSObject * const element =
- JS_ConstructObjectWithArguments(cx, &sfnode_jsclass, 0, 0,
- 1, &arg);
+ js_construct_object_with_arguments(cx, &sfnode_jsclass,
+ 0, 0,
+ 1, &arg);
if (!element) { throw std::bad_alloc(); }
newArray[i] = OBJECT_TO_JSVAL(element);
}
@@ -6704,7 +6739,7 @@
jsval * const rval)
OPENVRML_NOTHROW
{
- JSObject * const mfrotationObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+ JSObject * const mfrotationObj = js_construct_object(cx, &jsclass, 0, obj);
if (!mfrotationObj) { return JS_FALSE; }
jsval length = INT_TO_JSVAL(rotations.size());
@@ -6807,7 +6842,7 @@
assert(cx);
assert(obj);
assert(rval);
- JSObject * const mfstringObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+ JSObject * const mfstringObj = js_construct_object(cx, &jsclass, 0, obj);
if (!mfstringObj) { return JS_FALSE; }
jsval length = INT_TO_JSVAL(strings.size());
@@ -7050,7 +7085,7 @@
jsval * const rval)
OPENVRML_NOTHROW
{
- JSObject * const mftimeObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+ JSObject * const mftimeObj = js_construct_object(cx, &jsclass, 0, obj);
if (!mftimeObj) { return JS_FALSE; }
jsval length = INT_TO_JSVAL(times.size());
@@ -7123,7 +7158,7 @@
jsval * const rval)
OPENVRML_NOTHROW
{
- JSObject * const mfvec2fObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+ JSObject * const mfvec2fObj = js_construct_object(cx, &jsclass, 0, obj);
if (!mfvec2fObj) { return JS_FALSE; }
jsval length = INT_TO_JSVAL(vec2fs.size());
@@ -7204,7 +7239,7 @@
jsval * const rval)
OPENVRML_NOTHROW
{
- JSObject * const mfvec2dObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+ JSObject * const mfvec2dObj = js_construct_object(cx, &jsclass, 0, obj);
if (!mfvec2dObj) { return JS_FALSE; }
jsval length = INT_TO_JSVAL(vec2ds.size());
@@ -7285,7 +7320,7 @@
jsval * const rval)
OPENVRML_NOTHROW
{
- JSObject * const mfvec3fObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+ JSObject * const mfvec3fObj = js_construct_object(cx, &jsclass, 0, obj);
if (!mfvec3fObj) { return JS_FALSE; }
jsval length = INT_TO_JSVAL(vec3fs.size());
@@ -7367,7 +7402,7 @@
jsval * const rval)
OPENVRML_NOTHROW
{
- JSObject * const mfvec3dObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+ JSObject * const mfvec3dObj = js_construct_object(cx, &jsclass, 0, obj);
if (!mfvec3dObj) { return JS_FALSE; }
jsval length = INT_TO_JSVAL(vec3ds.size());
@@ -7624,7 +7659,7 @@
//
// Construct the result object.
//
- JSObject * const robj = JS_ConstructObject(cx, &Row::jsclass, 0,
+ JSObject * const robj = js_construct_object(cx, &Row::jsclass, 0,
JS_GetParent(cx, obj));
if (!robj) { return JS_FALSE; }
@@ -7809,7 +7844,7 @@
using openvrml::mat4f;
JSObject * const robj =
- JS_ConstructObject(cx, &VrmlMatrix::jsclass, 0,
+ js_construct_object(cx, &VrmlMatrix::jsclass, 0,
JS_GetParent(cx,
OPENVRML_JS_THIS_OBJECT(cx, vp)));
if (!robj) { return JS_FALSE; }
@@ -7831,7 +7866,7 @@
using openvrml::mat4f;
JSObject * const robj =
- JS_ConstructObject(cx, &VrmlMatrix::jsclass, 0,
+ js_construct_object(cx, &VrmlMatrix::jsclass, 0,
JS_GetParent(cx,
OPENVRML_JS_THIS_OBJECT(cx, vp)));
if (!robj) { return JS_FALSE; }
@@ -7875,7 +7910,7 @@
// Construct the result object.
//
JSObject * const robj =
- JS_ConstructObject(cx, &VrmlMatrix::jsclass, 0,
+ js_construct_object(cx, &VrmlMatrix::jsclass, 0,
JS_GetParent(cx,
OPENVRML_JS_THIS_OBJECT(cx, vp)));
if (!robj) { return JS_FALSE; }
@@ -7915,7 +7950,7 @@
// Construct the result object.
//
JSObject * const robj =
- JS_ConstructObject(cx, &VrmlMatrix::jsclass, 0,
+ js_construct_object(cx, &VrmlMatrix::jsclass, 0,
JS_GetParent(cx,
OPENVRML_JS_THIS_OBJECT(cx, vp)));
if (!robj) { return JS_FALSE; }
@@ -7965,7 +8000,7 @@
JSObject * const parent =
JS_GetParent(cx, OPENVRML_JS_THIS_OBJECT(cx, vp));
JSObject * const robj =
- JS_ConstructObject(cx, &SFVec3f::jsclass, proto, parent);
+ js_construct_object(cx, &SFVec3f::jsclass, proto, parent);
if (!robj) { return JS_FALSE; }
assert(JS_GetPrivate(cx, robj));
@@ -8013,9 +8048,9 @@
// Construct the result object.
//
JSObject * const robj =
- JS_ConstructObject(cx, &SFVec3f::jsclass, 0,
- JS_GetParent(cx,
- OPENVRML_JS_THIS_OBJECT(cx, vp)));
+ js_construct_object(cx, &SFVec3f::jsclass, 0,
+ JS_GetParent(cx,
+ OPENVRML_JS_THIS_OBJECT(cx, vp)));
if (!robj) { return JS_FALSE; }
assert(JS_GetPrivate(cx, robj));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2012-04-29 06:58:41
|
Revision: 4273
http://openvrml.svn.sourceforge.net/openvrml/?rev=4273&view=rev
Author: braden
Date: 2012-04-29 06:58:35 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Fix OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO conditional to be #ifdef.
Modified Paths:
--------------
branches/0.18/ChangeLog
branches/0.18/src/script/javascript.cpp
Property Changed:
----------------
branches/0.18/
Property changes on: branches/0.18
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272
Modified: branches/0.18/ChangeLog
===================================================================
--- branches/0.18/ChangeLog 2012-04-29 06:55:38 UTC (rev 4272)
+++ branches/0.18/ChangeLog 2012-04-29 06:58:35 UTC (rev 4273)
@@ -1,3 +1,9 @@
+2012-04-29 Braden McDaniel <br...@en...>
+
+ * src/script/javascript.cpp: Fix
+ OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO conditional to be
+ #ifdef.
+
2012-04-28 Braden McDaniel <br...@en...>
XULRunner 12.0 removes the JSObject* prototype argument from
Modified: branches/0.18/src/script/javascript.cpp
===================================================================
--- branches/0.18/src/script/javascript.cpp 2012-04-29 06:55:38 UTC (rev 4272)
+++ branches/0.18/src/script/javascript.cpp 2012-04-29 06:58:35 UTC (rev 4273)
@@ -118,7 +118,7 @@
JSObject * const parent)
{
assert(!proto);
-# ifndef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO
+# ifdef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO
return JS_ConstructObject(cx, clasp, parent);
# else
return JS_ConstructObject(cx, clasp, proto, parent);
@@ -135,7 +135,7 @@
jsval * const argv)
{
assert(!proto);
-# ifndef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO
+# ifdef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO
return js_construct_object_with_arguments(cx, clasp, parent, argc, argv);
# else
return js_construct_object_with_arguments(cx, clasp, proto, parent,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2012-04-29 07:38:05
|
Revision: 4275
http://openvrml.svn.sourceforge.net/openvrml/?rev=4275&view=rev
Author: braden
Date: 2012-04-29 07:37:59 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Fix copy/paste error.
Modified Paths:
--------------
branches/0.18/ChangeLog
branches/0.18/src/script/javascript.cpp
Property Changed:
----------------
branches/0.18/
Property changes on: branches/0.18
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274
Modified: branches/0.18/ChangeLog
===================================================================
--- branches/0.18/ChangeLog 2012-04-29 07:30:59 UTC (rev 4274)
+++ branches/0.18/ChangeLog 2012-04-29 07:37:59 UTC (rev 4275)
@@ -1,5 +1,9 @@
2012-04-29 Braden McDaniel <br...@en...>
+ * src/script/javascript.cpp: Fix copy/paste error.
+
+2012-04-29 Braden McDaniel <br...@en...>
+
* src/script/javascript.cpp: Fix
OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO conditional to be
#ifdef.
Modified: branches/0.18/src/script/javascript.cpp
===================================================================
--- branches/0.18/src/script/javascript.cpp 2012-04-29 07:30:59 UTC (rev 4274)
+++ branches/0.18/src/script/javascript.cpp 2012-04-29 07:37:59 UTC (rev 4275)
@@ -136,9 +136,9 @@
{
assert(!proto);
# ifdef OPENVRML_JS_CONSTRUCTOBJECT_WITHOUT_PROTO
- return js_construct_object_with_arguments(cx, clasp, parent, argc, argv);
+ return JS_ConstructObjectWithArguments(cx, clasp, parent, argc, argv);
# else
- return js_construct_object_with_arguments(cx, clasp, proto, parent,
+ return JS_ConstructObjectWithArguments(cx, clasp, proto, parent,
argc, argv);
# endif
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2012-04-29 08:06:51
|
Revision: 4277
http://openvrml.svn.sourceforge.net/openvrml/?rev=4277&view=rev
Author: braden
Date: 2012-04-29 08:06:42 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
As of XULRunner 12.0, JSRuntime should now be used by a single thread. For now, at least, employ a JSRuntime for each Script node.
Modified Paths:
--------------
branches/0.18/ChangeLog
branches/0.18/src/script/javascript.cpp
Property Changed:
----------------
branches/0.18/
Property changes on: branches/0.18
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274,4276
Modified: branches/0.18/ChangeLog
===================================================================
--- branches/0.18/ChangeLog 2012-04-29 08:04:55 UTC (rev 4276)
+++ branches/0.18/ChangeLog 2012-04-29 08:06:42 UTC (rev 4277)
@@ -1,5 +1,11 @@
2012-04-29 Braden McDaniel <br...@en...>
+ * src/script/javascript.cpp: As of XULRunner 12.0, JSRuntime
+ should now be used by a single thread. For now, at least, employ
+ a JSRuntime for each Script node.
+
+2012-04-29 Braden McDaniel <br...@en...>
+
* src/script/javascript.cpp: Fix copy/paste error.
2012-04-29 Braden McDaniel <br...@en...>
Modified: branches/0.18/src/script/javascript.cpp
===================================================================
--- branches/0.18/src/script/javascript.cpp 2012-04-29 08:04:55 UTC (rev 4276)
+++ branches/0.18/src/script/javascript.cpp 2012-04-29 08:06:42 UTC (rev 4277)
@@ -264,13 +264,15 @@
friend OPENVRML_DECLARE_MEMBER_JSNATIVE(Browser, addRoute);
friend OPENVRML_DECLARE_MEMBER_JSNATIVE(Browser, deleteRoute);
- static JSRuntime * rt;
- static size_t nInstances;
+ JSRuntime * rt;
double d_timeStamp;
JSContext * cx;
JSClass & sfnode_class;
+# ifndef NDEBUG
+ boost::thread::id thread_id_;
+# endif
public:
script(openvrml::script_node & node,
@@ -1014,9 +1016,6 @@
VrmlMatrix();
};
- JSRuntime * script::rt = 0; // Javascript runtime singleton object
- size_t script::nInstances = 0; // Number of distinct script objects
-
OPENVRML_JAVASCRIPT_LOCAL
OPENVRML_DECLARE_JSSTRICTPROPERTYOP(eventOut_setProperty);
@@ -1030,28 +1029,28 @@
script::
script(openvrml::script_node & node,
const boost::shared_ptr<openvrml::resource_istream> & source)
- OPENVRML_THROW1(std::bad_alloc):
- openvrml::script(node),
+ OPENVRML_THROW1(std::bad_alloc):
+ openvrml::script(node),
+ rt(0),
cx(0),
sfnode_class(this->direct_output()
? SFNode::direct_output_jsclass
- : SFNode::jsclass)
+ : SFNode::jsclass),
+ thread_id_(boost::this_thread::get_id())
{
using std::bad_alloc;
//
// Initialize the runtime.
//
- if (!rt && !(rt = JS_NewRuntime(MAX_HEAP_BYTES))) {
- throw bad_alloc();
- }
+ this->rt = JS_NewRuntime(MAX_HEAP_BYTES);
+ if (!this->rt) { throw bad_alloc(); }
//
// Initialize the context for this script object.
//
- if (!(this->cx = JS_NewContext(rt, STACK_CHUNK_BYTES))) {
- throw bad_alloc();
- }
+ this->cx = JS_NewContext(rt, STACK_CHUNK_BYTES);
+ if (!this->cx) { throw bad_alloc(); }
//
// Store a pointer to this script object in the context.
@@ -1131,17 +1130,12 @@
source_str.c_str(), source_str.length(),
filename, lineno, &rval);
OPENVRML_VERIFY_(ok);
-
- ++nInstances;
}
script::~script()
{
JS_DestroyContext(this->cx);
- if (--nInstances == 0) {
- JS_DestroyRuntime(rt);
- rt = 0;
- }
+ JS_DestroyRuntime(this->rt);
}
void script::do_initialize(const double timestamp)
@@ -1187,14 +1181,8 @@
const openvrml::field_value * const argv[])
{
assert(this->cx);
+ assert(this->thread_id_ == boost::this_thread::get_id());
-# ifdef JS_THREADSAFE
- JS_SetContextThread(this->cx);
- BOOST_SCOPE_EXIT((cx)) {
- JS_ClearContextThread(cx);
- } BOOST_SCOPE_EXIT_END
-# endif
-
jsval fval, rval;
JSObject * const globalObj = JS_GetGlobalObject(this->cx);
assert(globalObj);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2012-04-29 20:09:17
|
Revision: 4279
http://openvrml.svn.sourceforge.net/openvrml/?rev=4279&view=rev
Author: braden
Date: 2012-04-29 20:09:10 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Make initialization of thread_id_ conditional on NDEBUG.
Modified Paths:
--------------
branches/0.18/ChangeLog
branches/0.18/src/script/javascript.cpp
Property Changed:
----------------
branches/0.18/
Property changes on: branches/0.18
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274,4276
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274,4276,4278
Modified: branches/0.18/ChangeLog
===================================================================
--- branches/0.18/ChangeLog 2012-04-29 19:23:58 UTC (rev 4278)
+++ branches/0.18/ChangeLog 2012-04-29 20:09:10 UTC (rev 4279)
@@ -1,5 +1,12 @@
2012-04-29 Braden McDaniel <br...@en...>
+ * src/script/javascript.cpp
+ (script::script(openvrml::script_node &, const
+ boost::shared_ptr<openvrml::resource_istream> &)): Make
+ initialization of thread_id_ conditional on NDEBUG.
+
+2012-04-29 Braden McDaniel <br...@en...>
+
* src/script/javascript.cpp: As of XULRunner 12.0, JSRuntime
should now be used by a single thread. For now, at least, employ
a JSRuntime for each Script node.
Modified: branches/0.18/src/script/javascript.cpp
===================================================================
--- branches/0.18/src/script/javascript.cpp 2012-04-29 19:23:58 UTC (rev 4278)
+++ branches/0.18/src/script/javascript.cpp 2012-04-29 20:09:10 UTC (rev 4279)
@@ -1035,8 +1035,10 @@
cx(0),
sfnode_class(this->direct_output()
? SFNode::direct_output_jsclass
- : SFNode::jsclass),
- thread_id_(boost::this_thread::get_id())
+ : SFNode::jsclass)
+# ifndef NDEBUG
+ ,thread_id_(boost::this_thread::get_id())
+# endif
{
using std::bad_alloc;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2012-05-01 05:06:20
|
Revision: 4282
http://openvrml.svn.sourceforge.net/openvrml/?rev=4282&view=rev
Author: braden
Date: 2012-05-01 05:06:12 +0000 (Tue, 01 May 2012)
Log Message:
-----------
Project file clean-up. Remove references to site-specific library directories; these should be set in user (site-specific) properties. Reorganize preprocessor symbol definitions to leverage commonality between Debug and Release configurations and remove unneeded definitions.
Modified Paths:
--------------
branches/0.18/ChangeLog
branches/0.18/examples/pretty-print.vcxproj
branches/0.18/examples/sdl-viewer.vcxproj
branches/0.18/src/libopenvrml/openvrml.vcxproj
branches/0.18/src/libopenvrml-gl/openvrml-gl.vcxproj
branches/0.18/src/local/libopenvrml-dl/openvrml-dl.vcxproj
branches/0.18/src/node/vrml97/vrml97.vcxproj
branches/0.18/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj
branches/0.18/src/node/x3d-core/x3d-core.vcxproj
branches/0.18/src/node/x3d-dis/x3d-dis.vcxproj
branches/0.18/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj
branches/0.18/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj
branches/0.18/src/node/x3d-geometry2d/x3d-geometry2d.vcxproj
branches/0.18/src/node/x3d-geospatial/x3d-geospatial.vcxproj
branches/0.18/src/node/x3d-grouping/x3d-grouping.vcxproj
branches/0.18/src/node/x3d-h-anim/x3d-h-anim.vcxproj
branches/0.18/src/node/x3d-interpolation/x3d-interpolation.vcxproj
branches/0.18/src/node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj
branches/0.18/src/node/x3d-networking/x3d-networking.vcxproj
branches/0.18/src/node/x3d-nurbs/x3d-nurbs.vcxproj
branches/0.18/src/node/x3d-rendering/x3d-rendering.vcxproj
branches/0.18/src/node/x3d-shape/x3d-shape.vcxproj
branches/0.18/src/node/x3d-texturing/x3d-texturing.vcxproj
branches/0.18/src/script/javascript.vcxproj
branches/0.18/tests/parse-vrml97.vcxproj
branches/0.18/tests/parse-x3dvrml.vcxproj
Property Changed:
----------------
branches/0.18/
Property changes on: branches/0.18
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274,4276,4278
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274,4276,4278,4280-4281
Modified: branches/0.18/ChangeLog
===================================================================
--- branches/0.18/ChangeLog 2012-05-01 05:00:36 UTC (rev 4281)
+++ branches/0.18/ChangeLog 2012-05-01 05:06:12 UTC (rev 4282)
@@ -1,3 +1,37 @@
+2012-05-01 Braden McDaniel <br...@en...>
+
+ Project file clean-up. Remove references to site-specific library
+ directories; these should be set in user (site-specific)
+ properties. Reorganize preprocessor symbol definitions to
+ leverage commonality between Debug and Release configurations and
+ remove unneeded definitions.
+
+ * examples/pretty-print.vcxproj
+ * examples/sdl-viewer.vcxproj
+ * src/libopenvrml/openvrml.vcxproj
+ * src/libopenvrml-gl/openvrml-gl.vcxproj
+ * src/local/libopenvrml-dl/openvrml-dl.vcxproj
+ * src/node/vrml97/vrml97.vcxproj
+ * src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj
+ * src/node/x3d-core/x3d-core.vcxproj
+ * src/node/x3d-dis/x3d-dis.vcxproj
+ * src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj
+ * src/node/x3d-event-utilities/x3d-event-utilities.vcxproj
+ * src/node/x3d-geometry2d/x3d-geometry2d.vcxproj
+ * src/node/x3d-geospatial/x3d-geospatial.vcxproj
+ * src/node/x3d-grouping/x3d-grouping.vcxproj
+ * src/node/x3d-h-anim/x3d-h-anim.vcxproj
+ * src/node/x3d-interpolation/x3d-interpolation.vcxproj
+ * src/node/x3d-key-device-sensor/x3d-key-device-sensor.vcxproj
+ * src/node/x3d-networking/x3d-networking.vcxproj
+ * src/node/x3d-nurbs/x3d-nurbs.vcxproj
+ * src/node/x3d-rendering/x3d-rendering.vcxproj
+ * src/node/x3d-shape/x3d-shape.vcxproj
+ * src/node/x3d-texturing/x3d-texturing.vcxproj
+ * src/script/javascript.vcxproj
+ * tests/parse-vrml97.vcxproj
+ * tests/parse-x3dvrml.vcxproj
+
2012-04-29 Braden McDaniel <br...@en...>
* src/script/javascript.cpp
Modified: branches/0.18/examples/pretty-print.vcxproj
===================================================================
--- branches/0.18/examples/pretty-print.vcxproj 2012-05-01 05:00:36 UTC (rev 4281)
+++ branches/0.18/examples/pretty-print.vcxproj 2012-05-01 05:06:12 UTC (rev 4282)
@@ -53,7 +53,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -69,7 +69,7 @@
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;_CONSOLE;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CONSOLE;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
Modified: branches/0.18/examples/sdl-viewer.vcxproj
===================================================================
--- branches/0.18/examples/sdl-viewer.vcxproj 2012-05-01 05:00:36 UTC (rev 4281)
+++ branches/0.18/examples/sdl-viewer.vcxproj 2012-05-01 05:06:12 UTC (rev 4282)
@@ -42,10 +42,6 @@
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\bin\</OutDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\SDL-1.2.14\include;$(IncludePath)</IncludePath>
- <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\SDL-1.2.14\lib;$(LibraryPath)</LibraryPath>
- <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\SDL-1.2.14\include;$(IncludePath)</IncludePath>
- <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\SDL-1.2.14\lib;$(LibraryPath)</LibraryPath>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
@@ -57,7 +53,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\src\libopenvrml-gl;..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -80,7 +76,7 @@
<Optimization>Full</Optimization>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\src\libopenvrml-gl;..\src\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SECURE_SCL=0;OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
Modified: branches/0.18/src/libopenvrml/openvrml.vcxproj
===================================================================
--- branches/0.18/src/libopenvrml/openvrml.vcxproj 2012-05-01 05:00:36 UTC (rev 4281)
+++ branches/0.18/src/libopenvrml/openvrml.vcxproj 2012-05-01 05:06:12 UTC (rev 4282)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -81,7 +81,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>$(SolutionDir)$(Configuration)\lib\$(TargetName).lib</ImportLibrary>
+ <ImportLibrary>$(SolutionDir)$(Platform)\$(Configuration)\lib\$(TargetName).lib</ImportLibrary>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -91,7 +91,7 @@
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>.;..\local\libopenvrml-dl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FunctionLevelLinking>true</FunctionLevelLinking>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -111,7 +111,7 @@
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>$(SolutionDir)$(Configuration)\lib\$(TargetName).lib</ImportLibrary>
+ <ImportLibrary>$(SolutionDir)$(Platform)\$(Configuration)\lib\$(TargetName).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
@@ -187,4 +187,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: branches/0.18/src/libopenvrml-gl/openvrml-gl.vcxproj
===================================================================
--- branches/0.18/src/libopenvrml-gl/openvrml-gl.vcxproj 2012-05-01 05:00:36 UTC (rev 4281)
+++ branches/0.18/src/libopenvrml-gl/openvrml-gl.vcxproj 2012-05-01 05:06:12 UTC (rev 4282)
@@ -56,7 +56,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>OPENVRML_USE_DLL;OPENVRML_GL_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>OPENVRML_GL_BUILD_DLL;OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
@@ -81,7 +81,7 @@
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>.;..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SECURE_SCL=0;OPENVRML_GL_BUILD_DLL;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>OPENVRML_GL_BUILD_DLL;OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -89,6 +89,7 @@
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <FloatingPointModel>Fast</FloatingPointModel>
</ClCompile>
<Link>
<AdditionalDependencies>GlU32.lib;OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
Modified: branches/0.18/src/local/libopenvrml-dl/openvrml-dl.vcxproj
===================================================================
--- branches/0.18/src/local/libopenvrml-dl/openvrml-dl.vcxproj 2012-05-01 05:00:36 UTC (rev 4281)
+++ branches/0.18/src/local/libopenvrml-dl/openvrml-dl.vcxproj 2012-05-01 05:06:12 UTC (rev 4282)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -70,7 +70,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -82,7 +82,7 @@
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_SECURE_SCL=0;NDEBUG;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -104,4 +104,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: branches/0.18/src/node/vrml97/vrml97.vcxproj
===================================================================
--- branches/0.18/src/node/vrml97/vrml97.vcxproj 2012-05-01 05:00:36 UTC (rev 4281)
+++ branches/0.18/src/node/vrml97/vrml97.vcxproj 2012-05-01 05:06:12 UTC (rev 4282)
@@ -47,29 +47,25 @@
<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\bin\node\</OutDir>
<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary>
- <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\zlib-1.2.4;C:\Users\braden\Documents\Visual Studio 2010\Projects\libpng-1.4.3;C:\Users\braden\Documents\Visual Studio 2010\Projects\freetype-2.4.0\include;$(IncludePath)</IncludePath>
- <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\zlib-1.2.4;C:\Users\braden\Documents\Visual Studio 2010\Projects\libpng-1.4.3;C:\Users\braden\Documents\Visual Studio 2010\Projects\freetype-2.4.0\include;$(IncludePath)</IncludePath>
- <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\libpng-1.4.3\projects\vstudio\Debug Library;C:\Users\braden\Documents\Visual Studio 2010\Projects\freetype-2.4.0\objs\win32\vc2008;$(LibraryPath)</LibraryPath>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\node</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\bin\node</OutDir>
- <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\braden\Documents\Visual Studio 2010\Projects\libpng-1.4.3\projects\vstudio\Release Library;C:\Users\braden\Documents\Visual Studio 2010\Projects\freetype-2.4.0\objs\win32\vc2008;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_USE_DLL;OPENVRML_FT_CONST=const;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_USE_DLL;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>libpng14.lib;zlib.lib;freetype240_D.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libpng15.lib;zlib.lib;freetype249_D.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
@@ -78,14 +74,14 @@
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_USE_DLL;OPENVRML_FT_CONST=const;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_USE_DLL;OPENVRML_ENABLE_PNG_TEXTURES;OPENVRML_ENABLE_RENDER_TEXT_NODE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>libpng14.lib;zlib.lib;freetype240.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libpng15.lib;zlib.lib;freetype249.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
Modified: branches/0.18/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj
===================================================================
--- branches/0.18/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj 2012-05-01 05:00:36 UTC (rev 4281)
+++ branches/0.18/src/node/x3d-cad-geometry/x3d-cad-geometry.vcxproj 2012-05-01 05:06:12 UTC (rev 4282)
@@ -58,7 +58,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -73,7 +73,7 @@
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
Modified: branches/0.18/src/node/x3d-core/x3d-core.vcxproj
===================================================================
--- branches/0.18/src/node/x3d-core/x3d-core.vcxproj 2012-05-01 05:00:36 UTC (rev 4281)
+++ branches/0.18/src/node/x3d-core/x3d-core.vcxproj 2012-05-01 05:06:12 UTC (rev 4282)
@@ -59,7 +59,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -74,7 +74,7 @@
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
Modified: branches/0.18/src/node/x3d-dis/x3d-dis.vcxproj
===================================================================
--- branches/0.18/src/node/x3d-dis/x3d-dis.vcxproj 2012-05-01 05:00:36 UTC (rev 4281)
+++ branches/0.18/src/node/x3d-dis/x3d-dis.vcxproj 2012-05-01 05:06:12 UTC (rev 4282)
@@ -58,7 +58,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -73,7 +73,7 @@
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
Modified: branches/0.18/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj
===================================================================
--- branches/0.18/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj 2012-05-01 05:00:36 UTC (rev 4281)
+++ branches/0.18/src/node/x3d-environmental-effects/x3d-environmental-effects.vcxproj 2012-05-01 05:06:12 UTC (rev 4282)
@@ -58,7 +58,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>OPENVRML_USE_DLL;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
@@ -73,7 +73,7 @@
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\..\libopenvrml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_SECURE_SCL=0;OPENVRML_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>OPENVRML_USE_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
Modified: branches/0.18/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj
===================================================================
--- branches/0.18/src/node/x3d-event-utilities/x3d-event-utilities.vcxproj 2012-05-01 05:00:36 UTC (rev 4281)
+++ branches/0.18/src/node/x...
[truncated message content] |
|
From: <br...@us...> - 2012-05-01 05:16:10
|
Revision: 4284
http://openvrml.svn.sourceforge.net/openvrml/?rev=4284&view=rev
Author: braden
Date: 2012-05-01 05:16:04 +0000 (Tue, 01 May 2012)
Log Message:
-----------
Generate openvrml-gl.lib into arch-specific subdirectory.
Modified Paths:
--------------
branches/0.18/ChangeLog
branches/0.18/src/libopenvrml-gl/openvrml-gl.vcxproj
Property Changed:
----------------
branches/0.18/
Property changes on: branches/0.18
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274,4276,4278,4280-4281
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274,4276,4278,4280-4281,4283
Modified: branches/0.18/ChangeLog
===================================================================
--- branches/0.18/ChangeLog 2012-05-01 05:14:52 UTC (rev 4283)
+++ branches/0.18/ChangeLog 2012-05-01 05:16:04 UTC (rev 4284)
@@ -1,5 +1,10 @@
2012-05-01 Braden McDaniel <br...@en...>
+ * src/libopenvrml-gl/openvrml-gl.vcxproj: Generate openvrml-gl.lib
+ into arch-specific subdirectory.
+
+2012-05-01 Braden McDaniel <br...@en...>
+
Project file clean-up. Remove references to site-specific library
directories; these should be set in user (site-specific)
properties. Reorganize preprocessor symbol definitions to
Modified: branches/0.18/src/libopenvrml-gl/openvrml-gl.vcxproj
===================================================================
--- branches/0.18/src/libopenvrml-gl/openvrml-gl.vcxproj 2012-05-01 05:14:52 UTC (rev 4283)
+++ branches/0.18/src/libopenvrml-gl/openvrml-gl.vcxproj 2012-05-01 05:16:04 UTC (rev 4284)
@@ -72,7 +72,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>$(SolutionDir)$(Configuration)\lib\$(TargetName).lib</ImportLibrary>
+ <ImportLibrary>$(SolutionDir)$(Platform)\$(Configuration)\lib\$(TargetName).lib</ImportLibrary>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -97,7 +97,7 @@
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<DataExecutionPrevention>
</DataExecutionPrevention>
- <ImportLibrary>$(SolutionDir)$(Configuration)\lib\$(TargetName).lib</ImportLibrary>
+ <ImportLibrary>$(SolutionDir)$(Platform)\$(Configuration)\lib\$(TargetName).lib</ImportLibrary>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2012-05-01 05:30:55
|
Revision: 4286
http://openvrml.svn.sourceforge.net/openvrml/?rev=4286&view=rev
Author: braden
Date: 2012-05-01 05:30:48 +0000 (Tue, 01 May 2012)
Log Message:
-----------
Boost.Filesystem 3 doesn't have path::external_file_string; use generic_string instead.
Modified Paths:
--------------
branches/0.18/ChangeLog
branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp
Property Changed:
----------------
branches/0.18/
Property changes on: branches/0.18
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274,4276,4278,4280-4281,4283
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274,4276,4278,4280-4281,4283,4285
Modified: branches/0.18/ChangeLog
===================================================================
--- branches/0.18/ChangeLog 2012-05-01 05:29:53 UTC (rev 4285)
+++ branches/0.18/ChangeLog 2012-05-01 05:30:48 UTC (rev 4286)
@@ -1,5 +1,13 @@
2012-05-01 Braden McDaniel <br...@en...>
+ * src/local/libopenvrml-dl/openvrml/local/dl.cpp
+ (foreachfile(const std::vector<boost::filesystem::path> &, int
+ (*)(const std::string &, void *), void *)): Boost.Filesystem 3
+ doesn't have path::external_file_string; use generic_string
+ instead.
+
+2012-05-01 Braden McDaniel <br...@en...>
+
* src/libopenvrml-gl/openvrml-gl.vcxproj: Generate openvrml-gl.lib
into arch-specific subdirectory.
Modified: branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp
===================================================================
--- branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp 2012-05-01 05:29:53 UTC (rev 4285)
+++ branches/0.18/src/local/libopenvrml-dl/openvrml/local/dl.cpp 2012-05-01 05:30:48 UTC (rev 4286)
@@ -75,7 +75,7 @@
for (directory_iterator entry(*dir);
entry != directory_iterator();
++entry) {
- result = (func)(entry->path().external_file_string(), data);
+ result = (func)(entry->path().generic_string(), data);
if (result != 0) { return result; }
}
} catch (boost::filesystem::filesystem_error &) {}
@@ -144,7 +144,7 @@
reinterpret_cast<LPSTR>(&buf),
buf_size,
args);
- assert(buf_chars != 0); // If FormatMessage failed, just give up.
+ assert(buf_chars != DWORD(0)); // If FormatMessage failed, just give up.
const std::string buf_str(buf ? buf : "");
return buf_str;
# else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2012-05-01 05:38:43
|
Revision: 4288
http://openvrml.svn.sourceforge.net/openvrml/?rev=4288&view=rev
Author: braden
Date: 2012-05-01 05:38:37 +0000 (Tue, 01 May 2012)
Log Message:
-----------
Suppress various warnings from the Microsoft compiler version 16.00.40219.01.
Modified Paths:
--------------
branches/0.18/ChangeLog
branches/0.18/src/libopenvrml/openvrml/basetypes.h
branches/0.18/src/libopenvrml/openvrml/local/component.cpp
branches/0.18/src/libopenvrml/openvrml/local/component.h
branches/0.18/src/libopenvrml/openvrml/local/error.cpp
branches/0.18/src/libopenvrml/openvrml/scene.cpp
branches/0.18/src/libopenvrml-gl/openvrml/gl/viewer.cpp
Property Changed:
----------------
branches/0.18/
branches/0.18/src/libopenvrml/openvrml/scene.cpp
Property changes on: branches/0.18
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274,4276,4278,4280-4281,4283,4285
+ /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801
/trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4047,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4247,4249,4251,4253,4255,4257,4259,4261,4264,4266,4268,4270,4272,4274,4276,4278,4280-4281,4283,4285,4287
Modified: branches/0.18/ChangeLog
===================================================================
--- branches/0.18/ChangeLog 2012-05-01 05:36:38 UTC (rev 4287)
+++ branches/0.18/ChangeLog 2012-05-01 05:38:37 UTC (rev 4288)
@@ -1,5 +1,17 @@
2012-05-01 Braden McDaniel <br...@en...>
+ Suppress various warnings from the Microsoft compiler
+ version 16.00.40219.01.
+
+ * src/libopenvrml/openvrml/basetypes.h
+ * src/libopenvrml/openvrml/scene.cpp
+ * src/libopenvrml/openvrml/local/component.cpp
+ * src/libopenvrml/openvrml/local/component.h
+ * src/libopenvrml/openvrml/local/error.cpp
+ * src/libopenvrml-gl/openvrml/gl/viewer.cpp
+
+2012-05-01 Braden McDaniel <br...@en...>
+
* src/local/libopenvrml-dl/openvrml/local/dl.cpp
(foreachfile(const std::vector<boost::filesystem::path> &, int
(*)(const std::string &, void *), void *)): Boost.Filesystem 3
Modified: branches/0.18/src/libopenvrml/openvrml/basetypes.h
===================================================================
--- branches/0.18/src/libopenvrml/openvrml/basetypes.h 2012-05-01 05:36:38 UTC (rev 4287)
+++ branches/0.18/src/libopenvrml/openvrml/basetypes.h 2012-05-01 05:38:37 UTC (rev 4288)
@@ -69,7 +69,7 @@
inline const float & color::operator[](const std::size_t index) const
OPENVRML_NOTHROW
{
- assert(index < 3);
+ assert(index < 3UL);
return this->rgb[index];
}
@@ -145,7 +145,7 @@
inline const float & color_rgba::operator[](const std::size_t index) const
OPENVRML_NOTHROW
{
- assert(index < 4);
+ assert(index < 4ul);
return this->rgba[index];
}
@@ -240,7 +240,7 @@
inline const float & vec2f::operator[](const std::size_t index) const
OPENVRML_NOTHROW
{
- assert(index < 2);
+ assert(index < 2ul);
return this->vec[index];
}
@@ -325,7 +325,7 @@
inline const double & vec2d::operator[](const std::size_t index) const
OPENVRML_NOTHROW
{
- assert(index < 2);
+ assert(index < 2ul);
return this->vec[index];
}
@@ -425,7 +425,7 @@
inline const float & vec3f::operator[](const std::size_t index) const
OPENVRML_NOTHROW
{
- assert(index < 3);
+ assert(index < 3ul);
return this->vec[index];
}
@@ -538,7 +538,7 @@
inline const double & vec3d::operator[](const std::size_t index) const
OPENVRML_NOTHROW
{
- assert(index < 3);
+ assert(index < 3ul);
return this->vec[index];
}
@@ -644,7 +644,7 @@
inline const float & rotation::operator[](const std::size_t index) const
OPENVRML_NOTHROW
{
- assert(index < 4);
+ assert(index < 4ul);
return this->rot[index];
}
@@ -734,13 +734,13 @@
inline float (&mat4f::operator[](std::size_t index) OPENVRML_NOTHROW)[4]
{
- assert(index < 4);
+ assert(index < 4ul);
return this->mat[index];
}
inline const float (&mat4f::operator[](std::size_t index) const OPENVRML_NOTHROW)[4]
{
- assert(index < 4);
+ assert(index < 4ul);
return this->mat[index];
}
@@ -813,13 +813,13 @@
inline const float & quatf::operator[](std::size_t index) const OPENVRML_NOTHROW
{
- assert(index < 4);
+ assert(index < 4ul);
return this->quat[index];
}
inline float & quatf::operator[](std::size_t index) OPENVRML_NOTHROW
{
- assert(index < 4);
+ assert(index < 4ul);
return this->quat[index];
}
Modified: branches/0.18/src/libopenvrml/openvrml/local/component.cpp
===================================================================
--- branches/0.18/src/libopenvrml/openvrml/local/component.cpp 2012-05-01 05:36:38 UTC (rev 4287)
+++ branches/0.18/src/libopenvrml/openvrml/local/component.cpp 2012-05-01 05:38:37 UTC (rev 4288)
@@ -379,11 +379,11 @@
void
openvrml::local::profile::
-add_component(const std::string & name, const int level)
+add_component(const std::string & name, const size_t level)
OPENVRML_THROW1(std::bad_alloc)
{
//get the existing/new support level
- int & comp_level = components_[name];
+ size_t & comp_level = components_[name];
//update the support level.
comp_level = std::max(level, comp_level);
Modified: branches/0.18/src/libopenvrml/openvrml/local/component.h
===================================================================
--- branches/0.18/src/libopenvrml/openvrml/local/component.h 2012-05-01 05:36:38 UTC (rev 4287)
+++ branches/0.18/src/libopenvrml/openvrml/local/component.h 2012-05-01 05:38:37 UTC (rev 4288)
@@ -108,11 +108,11 @@
class OPENVRML_LOCAL profile {
- typedef std::map<std::string, int> map_t;
+ typedef std::map<std::string, size_t> map_t;
map_t components_;
protected:
- void add_component(const std::string & name, int level)
+ void add_component(const std::string & name, size_t level)
OPENVRML_THROW1(std::bad_alloc);
public:
Modified: branches/0.18/src/libopenvrml/openvrml/local/error.cpp
===================================================================
--- branches/0.18/src/libopenvrml/openvrml/local/error.cpp 2012-05-01 05:36:38 UTC (rev 4287)
+++ branches/0.18/src/libopenvrml/openvrml/local/error.cpp 2012-05-01 05:38:37 UTC (rev 4288)
@@ -25,7 +25,7 @@
void openvrml::local::throw_runtime_error_from_win32_system_error(LONG result)
OPENVRML_THROW1(std::runtime_error)
{
- static const LPCVOID source;
+ static const LPCVOID source = 0;
LPTSTR buf = 0;
BOOST_SCOPE_EXIT((&buf)) {
LocalFree(buf);
@@ -33,10 +33,10 @@
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM
| FORMAT_MESSAGE_ALLOCATE_BUFFER,
source,
- result,
+ static_cast<DWORD>(result),
LANG_USER_DEFAULT,
- reinterpret_cast< LPTSTR >(&buf),
- DWORD(0),
+ reinterpret_cast<LPTSTR>(&buf),
+ static_cast<DWORD>(0),
0);
throw std::runtime_error(buf);
Modified: branches/0.18/src/libopenvrml/openvrml/scene.cpp
===================================================================
--- branches/0.18/src/libopenvrml/openvrml/scene.cpp 2012-05-01 05:36:38 UTC (rev 4287)
+++ branches/0.18/src/libopenvrml/openvrml/scene.cpp 2012-05-01 05:38:37 UTC (rev 4288)
@@ -423,7 +423,9 @@
const resource_istream::int_type c = this->in_->get();
if (c != resource_istream::traits_type::eof()) {
data.push_back(
- resource_istream::traits_type::to_char_type(c));
+ static_cast<unsigned char>(
+ resource_istream::traits_type::
+ to_char_type(c)));
} else {
break;
}
Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245
+ /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836
/branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801
/trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4107-4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164,4169,4171,4174,4178-4179,4181,4183,4186,4188,4190,4192,4194,4196,4198-4199,4201,4203,4206,4208,4210,4212,4214,4216,4218,4220,4222,4224,4226,4228,4230,4232,4236,4243,4245,4287
Modified: branches/0.18/src/libopenvrml-gl/openvrml/gl/viewer.cpp
===================================================================
--- branches/0.18/src/libopenvrml-gl/openvrml/gl/viewer.cpp 2012-05-01 05:36:38 UTC (rev 4287)
+++ branches/0.18/src/libopenvrml-gl/openvrml/gl/viewer.cpp 2012-05-01 05:38:37 UTC (rev 4288)
@@ -74,12 +74,6 @@
const double pi_4 = 0.78539816339744830962;
const double inv_pi = 0.31830988618379067154;
- template <typename Float>
- OPENVRML_GL_LOCAL inline Float fabs(const Float f)
- {
- return f < 0.0 ? -f : f;
- }
-
struct OPENVRML_GL_LOCAL fequal_t {
template <typename Float>
bool operator()(Float a, Float b) const
@@ -2138,7 +2132,7 @@
GLdouble v[3];
// Mesa tesselator doesn;t like closed polys
- size_t j = equalEndpts ? 1 : 0;
+ size_t j = equalEndpts ? 1ul : 0ul;
for (; j < cs.size(); ++j) {
v[0] = c[j + n].x();
v[1] = c[j + n].y();
@@ -2525,7 +2519,8 @@
spine_point->x(), spine_point->y(), spine_point->z(), 1.0);
const vector<vec3f>::size_type spine_index =
- std::distance(spine.begin(), spine_point);
+ static_cast<std::size_t>(std::distance(spine.begin(),
+ spine_point));
if (!orientation.empty()) {
const vector<rotation>::size_type index =
@@ -2704,8 +2699,8 @@
glBegin(GL_LINE_STRIP);
if (!color.empty() && color_per_face) {
const size_t color_index = !colorIndex.empty()
- ? colorIndex.front()
- : 0;
+ ? static_cast<std::size_t>(colorIndex.front())
+ : 0ul;
glColor3fv(&color[color_index][0]);
}
@@ -2720,7 +2715,7 @@
? int32(colorIndex[nl])
: int32(nl);
if (size_t(index) < color.size()) {
- glColor3fv(&color[index][0]);
+ glColor3fv(&color[static_cast<std::size_t>(index)][0]);
}
}
} else {
@@ -2729,11 +2724,12 @@
? colorIndex[i]
: coordIndex[i];
if (size_t(index) < color.size()) {
- glColor3fv(&color[index][0]);
+ glColor3fv(&color[static_cast<std::size_t>(index)][0]);
}
}
if (size_t(coordIndex[i]) < coord.size()) {
- glVertex3fv(&coord[coordIndex[i]][0]);
+ glVertex3fv(
+ &coord[static_cast<std::size_t>(coordIndex[i])][0]);
}
}
}
@@ -2887,10 +2883,12 @@
&& s->coordIndex[i1] >= 0
&& s->coordIndex[i1 + 1] >= 0
&& s->coordIndex[i1 + 2] >= 0) {
- N = indexFaceNormal(s->coordIndex[i1],
- s->coordIndex[i1 + 1],
- s->coordIndex[i1 + 2],
- s->coord);
+ N =
+ indexFaceNormal(
+ static_cast<std::size_t>(s->coordIndex[i1]),
+ static_cast<std::size_t>(s->coordIndex[i1 + 1]),
+ static_cast<std::size_t>(s->coordIndex[i1 + 2]),
+ s->coord);
// Flip normal if primitiv-orientation is clockwise
if (!(s->mask & viewer::mask_ccw)) { N = -N; }
@@ -2903,18 +2901,20 @@
if (s->coordIndex[i] >= 0) {
// Per-vertex attributes
- const size_t color_index = (i < s->colorIndex.size())
- ? s->colorIndex[i]
- : s->coordIndex[i];
+ const size_t color_index =
+ static_cast<std::size_t>(
+ (i < s->colorIndex.size()) ? s->colorIndex[i]
+ : s->coordIndex[i]);
if (color_index < s->color.size()
&& (s->mask & viewer::mask_color_per_vertex)) {
glColor3fv(&s->color[color_index][0]);
}
if (s->mask & viewer::mask_normal_per_vertex) {
- const size_t normal_index = (i < s->normalIndex.size())
- ? s->normalIndex[i]
- : s->coordIndex[i];
+ const size_t normal_index =
+ static_cast<std::size_t>(
+ (i < s->normalIndex.size()) ? s->normalIndex[i]
+ : s->coordIndex[i]);
if (normal_index < s->normal.size()) {
glNormal3fv(&s->normal[normal_index][0]);
} else {
@@ -2922,17 +2922,21 @@
}
}
- const vec3f & v = s->coord[s->coordIndex[i]];
- const size_t tex_coord_index = (i < s->texCoordIndex.size())
- ? s->texCoordIndex[i]
- : s->coordIndex[i];
+ const vec3f & v =
+ s->coord[static_cast<std::size_t>(s->coordIndex[i])];
+ const size_t tex_coord_index =
+ static_cast<std::size_t>(
+ (i < s->texCoordIndex.size()) ? s->texCoordIndex[i]
+ : s->coordIndex[i]);
if (tex_coord_index < s->texCoord.size()) {
glTexCoord2fv(&s->texCoord[tex_coord_index][0]);
} else {
float c0, c1;
- c0 = (v[s->texAxes[0]] - s->texParams[0])
+ c0 = (v[static_cast<std::size_t>(s->texAxes[0])]
+ - s->texParams[0])
* s->texParams[1];
- c1 = (v[s->texAxes[1]] - s->texParams[2])
+ c1 = (v[static_cast<std::size_t>(s->texAxes[1])]
+ - s->texParams[2])
* s->texParams[3];
glTexCoord2f(c0, c1);
}
@@ -3011,11 +3015,14 @@
//
while (coord_index[i + 1] != -1) { ++i; }
} else if (coord_index[i] != -1) {
- gluTessVertex(&tessobj,
- const_cast<GLdouble *>(
- vertices[coord_index[i]].coord),
- &const_cast<vertex_data &>(
- vertices[coord_index[i]]));
+ gluTessVertex(
+ &tessobj,
+ const_cast<GLdouble *>(
+ vertices[
+ static_cast<std::size_t>(coord_index[i])].coord),
+ &const_cast<vertex_data &>(
+ vertices[
+ static_cast<std::size_t>(coord_index[i])]));
} else {
gluTessEndContour(&tessobj);
gluTessEndPolygon(&tessobj);
@@ -3143,7 +3150,8 @@
++i) {
if (color_index[i] < 0) { continue; }
if (!(size_t(coord_index[i]) < coord.size())) { continue; }
- vertices[coord_index[i]].color = &color[color_index[i]];
+ vertices[static_cast<std::size_t>(coord_index[i])].color =
+ &color[static_cast<std::size_t>(color_index[i])];
}
}
}
@@ -3160,7 +3168,8 @@
++i) {
if (normal_index[i] < 0) { continue; }
if (!(size_t(coord_index[i]) < coord.size())) { continue; }
- vertices[coord_index[i]].normal = &normal[normal_index[i]];
+ vertices[static_cast<std::size_t>(coord_index[i])].normal =
+ &normal[static_cast<std::size_t>(normal_index[i])];
}
}
}
@@ -3176,8 +3185,10 @@
i < tex_coord_index.size();
++i) {
if (tex_coord_index[i] < 0) { continue; }
- vertices[tex_coord_index[i]].tex_coord =
- &tex_coord[tex_coord_index[i]];
+ vertices[static_cast<std::size_t>(tex_coord_index[i])]
+ .tex_coord =
+ &tex_coord[static_cast<std::size_t>(
+ tex_coord_index[i])];
}
}
@@ -3698,7 +3709,7 @@
const texture_map_t::const_iterator texture = this->texture_map_.find(&n);
if (texture != this->texture_map_.end()) {
// Enable blending if needed.
- const int32 comp = n.image().comp();
+ const int32 comp = static_cast<int32>(n.image().comp());
if (this->blend && (comp == 2 || comp == 4)) { glEnable(GL_BLEND); }
glBindTexture(GL_TEXTURE_2D, texture->second);
return;
@@ -3718,8 +3729,8 @@
if (width > max_texture_size) { width = max_texture_size; }
if (height > max_texture_size) { height = max_texture_size; }
- while (!power_of_2(width)) { --width; }
- while (!power_of_2(height)) { --height; }
+ while (!power_of_2(static_cast<std::size_t>(width))) { --width; }
+ while (!power_of_2(static_cast<std::size_t>(height))) { --height; }
vector<GLubyte> rescaled_pixels;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2012-05-05 21:14:57
|
Revision: 4289
http://openvrml.svn.sourceforge.net/openvrml/?rev=4289&view=rev
Author: braden
Date: 2012-05-05 21:14:51 +0000 (Sat, 05 May 2012)
Log Message:
-----------
Updates for 0.18.9 release.
Modified Paths:
--------------
branches/0.18/ChangeLog
branches/0.18/NEWS
branches/0.18/README
branches/0.18/configure.ac
branches/0.18/doc/Doxyfile
branches/0.18/src/Makefile.am
branches/0.18/src/libopenvrml/openvrml.rc
branches/0.18/src/libopenvrml/openvrml.vcxproj
branches/0.18/src/libopenvrml-gl/openvrml-gl.rc
Modified: branches/0.18/ChangeLog
===================================================================
--- branches/0.18/ChangeLog 2012-05-01 05:38:37 UTC (rev 4288)
+++ branches/0.18/ChangeLog 2012-05-05 21:14:51 UTC (rev 4289)
@@ -1,3 +1,18 @@
+2012-05-05 Braden McDaniel <br...@en...>
+
+ Updates for 0.18.9 release.
+
+ * README
+ * NEWS
+ * configure.ac
+ * doc/Doxyfile
+ * src/libopenvrml/openvrml.rc
+ * src/libopenvrml/openvrml.vcproj
+ * src/libopenvrml-gl/openvrml-gl.rc
+ * src/Makefile.am
+ (LIBOPENVRML_LIBRARY_VERSION): Update to 10:1:1.
+ (LIBOPENVRML_GL_LIBRARY_VERSION): Update to 8:1:0.
+
2012-05-01 Braden McDaniel <br...@en...>
Suppress various warnings from the Microsoft compiler
Modified: branches/0.18/NEWS
===================================================================
--- branches/0.18/NEWS 2012-05-01 05:38:37 UTC (rev 4288)
+++ branches/0.18/NEWS 2012-05-05 21:14:51 UTC (rev 4289)
@@ -1,3 +1,9 @@
+Changes new in version 0.18.9, 5 May, 2012
+========================================================================
+
+- Changes to build with Boost 1.47.0, XULRunner 12.0, and libpng 1.5.
+
+
Changes new in version 0.18.8, 21 April, 2011
========================================================================
Modified: branches/0.18/README
===================================================================
--- branches/0.18/README 2012-05-01 05:38:37 UTC (rev 4288)
+++ branches/0.18/README 2012-05-05 21:14:51 UTC (rev 4289)
@@ -1,7 +1,7 @@
-OpenVRML library version 0.18.8
+OpenVRML library version 0.18.9
Copyright 1998, 1999, 2000 Chris Morley <cm...@ve...>
-Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
- Braden McDaniel <br...@en...>
+Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+ 2011, 2012 Braden McDaniel <br...@en...>
Portions Copyright SGI and others
Available from <http://openvrml.org>
Modified: branches/0.18/configure.ac
===================================================================
--- branches/0.18/configure.ac 2012-05-01 05:38:37 UTC (rev 4288)
+++ branches/0.18/configure.ac 2012-05-05 21:14:51 UTC (rev 4289)
@@ -1,6 +1,6 @@
-AC_INIT([OpenVRML], [0.18.8], [ope...@li...])
+AC_INIT([OpenVRML], [0.18.9], [ope...@li...])
AC_PREREQ([2.59])
-AC_COPYRIGHT([Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Braden McDaniel])
+AC_COPYRIGHT([Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Braden McDaniel])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_FILES([Makefile]
[doc/Makefile]
Modified: branches/0.18/doc/Doxyfile
===================================================================
--- branches/0.18/doc/Doxyfile 2012-05-01 05:38:37 UTC (rev 4288)
+++ branches/0.18/doc/Doxyfile 2012-05-05 21:14:51 UTC (rev 4289)
@@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = OpenVRML
-PROJECT_NUMBER = 0.18.8
+PROJECT_NUMBER = 0.18.9
PROJECT_BRIEF =
PROJECT_LOGO =
OUTPUT_DIRECTORY =
Modified: branches/0.18/src/Makefile.am
===================================================================
--- branches/0.18/src/Makefile.am 2012-05-01 05:38:37 UTC (rev 4288)
+++ branches/0.18/src/Makefile.am 2012-05-05 21:14:51 UTC (rev 4289)
@@ -47,8 +47,8 @@
libopenvrml/private.h \
openvrml-player/filechooserdialog.h
-LIBOPENVRML_LIBRARY_VERSION = 10:0:1
-LIBOPENVRML_GL_LIBRARY_VERSION = 8:0:0
+LIBOPENVRML_LIBRARY_VERSION = 10:1:1
+LIBOPENVRML_GL_LIBRARY_VERSION = 8:1:0
# | | |
# +------+ | +---+
# | | |
Modified: branches/0.18/src/libopenvrml/openvrml.rc
===================================================================
--- branches/0.18/src/libopenvrml/openvrml.rc 2012-05-01 05:38:37 UTC (rev 4288)
+++ branches/0.18/src/libopenvrml/openvrml.rc 2012-05-05 21:14:51 UTC (rev 4289)
@@ -11,8 +11,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 9,5,1,0
- PRODUCTVERSION 0,18,7,0
+ FILEVERSION 10,1,1,0
+ PRODUCTVERSION 0,18,9,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -28,12 +28,12 @@
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "OpenVRML Library"
- VALUE "FileVersion", "10, 0, 1, 0"
+ VALUE "FileVersion", "10, 1, 1, 0"
VALUE "InternalName", "openvrml"
- VALUE "LegalCopyright", "Copyright (C) 2011"
+ VALUE "LegalCopyright", "Copyright (C) 2012"
VALUE "OriginalFilename", "openvrml.dll"
VALUE "ProductName", "OpenVRML Library"
- VALUE "ProductVersion", "0.18.8"
+ VALUE "ProductVersion", "0.18.9"
END
END
BLOCK "VarFileInfo"
Modified: branches/0.18/src/libopenvrml/openvrml.vcxproj
===================================================================
--- branches/0.18/src/libopenvrml/openvrml.vcxproj 2012-05-01 05:38:37 UTC (rev 4288)
+++ branches/0.18/src/libopenvrml/openvrml.vcxproj 2012-05-05 21:14:51 UTC (rev 4289)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -65,7 +65,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;..\local\libopenvrml-dl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.9";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -91,7 +91,7 @@
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>.;..\local\libopenvrml-dl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.8";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION="0.18.9";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;BOOST_NO_RVALUE_REFERENCES;BOOST_FILESYSTEM_VERSION=3;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_="";OPENVRML_PKGLIBDIR_="";NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FunctionLevelLinking>true</FunctionLevelLinking>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -187,4 +187,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: branches/0.18/src/libopenvrml-gl/openvrml-gl.rc
===================================================================
--- branches/0.18/src/libopenvrml-gl/openvrml-gl.rc 2012-05-01 05:38:37 UTC (rev 4288)
+++ branches/0.18/src/libopenvrml-gl/openvrml-gl.rc 2012-05-05 21:14:51 UTC (rev 4289)
@@ -11,8 +11,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 8,0,0,0
- PRODUCTVERSION 0,18,7,0
+ FILEVERSION 8,1,0,0
+ PRODUCTVERSION 0,18,9,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -28,12 +28,12 @@
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "OpenVRML OpenGL Renderer Library"
- VALUE "FileVersion", "8, 0, 0, 0"
+ VALUE "FileVersion", "8, 1, 0, 0"
VALUE "InternalName", "openvrml-gl"
VALUE "LegalCopyright", "Copyright (C) 2011"
VALUE "OriginalFilename", "openvrml-gl.dll"
VALUE "ProductName", "OpenVRML Library"
- VALUE "ProductVersion", "0.18.8"
+ VALUE "ProductVersion", "0.18.9"
END
END
BLOCK "VarFileInfo"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <br...@us...> - 2012-05-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-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.v...
[truncated message content] |
|
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)|$(Platf...
[truncated message content] |
|
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.
|
Thanks for helping keep SourceForge clean.
X