Menu
▾
▴
openvrml-commit — Changes to OpenVRML's source revision repository
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(128) |
Dec
(65) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(48) |
Feb
(132) |
Mar
(95) |
Apr
(47) |
May
(54) |
Jun
(2) |
Jul
(57) |
Aug
(109) |
Sep
(131) |
Oct
(186) |
Nov
(105) |
Dec
(78) |
| 2007 |
Jan
(125) |
Feb
(105) |
Mar
(52) |
Apr
(104) |
May
(63) |
Jun
(116) |
Jul
(76) |
Aug
|
Sep
(18) |
Oct
(93) |
Nov
(110) |
Dec
(169) |
| 2008 |
Jan
(90) |
Feb
(64) |
Mar
(41) |
Apr
(23) |
May
(6) |
Jun
(18) |
Jul
(10) |
Aug
(61) |
Sep
(139) |
Oct
(50) |
Nov
(55) |
Dec
(2) |
| 2009 |
Jan
|
Feb
(1) |
Mar
(62) |
Apr
(22) |
May
(17) |
Jun
(19) |
Jul
(40) |
Aug
(21) |
Sep
|
Oct
(40) |
Nov
(23) |
Dec
|
| 2010 |
Jan
(14) |
Feb
(40) |
Mar
(9) |
Apr
(11) |
May
(19) |
Jun
(4) |
Jul
(10) |
Aug
(22) |
Sep
(15) |
Oct
|
Nov
(2) |
Dec
|
| 2011 |
Jan
(13) |
Feb
(10) |
Mar
|
Apr
(13) |
May
|
Jun
|
Jul
(2) |
Aug
(4) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(33) |
May
(20) |
Jun
|
Jul
(8) |
Aug
(7) |
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Braden M. <br...@us...> - 2006-09-26 15:42:53
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28484/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl Modified Files: openvrml-gl.vcproj Log Message: Put DLLs, EXEs in a common directory. Index: openvrml-gl.vcproj =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** openvrml-gl.vcproj 22 Sep 2006 22:23:09 -0000 1.6 --- openvrml-gl.vcproj 26 Sep 2006 15:42:51 -0000 1.7 *************** *** 68,72 **** --- 68,74 ---- Name="VCLinkerTool" AdditionalDependencies="GlU32.lib OpenGL32.lib" + OutputFile="$(SolutionDir)..\bin\$(ProjectName)d.dll" GenerateDebugInformation="true" + ImportLibrary="$(SolutionDir)..\lib\$(TargetName).lib" /> <Tool *************** *** 149,153 **** --- 151,157 ---- Name="VCLinkerTool" AdditionalDependencies="GlU32.lib OpenGL32.lib" + OutputFile="$(SolutionDir)..\bin\$(ProjectName).dll" LinkTimeCodeGeneration="1" + ImportLibrary="$(SolutionDir)..\lib\$(TargetName).lib" /> <Tool |
|
From: Braden M. <br...@us...> - 2006-09-26 15:42:53
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28484 Modified Files: ChangeLog Log Message: Put DLLs, EXEs in a common directory. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1334 retrieving revision 1.1335 diff -C2 -d -r1.1334 -r1.1335 *** ChangeLog 26 Sep 2006 12:52:36 -0000 1.1334 --- ChangeLog 26 Sep 2006 15:42:51 -0000 1.1335 *************** *** 1,4 **** --- 1,12 ---- 2006-09-26 Braden McDaniel <br...@en...> + Put DLLs, EXEs in a common directory. + + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/openvrml.vcproj + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj + * ide-projects/Windows/VisualC8_0/OpenVRML/sdl-viewer/sdl-viewer.vcproj + + 2006-09-26 Braden McDaniel <br...@en...> + Made the GtkSocket id a required argument to openvrml-player rather than an option. |
|
From: Braden M. <br...@us...> - 2006-09-26 15:42:43
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28439/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl Modified Files: Tag: OpenVRML-0_16-BRANCH openvrml-gl.vcproj Log Message: Put DLLs, EXEs in a common directory. Index: openvrml-gl.vcproj =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -C2 -d -r1.4.2.2 -r1.4.2.3 *** openvrml-gl.vcproj 22 Sep 2006 22:22:49 -0000 1.4.2.2 --- openvrml-gl.vcproj 26 Sep 2006 15:42:35 -0000 1.4.2.3 *************** *** 68,72 **** --- 68,74 ---- Name="VCLinkerTool" AdditionalDependencies="GlU32.lib OpenGL32.lib" + OutputFile="$(SolutionDir)..\bin\$(ProjectName)d.dll" GenerateDebugInformation="true" + ImportLibrary="$(SolutionDir)..\lib\$(TargetName).lib" /> <Tool *************** *** 149,153 **** --- 151,157 ---- Name="VCLinkerTool" AdditionalDependencies="GlU32.lib OpenGL32.lib" + OutputFile="$(SolutionDir)..\bin\$(ProjectName).dll" LinkTimeCodeGeneration="1" + ImportLibrary="$(SolutionDir)..\lib\$(TargetName).lib" /> <Tool |
|
From: Braden M. <br...@us...> - 2006-09-26 15:42:41
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/sdl-viewer In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28439/ide-projects/Windows/VisualC8_0/OpenVRML/sdl-viewer Modified Files: Tag: OpenVRML-0_16-BRANCH sdl-viewer.vcproj Log Message: Put DLLs, EXEs in a common directory. Index: sdl-viewer.vcproj =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/sdl-viewer/sdl-viewer.vcproj,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** sdl-viewer.vcproj 22 Sep 2006 22:22:49 -0000 1.4.2.1 --- sdl-viewer.vcproj 26 Sep 2006 15:42:35 -0000 1.4.2.2 *************** *** 66,71 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="ws2_32.lib opengl32.lib glu32.lib SDLmain.lib SDL.lib" ! OutputFile="$(OutDir)/sdl-viewer.exe" LinkIncremental="2" GenerateDebugInformation="true" --- 66,71 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="opengl32.lib glu32.lib SDLmain.lib SDL.lib" ! OutputFile="$(SolutionDir)..\bin\sdl-viewerd.exe" LinkIncremental="2" GenerateDebugInformation="true" *************** *** 148,152 **** <Tool Name="VCLinkerTool" ! OutputFile="$(OutDir)/sdl-viewer.exe" LinkIncremental="1" GenerateDebugInformation="true" --- 148,153 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="opengl32.lib glu32.lib SDLmain.lib SDL.lib" ! OutputFile="$(SolutionDir)..\bin\sdl-viewer.exe" LinkIncremental="1" GenerateDebugInformation="true" |
|
From: Braden M. <br...@us...> - 2006-09-26 15:42:38
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28439/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml Modified Files: Tag: OpenVRML-0_16-BRANCH openvrml.vcproj Log Message: Put DLLs, EXEs in a common directory. Index: openvrml.vcproj =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/openvrml.vcproj,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -C2 -d -r1.4.2.2 -r1.4.2.3 *** openvrml.vcproj 22 Sep 2006 22:22:49 -0000 1.4.2.2 --- openvrml.vcproj 26 Sep 2006 15:42:35 -0000 1.4.2.3 *************** *** 68,72 **** --- 68,74 ---- <Tool Name="VCLinkerTool" + OutputFile="$(SolutionDir)..\bin\$(ProjectName)d.dll" GenerateDebugInformation="true" + ImportLibrary="$(SolutionDir)..\lib\$(TargetName).lib" /> <Tool *************** *** 150,154 **** --- 152,158 ---- <Tool Name="VCLinkerTool" + OutputFile="$(SolutionDir)..\bin\$(ProjectName).dll" LinkTimeCodeGeneration="1" + ImportLibrary="$(SolutionDir)..\lib\$(TargetName).lib" /> <Tool |
|
From: Braden M. <br...@us...> - 2006-09-26 15:42:38
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28439 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Put DLLs, EXEs in a common directory. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.19 retrieving revision 1.1310.2.20 diff -C2 -d -r1.1310.2.19 -r1.1310.2.20 *** ChangeLog 26 Sep 2006 12:52:08 -0000 1.1310.2.19 --- ChangeLog 26 Sep 2006 15:42:35 -0000 1.1310.2.20 *************** *** 1,4 **** --- 1,12 ---- 2006-09-26 Braden McDaniel <br...@en...> + Put DLLs, EXEs in a common directory. + + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/openvrml.vcproj + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj + * ide-projects/Windows/VisualC8_0/OpenVRML/sdl-viewer/sdl-viewer.vcproj + + 2006-09-26 Braden McDaniel <br...@en...> + Made the GtkSocket id a required argument to openvrml-player rather than an option. |
|
From: Braden M. <br...@us...> - 2006-09-26 12:52:39
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16101 Modified Files: ChangeLog Log Message: Made the GtkSocket id a required argument to openvrml-player rather than an option. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1333 retrieving revision 1.1334 diff -C2 -d -r1.1333 -r1.1334 *** ChangeLog 22 Sep 2006 22:23:09 -0000 1.1333 --- ChangeLog 26 Sep 2006 12:52:36 -0000 1.1334 *************** *** 1,2 **** --- 1,15 ---- + 2006-09-26 Braden McDaniel <br...@en...> + + Made the GtkSocket id a required argument to openvrml-player + rather than an option. + + * mozilla-plugin/src/openvrml.cpp + (PluginInstance::SetWindow(NPWindow &)): Add the socket id as an + argument rather than an option. + * mozilla-plugin/src/openvrml-player/player.cpp + (main(int, char *[])): No longer expect an optional URL argument; + instead, expect a required GtkSocket id argument (i.e., an + integer). + 2006-09-22 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2006-09-26 12:52:39
|
Update of /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16101/mozilla-plugin/src/openvrml-player Modified Files: player.cpp Log Message: Made the GtkSocket id a required argument to openvrml-player rather than an option. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml-player/player.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** player.cpp 4 Aug 2006 04:59:20 -0000 1.30 --- player.cpp 26 Sep 2006 12:52:36 -0000 1.31 *************** *** 19,23 **** --- 19,25 ---- // + # include <iostream> # include <sstream> + # include <boost/lexical_cast.hpp> # include <boost/thread/thread.hpp> # include <unistd.h> *************** *** 162,178 **** namespace { ! GdkNativeWindow socket_id; GOptionEntry options[] = { { ! "gtk-socket-id", ! 0, 0, ! G_OPTION_ARG_INT, ! &socket_id, ! "GtkSocket id", ! "GTK_SOCKET_ID" }, ! { 0, 0, 0, G_OPTION_ARG_NONE, 0, 0, 0 } }; --- 164,180 ---- namespace { ! gchar ** args; GOptionEntry options[] = { { ! G_OPTION_REMAINING, ! '\0', 0, ! G_OPTION_ARG_STRING_ARRAY, ! &args, ! "a GtkSocket id", ! "GTK-SOCKET-ID" }, ! { 0, '\0', 0, G_OPTION_ARG_NONE, 0, 0, 0 } }; *************** *** 256,259 **** --- 258,263 ---- int main(int argc, char * argv[]) { + using std::cerr; + using std::endl; using std::vector; using boost::function0; *************** *** 285,295 **** } command_istream command_in; ::request_channel = g_io_channel_unix_new(1); // stdout ! GtkWidget * window = socket_id ! ? gtk_plug_new(socket_id) ! : gtk_window_new(GTK_WINDOW_TOPLEVEL); GtkWidget * const vrml_browser = gtk_vrml_browser_new(::request_channel); --- 289,311 ---- } + if (!args) { + cerr << argv[0] << ": missing required GTK-SOCKET-ID argument" << endl; + return EXIT_FAILURE; + } + + GdkNativeWindow socket_id; + try { + socket_id = boost::lexical_cast<GdkNativeWindow>(args[0]); + } catch (const boost::bad_lexical_cast & ex) { + cerr << argv[0] << ": expected integer value for GTK-SOCKET-ID " + "argument" << endl; + return EXIT_FAILURE; + } + command_istream command_in; ::request_channel = g_io_channel_unix_new(1); // stdout ! GtkWidget * const window = gtk_plug_new(socket_id); GtkWidget * const vrml_browser = gtk_vrml_browser_new(::request_channel); *************** *** 305,354 **** GSource * command_watch = 0; ! if (argc > 1) { ! const gchar * url[] = { argv[1], 0 }; ! const gchar ** parameter = 0; ! gtk_vrml_browser_load_url(GTK_VRML_BROWSER(vrml_browser), ! url, ! parameter); ! } else { ! command_main_context = g_main_context_new(); ! command_main = g_main_loop_new(command_main_context, false); ! command_channel = g_io_channel_unix_new(0); // stdin ! GError * error = 0; ! GIOStatus status = g_io_channel_set_encoding(command_channel, ! 0, // binary (no encoding) ! &error); ! if (status != G_IO_STATUS_NORMAL) { ! if (error) { ! g_critical(error->message); ! g_error_free(error); ! } ! return EXIT_FAILURE; } ! command_watch = g_io_create_watch(command_channel, ! GIOCondition(G_IO_IN | G_IO_HUP)); ! const GDestroyNotify notify = 0; ! g_source_set_callback( ! command_watch, ! reinterpret_cast<GSourceFunc>(::command_data_available), ! static_cast<command_streambuf *>(command_in.rdbuf()), notify); ! guint source_id = g_source_attach(command_watch, ! command_main_context); ! g_return_val_if_fail(source_id != 0, EXIT_FAILURE); ! function0<void> command_channel_loop_func = ! command_channel_loop(*command_main); ! threads.create_thread(command_channel_loop_func); ! shared_ptr<plugin_streambuf> initial_stream( ! new plugin_streambuf(initial_stream_uri)); ! uninitialized_plugin_streambuf_map_.insert(initial_stream_uri, ! initial_stream); ! function0<void> initial_stream_reader_func = ! initial_stream_reader(initial_stream, ! *GTK_VRML_BROWSER(vrml_browser)); ! threads.create_thread(initial_stream_reader_func); ! } function0<void> read_commands = command_istream_reader(command_in); --- 321,362 ---- GSource * command_watch = 0; ! command_main_context = g_main_context_new(); ! command_main = g_main_loop_new(command_main_context, false); ! command_channel = g_io_channel_unix_new(0); // stdin ! error = 0; ! GIOStatus status = g_io_channel_set_encoding(command_channel, ! 0, // binary (no encoding) ! &error); ! if (status != G_IO_STATUS_NORMAL) { ! if (error) { ! g_critical(error->message); ! g_error_free(error); } + return EXIT_FAILURE; + } ! command_watch = g_io_create_watch(command_channel, ! GIOCondition(G_IO_IN | G_IO_HUP)); ! const GDestroyNotify notify = 0; ! g_source_set_callback( ! command_watch, ! reinterpret_cast<GSourceFunc>(::command_data_available), ! static_cast<command_streambuf *>(command_in.rdbuf()), notify); ! guint source_id = g_source_attach(command_watch, ! command_main_context); ! g_return_val_if_fail(source_id != 0, EXIT_FAILURE); ! function0<void> command_channel_loop_func = ! command_channel_loop(*command_main); ! threads.create_thread(command_channel_loop_func); ! shared_ptr<plugin_streambuf> initial_stream( ! new plugin_streambuf(initial_stream_uri)); ! uninitialized_plugin_streambuf_map_.insert(initial_stream_uri, ! initial_stream); ! function0<void> initial_stream_reader_func = ! initial_stream_reader(initial_stream, ! *GTK_VRML_BROWSER(vrml_browser)); ! threads.create_thread(initial_stream_reader_func); function0<void> read_commands = command_istream_reader(command_in); *************** *** 361,365 **** g_source_unref(command_watch); ! GIOStatus status = g_io_channel_shutdown(command_channel, true, &error); if (status != G_IO_STATUS_NORMAL) { if (error) { --- 369,373 ---- g_source_unref(command_watch); ! status = g_io_channel_shutdown(command_channel, true, &error); if (status != G_IO_STATUS_NORMAL) { if (error) { |
|
From: Braden M. <br...@us...> - 2006-09-26 12:52:38
|
Update of /cvsroot/openvrml/openvrml/mozilla-plugin/src In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16101/mozilla-plugin/src Modified Files: openvrml.cpp Log Message: Made the GtkSocket id a required argument to openvrml-player rather than an option. Index: openvrml.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** openvrml.cpp 4 Aug 2006 04:59:20 -0000 1.37 --- openvrml.cpp 26 Sep 2006 12:52:36 -0000 1.38 *************** *** 1097,1102 **** } ! string socket_id_arg = ! "--gtk-socket-id=" + lexical_cast<string>(this->window); const char * socket_id_arg_c_str = socket_id_arg.c_str(); vector<char> socket_id_arg_vec( --- 1097,1101 ---- } ! string socket_id_arg = lexical_cast<string>(this->window); const char * socket_id_arg_c_str = socket_id_arg.c_str(); vector<char> socket_id_arg_vec( |
|
From: Braden M. <br...@us...> - 2006-09-26 12:52:13
|
Update of /cvsroot/openvrml/openvrml/mozilla-plugin/src In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16035/mozilla-plugin/src Modified Files: Tag: OpenVRML-0_16-BRANCH openvrml.cpp Log Message: Made the GtkSocket id a required argument to openvrml-player rather than an option. Index: openvrml.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml.cpp,v retrieving revision 1.37 retrieving revision 1.37.2.1 diff -C2 -d -r1.37 -r1.37.2.1 *** openvrml.cpp 4 Aug 2006 04:59:20 -0000 1.37 --- openvrml.cpp 26 Sep 2006 12:52:09 -0000 1.37.2.1 *************** *** 1097,1102 **** } ! string socket_id_arg = ! "--gtk-socket-id=" + lexical_cast<string>(this->window); const char * socket_id_arg_c_str = socket_id_arg.c_str(); vector<char> socket_id_arg_vec( --- 1097,1101 ---- } ! string socket_id_arg = lexical_cast<string>(this->window); const char * socket_id_arg_c_str = socket_id_arg.c_str(); vector<char> socket_id_arg_vec( |
|
From: Braden M. <br...@us...> - 2006-09-26 12:52:13
|
Update of /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16035/mozilla-plugin/src/openvrml-player Modified Files: Tag: OpenVRML-0_16-BRANCH player.cpp Log Message: Made the GtkSocket id a required argument to openvrml-player rather than an option. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml-player/player.cpp,v retrieving revision 1.30 retrieving revision 1.30.2.1 diff -C2 -d -r1.30 -r1.30.2.1 *** player.cpp 4 Aug 2006 04:59:20 -0000 1.30 --- player.cpp 26 Sep 2006 12:52:09 -0000 1.30.2.1 *************** *** 19,23 **** --- 19,25 ---- // + # include <iostream> # include <sstream> + # include <boost/lexical_cast.hpp> # include <boost/thread/thread.hpp> # include <unistd.h> *************** *** 162,178 **** namespace { ! GdkNativeWindow socket_id; GOptionEntry options[] = { { ! "gtk-socket-id", ! 0, 0, ! G_OPTION_ARG_INT, ! &socket_id, ! "GtkSocket id", ! "GTK_SOCKET_ID" }, ! { 0, 0, 0, G_OPTION_ARG_NONE, 0, 0, 0 } }; --- 164,180 ---- namespace { ! gchar ** args; GOptionEntry options[] = { { ! G_OPTION_REMAINING, ! '\0', 0, ! G_OPTION_ARG_STRING_ARRAY, ! &args, ! "a GtkSocket id", ! "GTK-SOCKET-ID" }, ! { 0, '\0', 0, G_OPTION_ARG_NONE, 0, 0, 0 } }; *************** *** 256,259 **** --- 258,263 ---- int main(int argc, char * argv[]) { + using std::cerr; + using std::endl; using std::vector; using boost::function0; *************** *** 285,295 **** } command_istream command_in; ::request_channel = g_io_channel_unix_new(1); // stdout ! GtkWidget * window = socket_id ! ? gtk_plug_new(socket_id) ! : gtk_window_new(GTK_WINDOW_TOPLEVEL); GtkWidget * const vrml_browser = gtk_vrml_browser_new(::request_channel); --- 289,311 ---- } + if (!args) { + cerr << argv[0] << ": missing required GTK-SOCKET-ID argument" << endl; + return EXIT_FAILURE; + } + + GdkNativeWindow socket_id; + try { + socket_id = boost::lexical_cast<GdkNativeWindow>(args[0]); + } catch (const boost::bad_lexical_cast & ex) { + cerr << argv[0] << ": expected integer value for GTK-SOCKET-ID " + "argument" << endl; + return EXIT_FAILURE; + } + command_istream command_in; ::request_channel = g_io_channel_unix_new(1); // stdout ! GtkWidget * const window = gtk_plug_new(socket_id); GtkWidget * const vrml_browser = gtk_vrml_browser_new(::request_channel); *************** *** 305,354 **** GSource * command_watch = 0; ! if (argc > 1) { ! const gchar * url[] = { argv[1], 0 }; ! const gchar ** parameter = 0; ! gtk_vrml_browser_load_url(GTK_VRML_BROWSER(vrml_browser), ! url, ! parameter); ! } else { ! command_main_context = g_main_context_new(); ! command_main = g_main_loop_new(command_main_context, false); ! command_channel = g_io_channel_unix_new(0); // stdin ! GError * error = 0; ! GIOStatus status = g_io_channel_set_encoding(command_channel, ! 0, // binary (no encoding) ! &error); ! if (status != G_IO_STATUS_NORMAL) { ! if (error) { ! g_critical(error->message); ! g_error_free(error); ! } ! return EXIT_FAILURE; } ! command_watch = g_io_create_watch(command_channel, ! GIOCondition(G_IO_IN | G_IO_HUP)); ! const GDestroyNotify notify = 0; ! g_source_set_callback( ! command_watch, ! reinterpret_cast<GSourceFunc>(::command_data_available), ! static_cast<command_streambuf *>(command_in.rdbuf()), notify); ! guint source_id = g_source_attach(command_watch, ! command_main_context); ! g_return_val_if_fail(source_id != 0, EXIT_FAILURE); ! function0<void> command_channel_loop_func = ! command_channel_loop(*command_main); ! threads.create_thread(command_channel_loop_func); ! shared_ptr<plugin_streambuf> initial_stream( ! new plugin_streambuf(initial_stream_uri)); ! uninitialized_plugin_streambuf_map_.insert(initial_stream_uri, ! initial_stream); ! function0<void> initial_stream_reader_func = ! initial_stream_reader(initial_stream, ! *GTK_VRML_BROWSER(vrml_browser)); ! threads.create_thread(initial_stream_reader_func); ! } function0<void> read_commands = command_istream_reader(command_in); --- 321,362 ---- GSource * command_watch = 0; ! command_main_context = g_main_context_new(); ! command_main = g_main_loop_new(command_main_context, false); ! command_channel = g_io_channel_unix_new(0); // stdin ! error = 0; ! GIOStatus status = g_io_channel_set_encoding(command_channel, ! 0, // binary (no encoding) ! &error); ! if (status != G_IO_STATUS_NORMAL) { ! if (error) { ! g_critical(error->message); ! g_error_free(error); } + return EXIT_FAILURE; + } ! command_watch = g_io_create_watch(command_channel, ! GIOCondition(G_IO_IN | G_IO_HUP)); ! const GDestroyNotify notify = 0; ! g_source_set_callback( ! command_watch, ! reinterpret_cast<GSourceFunc>(::command_data_available), ! static_cast<command_streambuf *>(command_in.rdbuf()), notify); ! guint source_id = g_source_attach(command_watch, ! command_main_context); ! g_return_val_if_fail(source_id != 0, EXIT_FAILURE); ! function0<void> command_channel_loop_func = ! command_channel_loop(*command_main); ! threads.create_thread(command_channel_loop_func); ! shared_ptr<plugin_streambuf> initial_stream( ! new plugin_streambuf(initial_stream_uri)); ! uninitialized_plugin_streambuf_map_.insert(initial_stream_uri, ! initial_stream); ! function0<void> initial_stream_reader_func = ! initial_stream_reader(initial_stream, ! *GTK_VRML_BROWSER(vrml_browser)); ! threads.create_thread(initial_stream_reader_func); function0<void> read_commands = command_istream_reader(command_in); *************** *** 361,365 **** g_source_unref(command_watch); ! GIOStatus status = g_io_channel_shutdown(command_channel, true, &error); if (status != G_IO_STATUS_NORMAL) { if (error) { --- 369,373 ---- g_source_unref(command_watch); ! status = g_io_channel_shutdown(command_channel, true, &error); if (status != G_IO_STATUS_NORMAL) { if (error) { |
|
From: Braden M. <br...@us...> - 2006-09-26 12:52:13
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16035 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Made the GtkSocket id a required argument to openvrml-player rather than an option. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.18 retrieving revision 1.1310.2.19 diff -C2 -d -r1.1310.2.18 -r1.1310.2.19 *** ChangeLog 22 Sep 2006 22:22:48 -0000 1.1310.2.18 --- ChangeLog 26 Sep 2006 12:52:08 -0000 1.1310.2.19 *************** *** 1,2 **** --- 1,15 ---- + 2006-09-26 Braden McDaniel <br...@en...> + + Made the GtkSocket id a required argument to openvrml-player + rather than an option. + + * mozilla-plugin/src/openvrml.cpp + (PluginInstance::SetWindow(NPWindow &)): Add the socket id as an + argument rather than an option. + * mozilla-plugin/src/openvrml-player/player.cpp + (main(int, char *[])): No longer expect an optional URL argument; + instead, expect a required GtkSocket id argument (i.e., an + integer). + 2006-09-22 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2006-09-22 22:23:12
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/sdl-viewer In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv946/ide-projects/Windows/VisualC8_0/OpenVRML/sdl-viewer Modified Files: sdl-viewer.vcproj Log Message: Removed static library configurations from the Visual C++ project files. Index: sdl-viewer.vcproj =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/sdl-viewer/sdl-viewer.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** sdl-viewer.vcproj 19 May 2006 21:47:02 -0000 1.4 --- sdl-viewer.vcproj 22 Sep 2006 22:23:09 -0000 1.5 *************** *** 1,376 **** ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="8.00" ! Name="sdl-viewer" ! ProjectGUID="{2DD5D192-3E85-4E64-854B-DF7A1FF06B76}" ! Keyword="Win32Proj" ! > ! <Platforms> ! <Platform ! Name="Win32" ! /> ! </Platforms> ! <ToolFiles> ! </ToolFiles> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="Debug" ! IntermediateDirectory="Debug" ! ConfigurationType="1" ! CharacterSet="2" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCMIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml;"..\openvrml-gl";"..\..\..\..\..\src\libopenvrml-gl"" ! PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;OPENVRML_USE_LIB;OPENVRML_GL_USE_LIB" ! MinimalRebuild="true" ! BasicRuntimeChecks="0" ! RuntimeLibrary="2" ! TreatWChar_tAsBuiltInType="true" ! ForceConformanceInForLoopScope="true" ! RuntimeTypeInfo="true" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="true" ! DebugInformationFormat="4" ! DisableSpecificWarnings="4250;4290;4355" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="ws2_32.lib opengl32.lib glu32.lib SDLmain.lib SDL.lib" ! OutputFile="$(OutDir)/sdl-viewer.exe" ! LinkIncremental="2" ! GenerateDebugInformation="true" ! ProgramDatabaseFile="$(OutDir)/sdl-viewer.pdb" ! SubSystem="2" ! TargetMachine="1" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCManifestTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCAppVerifierTool" ! /> ! <Tool ! Name="VCWebDeploymentTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="Release" ! IntermediateDirectory="Release" ! ConfigurationType="1" ! CharacterSet="2" ! WholeProgramOptimization="1" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCMIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! AdditionalIncludeDirectories="..\..\..\..\..\src\libopenvrml;"..\..\..\..\..\src\libopenvrml-gl";..\openvrml;"..\openvrml-gl"" ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;OPENVRML_USE_LIB;OPENVRML_GL_USE_LIB" ! RuntimeLibrary="2" ! TreatWChar_tAsBuiltInType="true" ! ForceConformanceInForLoopScope="true" ! RuntimeTypeInfo="true" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="true" ! DebugInformationFormat="3" ! DisableSpecificWarnings="4226;4250;4290;4355;4800" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLinkerTool" ! OutputFile="$(OutDir)/sdl-viewer.exe" ! LinkIncremental="1" ! GenerateDebugInformation="true" ! SubSystem="2" ! OptimizeReferences="2" ! EnableCOMDATFolding="2" ! TargetMachine="1" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCManifestTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCAppVerifierTool" ! /> ! <Tool ! Name="VCWebDeploymentTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! <Configuration ! Name="Debug DLL|Win32" ! OutputDirectory="$(ConfigurationName)" ! IntermediateDirectory="$(ConfigurationName)" ! ConfigurationType="1" ! CharacterSet="2" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCMIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml;"..\openvrml-gl";"..\..\..\..\..\src\libopenvrml-gl"" ! PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL" ! MinimalRebuild="true" ! BasicRuntimeChecks="0" ! RuntimeLibrary="3" ! TreatWChar_tAsBuiltInType="true" ! ForceConformanceInForLoopScope="true" ! RuntimeTypeInfo="true" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="true" ! DebugInformationFormat="4" ! DisableSpecificWarnings="4250;4251;4275;4290;4355" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="ws2_32.lib opengl32.lib glu32.lib SDLmain.lib SDL.lib" ! OutputFile="$(OutDir)/sdl-viewer.exe" ! LinkIncremental="2" ! GenerateDebugInformation="true" ! ProgramDatabaseFile="$(OutDir)/sdl-viewer.pdb" ! SubSystem="2" ! TargetMachine="1" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCManifestTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCAppVerifierTool" ! /> ! <Tool ! Name="VCWebDeploymentTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! <Configuration ! Name="Release DLL|Win32" ! OutputDirectory="$(ConfigurationName)" ! IntermediateDirectory="$(ConfigurationName)" ! ConfigurationType="1" ! CharacterSet="2" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCMIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="3" ! WholeProgramOptimization="true" ! AdditionalIncludeDirectories="..\..\..\..\..\src\libopenvrml;"..\..\..\..\..\src\libopenvrml-gl";..\openvrml;"..\openvrml-gl"" ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL" ! RuntimeLibrary="2" ! TreatWChar_tAsBuiltInType="true" ! ForceConformanceInForLoopScope="true" ! RuntimeTypeInfo="true" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="true" ! DebugInformationFormat="3" ! DisableSpecificWarnings="4226;4250;4290;4355;4800" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLinkerTool" ! OutputFile="$(OutDir)/sdl-viewer.exe" ! LinkIncremental="1" ! GenerateDebugInformation="true" ! SubSystem="2" ! OptimizeReferences="2" ! EnableCOMDATFolding="2" ! LinkTimeCodeGeneration="1" ! TargetMachine="1" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCManifestTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCAppVerifierTool" ! /> ! <Tool ! Name="VCWebDeploymentTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! </Configurations> ! <References> ! </References> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" ! UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" ! > ! <File ! RelativePath="..\..\..\..\..\examples\sdl_viewer.cpp" ! > ! </File> ! </Filter> ! <Filter ! Name="Header Files" ! Filter="h;hpp;hxx;hm;inl;inc;xsd" ! UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" ! > ! </Filter> ! <Filter ! Name="Resource Files" ! Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" ! UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" ! > ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> --- 1,213 ---- ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="8.00" ! Name="sdl-viewer" ! ProjectGUID="{2DD5D192-3E85-4E64-854B-DF7A1FF06B76}" ! RootNamespace="sdl-viewer" ! Keyword="Win32Proj" ! > ! <Platforms> ! <Platform ! Name="Win32" ! /> ! </Platforms> ! <ToolFiles> ! </ToolFiles> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="$(ConfigurationName)" ! IntermediateDirectory="$(ConfigurationName)" ! ConfigurationType="1" ! CharacterSet="2" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCMIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml;"..\openvrml-gl";"..\..\..\..\..\src\libopenvrml-gl"" ! PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL" ! MinimalRebuild="true" ! BasicRuntimeChecks="0" ! RuntimeLibrary="3" ! TreatWChar_tAsBuiltInType="true" ! ForceConformanceInForLoopScope="true" ! RuntimeTypeInfo="true" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="true" ! DebugInformationFormat="4" ! DisableSpecificWarnings="4250;4251;4275;4290;4355" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="ws2_32.lib opengl32.lib glu32.lib SDLmain.lib SDL.lib" ! OutputFile="$(OutDir)/sdl-viewer.exe" ! LinkIncremental="2" ! GenerateDebugInformation="true" ! ProgramDatabaseFile="$(OutDir)/sdl-viewer.pdb" ! SubSystem="2" ! TargetMachine="1" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCManifestTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCAppVerifierTool" ! /> ! <Tool ! Name="VCWebDeploymentTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="$(ConfigurationName)" ! IntermediateDirectory="$(ConfigurationName)" ! ConfigurationType="1" ! CharacterSet="2" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCMIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="3" ! WholeProgramOptimization="true" ! AdditionalIncludeDirectories="..\..\..\..\..\src\libopenvrml;"..\..\..\..\..\src\libopenvrml-gl";..\openvrml;"..\openvrml-gl"" ! PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;OPENVRML_USE_DLL;OPENVRML_GL_USE_DLL" ! RuntimeLibrary="2" ! TreatWChar_tAsBuiltInType="true" ! ForceConformanceInForLoopScope="true" ! RuntimeTypeInfo="true" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="true" ! DebugInformationFormat="3" ! DisableSpecificWarnings="4226;4250;4290;4355;4800" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLinkerTool" ! OutputFile="$(OutDir)/sdl-viewer.exe" ! LinkIncremental="1" ! GenerateDebugInformation="true" ! SubSystem="2" ! OptimizeReferences="2" ! EnableCOMDATFolding="2" ! LinkTimeCodeGeneration="1" ! TargetMachine="1" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCManifestTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCAppVerifierTool" ! /> ! <Tool ! Name="VCWebDeploymentTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! </Configurations> ! <References> ! </References> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" ! UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" ! > ! <File ! RelativePath="..\..\..\..\..\examples\sdl_viewer.cpp" ! > ! </File> ! </Filter> ! <Filter ! Name="Header Files" ! Filter="h;hpp;hxx;hm;inl;inc;xsd" ! UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" ! > ! </Filter> ! <Filter ! Name="Resource Files" ! Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" ! UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" ! > ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> |
|
From: Braden M. <br...@us...> - 2006-09-22 22:23:12
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv946/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl Modified Files: openvrml-gl.vcproj Log Message: Removed static library configurations from the Visual C++ project files. Index: openvrml-gl.vcproj =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** openvrml-gl.vcproj 28 Aug 2006 20:15:42 -0000 1.5 --- openvrml-gl.vcproj 22 Sep 2006 22:23:09 -0000 1.6 *************** *** 1,362 **** ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="8.00" ! Name="openvrml-gl" ! ProjectGUID="{141F90C2-6630-4D7A-834F-D5D57C6CFC24}" ! RootNamespace="openvrml-gl" ! Keyword="Win32Proj" ! > ! <Platforms> ! <Platform ! Name="Win32" ! /> ! </Platforms> ! <ToolFiles> ! </ToolFiles> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="$(ConfigurationName)" ! IntermediateDirectory="$(OutDir)" ! ConfigurationType="4" ! CharacterSet="2" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCMIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! AdditionalIncludeDirectories=".;"..\..\..\..\..\src\libopenvrml-gl";..\openvrml;..\..\..\..\..\src\libopenvrml" ! PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_WINDOWS_H;OPENVRML_USE_LIB;OPENVRML_GL_BUILD_LIB" ! MinimalRebuild="true" ! BasicRuntimeChecks="0" ! RuntimeLibrary="2" ! TreatWChar_tAsBuiltInType="true" ! ForceConformanceInForLoopScope="true" ! RuntimeTypeInfo="true" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="true" ! DebugInformationFormat="4" ! DisableSpecificWarnings="4099;4250;4290;4800" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! AdditionalIncludeDirectories="..\..\..\..\..\src\libopenvrml" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLibrarianTool" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="$(ConfigurationName)" ! IntermediateDirectory="$(OutDir)" ! ConfigurationType="4" ! CharacterSet="2" ! WholeProgramOptimization="1" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCMIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="2" ! InlineFunctionExpansion="1" ! OmitFramePointers="true" ! AdditionalIncludeDirectories=""..\..\..\..\..\src\libopenvrml-gl";..\..\..\..\..\src\libopenvrml;..\openvrml;." ! PreprocessorDefinitions="WIN32;NDEBUG;HAVE_WINDOWS_H;OPENVRML_GL_BUILD_LIB;OPENVRML_USE_LIB" ! StringPooling="true" ! RuntimeLibrary="2" ! EnableFunctionLevelLinking="true" ! TreatWChar_tAsBuiltInType="true" ! ForceConformanceInForLoopScope="true" ! RuntimeTypeInfo="true" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="true" ! DebugInformationFormat="3" ! DisableSpecificWarnings="4099;4250;4290;4800" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLibrarianTool" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! <Configuration ! Name="Debug DLL|Win32" ! OutputDirectory="$(ConfigurationName)" ! IntermediateDirectory="$(ConfigurationName)" ! ConfigurationType="2" ! CharacterSet="2" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCMIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! AdditionalIncludeDirectories=".;"..\..\..\..\..\src\libopenvrml-gl";..\openvrml;..\..\..\..\..\src\libopenvrml" ! PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_WINDOWS_H;OPENVRML_USE_DLL;OPENVRML_GL_BUILD_DLL" ! MinimalRebuild="true" ! BasicRuntimeChecks="0" ! RuntimeLibrary="3" ! TreatWChar_tAsBuiltInType="true" ! ForceConformanceInForLoopScope="true" ! RuntimeTypeInfo="true" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="true" ! DebugInformationFormat="4" ! DisableSpecificWarnings="4099;4250;4251;4275;4290;4800" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! AdditionalIncludeDirectories="..\..\..\..\..\src\libopenvrml" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="GlU32.lib OpenGL32.lib" ! GenerateDebugInformation="true" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCManifestTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCAppVerifierTool" ! /> ! <Tool ! Name="VCWebDeploymentTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! <Configuration ! Name="Release DLL|Win32" ! OutputDirectory="$(ConfigurationName)" ! IntermediateDirectory="$(ConfigurationName)" ! ConfigurationType="2" ! CharacterSet="2" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCMIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="3" ! InlineFunctionExpansion="1" ! OmitFramePointers="true" ! WholeProgramOptimization="true" ! AdditionalIncludeDirectories=""..\..\..\..\..\src\libopenvrml-gl";..\..\..\..\..\src\libopenvrml;..\openvrml;." ! PreprocessorDefinitions="WIN32;NDEBUG;HAVE_WINDOWS_H;OPENVRML_GL_BUILD_DLL;OPENVRML_USE_DLL" ! StringPooling="true" ! RuntimeLibrary="2" ! EnableFunctionLevelLinking="true" ! TreatWChar_tAsBuiltInType="true" ! ForceConformanceInForLoopScope="true" ! RuntimeTypeInfo="true" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="true" ! DebugInformationFormat="3" ! DisableSpecificWarnings="4099;4250;4251;4290;4800" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="GlU32.lib OpenGL32.lib" ! LinkTimeCodeGeneration="1" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCManifestTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCAppVerifierTool" ! /> ! <Tool ! Name="VCWebDeploymentTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! </Configurations> ! <References> ! </References> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" ! > ! <File ! RelativePath="..\..\..\..\..\src\libopenvrml-gl\openvrml\gl\viewer.cpp" ! > ! </File> ! </Filter> ! <Filter ! Name="Header Files" ! Filter="h;hpp;hxx;hm;inl;inc" ! > ! <File ! RelativePath="..\..\..\..\..\src\libopenvrml-gl\openvrml-gl-common.h" ! > ! </File> ! <File ! RelativePath=".\openvrml-gl-config.h" ! > ! </File> ! <File ! RelativePath=".\resource.h" ! > ! </File> ! <File ! RelativePath="..\..\..\..\..\src\libopenvrml-gl\openvrml\gl\viewer.h" ! > ! </File> ! </Filter> ! <Filter ! Name="Resource Files" ! Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" ! > ! <File ! RelativePath=".\openvrml-gl.rc" ! > ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> --- 1,224 ---- ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="8.00" ! Name="openvrml-gl" ! ProjectGUID="{141F90C2-6630-4D7A-834F-D5D57C6CFC24}" ! RootNamespace="openvrml-gl" ! Keyword="Win32Proj" ! > ! <Platforms> ! <Platform ! Name="Win32" ! /> ! </Platforms> ! <ToolFiles> ! </ToolFiles> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="$(ConfigurationName)" ! IntermediateDirectory="$(ConfigurationName)" ! ConfigurationType="2" ! CharacterSet="2" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCMIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! AdditionalIncludeDirectories=".;"..\..\..\..\..\src\libopenvrml-gl";..\openvrml;..\..\..\..\..\src\libopenvrml" ! PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_WINDOWS_H;OPENVRML_USE_DLL;OPENVRML_GL_BUILD_DLL" ! MinimalRebuild="true" ! BasicRuntimeChecks="0" ! RuntimeLibrary="3" ! TreatWChar_tAsBuiltInType="true" ! ForceConformanceInForLoopScope="true" ! RuntimeTypeInfo="true" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="true" ! DebugInformationFormat="4" ! DisableSpecificWarnings="4099;4250;4251;4275;4290;4800" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! AdditionalIncludeDirectories="..\..\..\..\..\src\libopenvrml" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="GlU32.lib OpenGL32.lib" ! GenerateDebugInformation="true" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCManifestTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCAppVerifierTool" ! /> ! <Tool ! Name="VCWebDeploymentTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="$(ConfigurationName)" ! IntermediateDirectory="$(ConfigurationName)" ! ConfigurationType="2" ! CharacterSet="2" ! > ! <Tool ! Name="VCPreBuildEventTool" ! /> ! <Tool ! Name="VCCustomBuildTool" ! /> ! <Tool ! Name="VCXMLDataGeneratorTool" ! /> ! <Tool ! Name="VCWebServiceProxyGeneratorTool" ! /> ! <Tool ! Name="VCMIDLTool" ! /> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="3" ! InlineFunctionExpansion="1" ! OmitFramePointers="true" ! WholeProgramOptimization="true" ! AdditionalIncludeDirectories=""..\..\..\..\..\src\libopenvrml-gl";..\..\..\..\..\src\libopenvrml;..\openvrml;." ! PreprocessorDefinitions="WIN32;NDEBUG;HAVE_WINDOWS_H;OPENVRML_GL_BUILD_DLL;OPENVRML_USE_DLL" ! StringPooling="true" ! RuntimeLibrary="2" ! EnableFunctionLevelLinking="true" ! TreatWChar_tAsBuiltInType="true" ! ForceConformanceInForLoopScope="true" ! RuntimeTypeInfo="true" ! UsePrecompiledHeader="0" ! WarningLevel="3" ! Detect64BitPortabilityProblems="true" ! DebugInformationFormat="3" ! DisableSpecificWarnings="4099;4250;4251;4290;4800" ! /> ! <Tool ! Name="VCManagedResourceCompilerTool" ! /> ! <Tool ! Name="VCResourceCompilerTool" ! /> ! <Tool ! Name="VCPreLinkEventTool" ! /> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="GlU32.lib OpenGL32.lib" ! LinkTimeCodeGeneration="1" ! /> ! <Tool ! Name="VCALinkTool" ! /> ! <Tool ! Name="VCManifestTool" ! /> ! <Tool ! Name="VCXDCMakeTool" ! /> ! <Tool ! Name="VCBscMakeTool" ! /> ! <Tool ! Name="VCFxCopTool" ! /> ! <Tool ! Name="VCAppVerifierTool" ! /> ! <Tool ! Name="VCWebDeploymentTool" ! /> ! <Tool ! Name="VCPostBuildEventTool" ! /> ! </Configuration> ! </Configurations> ! <References> ! </References> ! <Files> ! <Filter ! Name="Source Files" ! Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" ! > ! <File ! RelativePath="..\..\..\..\..\src\libopenvrml-gl\openvrml\gl\viewer.cpp" ! > ! </File> ! </Filter> ! <Filter ! Name="Header Files" ! Filter="h;hpp;hxx;hm;inl;inc" ! > ! <File ! RelativePath="..\..\..\..\..\src\libopenvrml-gl\openvrml-gl-common.h" ! > ! </File> ! <File ! RelativePath=".\openvrml-gl-config.h" ! > ! </File> ! <File ! RelativePath=".\resource.h" ! > ! </File> ! <File ! RelativePath="..\..\..\..\..\src\libopenvrml-gl\openvrml\gl\viewer.h" ! > ! </File> ! </Filter> ! <Filter ! Name="Resource Files" ! Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" ! > ! <File ! RelativePath=".\openvrml-gl.rc" ! > ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> |
|
From: Braden M. <br...@us...> - 2006-09-22 22:23:11
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv946/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml Modified Files: openvrml.vcproj Log Message: Removed static library configurations from the Visual C++ project files. Index: openvrml.vcproj =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/openvrml.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** openvrml.vcproj 28 Aug 2006 20:15:42 -0000 1.5 --- openvrml.vcproj 22 Sep 2006 22:23:09 -0000 1.6 *************** *** 1,706 **** ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="8.00" ! Name="openvrml" ! ProjectGUID="{E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}" ! RootNamespace="openvrml" ! Keyword="Win32Proj" ! > ! <Platforms> [...1207 lines suppressed...] ! </File> ! </Filter> ! <Filter ! Name="ANTLR Grammar Files" ! Filter="g" ! ParseFiles="false" ! > ! <File ! RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\Vrml97Parser.g" ! > ! </File> ! <File ! RelativePath="..\..\..\..\..\src\libopenvrml\openvrml\X3DVrmlParser.g" ! > ! </File> ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> |
|
From: Braden M. <br...@us...> - 2006-09-22 22:23:11
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv946/ide-projects/Windows/VisualC8_0/OpenVRML Modified Files: OpenVRML.sln Log Message: Removed static library configurations from the Visual C++ project files. Index: OpenVRML.sln =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/OpenVRML.sln,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OpenVRML.sln 28 Aug 2006 20:15:42 -0000 1.2 --- OpenVRML.sln 22 Sep 2006 22:23:09 -0000 1.3 *************** *** 1,78 **** ! Microsoft Visual Studio Solution File, Format Version 9.00 ! # Visual Studio 2005 ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openvrml", "openvrml\openvrml.vcproj", "{E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}" ! ProjectSection(ProjectDependencies) = postProject ! {ED407BF6-F8A1-4C7E-9952-E5454896AC63} = {ED407BF6-F8A1-4C7E-9952-E5454896AC63} ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "antlr", "antlr\antlr.vcproj", "{ED407BF6-F8A1-4C7E-9952-E5454896AC63}" ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openvrml-gl", "openvrml-gl\openvrml-gl.vcproj", "{141F90C2-6630-4D7A-834F-D5D57C6CFC24}" ! ProjectSection(ProjectDependencies) = postProject ! {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C} = {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C} ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdl-viewer", "sdl-viewer\sdl-viewer.vcproj", "{2DD5D192-3E85-4E64-854B-DF7A1FF06B76}" ! ProjectSection(ProjectDependencies) = postProject ! {141F90C2-6630-4D7A-834F-D5D57C6CFC24} = {141F90C2-6630-4D7A-834F-D5D57C6CFC24} ! {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C} = {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C} ! {ED407BF6-F8A1-4C7E-9952-E5454896AC63} = {ED407BF6-F8A1-4C7E-9952-E5454896AC63} ! EndProjectSection ! EndProject ! Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0961B1CF-A5CE-47BF-AC8B-CFC8AB30B5DA}" ! ProjectSection(SolutionItems) = preProject ! ..\..\..\..\AUTHORS = ..\..\..\..\AUTHORS ! ..\..\..\..\ChangeLog = ..\..\..\..\ChangeLog ! ..\..\..\..\COPYING = ..\..\..\..\COPYING ! ..\..\..\..\COPYING.LESSER = ..\..\..\..\COPYING.LESSER ! ..\..\..\..\INSTALL = ..\..\..\..\INSTALL ! ..\..\..\..\NEWS = ..\..\..\..\NEWS ! ..\..\..\..\README = ..\..\..\..\README ! ..\..\..\..\THANKS = ..\..\..\..\THANKS ! EndProjectSection ! EndProject ! Global ! GlobalSection(SolutionConfigurationPlatforms) = preSolution ! Debug DLL|Win32 = Debug DLL|Win32 ! Debug|Win32 = Debug|Win32 ! Release DLL|Win32 = Release DLL|Win32 ! Release|Win32 = Release|Win32 ! EndGlobalSection ! GlobalSection(ProjectConfigurationPlatforms) = postSolution ! {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Debug DLL|Win32.ActiveCfg = Debug DLL|Win32 ! {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Debug DLL|Win32.Build.0 = Debug DLL|Win32 ! {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Debug|Win32.ActiveCfg = Debug|Win32 ! {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Debug|Win32.Build.0 = Debug|Win32 ! {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Release DLL|Win32.ActiveCfg = Release DLL|Win32 ! {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Release DLL|Win32.Build.0 = Release DLL|Win32 ! {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Release|Win32.ActiveCfg = Release|Win32 ! {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Release|Win32.Build.0 = Release|Win32 ! {ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Debug DLL|Win32.ActiveCfg = Debug DLL|Win32 ! {ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Debug DLL|Win32.Build.0 = Debug DLL|Win32 ! {ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Debug|Win32.ActiveCfg = Debug|Win32 ! {ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Debug|Win32.Build.0 = Debug|Win32 ! {ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Release DLL|Win32.ActiveCfg = Release DLL|Win32 ! {ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Release DLL|Win32.Build.0 = Release DLL|Win32 ! {ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Release|Win32.ActiveCfg = Release|Win32 ! {ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Release|Win32.Build.0 = Release|Win32 ! {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Debug DLL|Win32.ActiveCfg = Debug DLL|Win32 ! {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Debug DLL|Win32.Build.0 = Debug DLL|Win32 ! {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Debug|Win32.ActiveCfg = Debug|Win32 ! {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Debug|Win32.Build.0 = Debug|Win32 ! {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Release DLL|Win32.ActiveCfg = Release DLL|Win32 ! {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Release DLL|Win32.Build.0 = Release DLL|Win32 ! {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Release|Win32.ActiveCfg = Release|Win32 ! {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Release|Win32.Build.0 = Release|Win32 ! {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Debug DLL|Win32.ActiveCfg = Debug DLL|Win32 ! {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Debug DLL|Win32.Build.0 = Debug DLL|Win32 ! {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Debug|Win32.ActiveCfg = Debug|Win32 ! {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Debug|Win32.Build.0 = Debug|Win32 ! {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Release DLL|Win32.ActiveCfg = Release DLL|Win32 ! {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Release DLL|Win32.Build.0 = Release DLL|Win32 ! {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Release|Win32.ActiveCfg = Release|Win32 ! {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Release|Win32.Build.0 = Release|Win32 ! EndGlobalSection ! GlobalSection(SolutionProperties) = preSolution ! HideSolutionNode = FALSE ! EndGlobalSection ! EndGlobal --- 1,60 ---- ! Microsoft Visual Studio Solution File, Format Version 9.00 ! # Visual Studio 2005 ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openvrml", "openvrml\openvrml.vcproj", "{E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}" ! ProjectSection(ProjectDependencies) = postProject ! {ED407BF6-F8A1-4C7E-9952-E5454896AC63} = {ED407BF6-F8A1-4C7E-9952-E5454896AC63} ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "antlr", "antlr\antlr.vcproj", "{ED407BF6-F8A1-4C7E-9952-E5454896AC63}" ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openvrml-gl", "openvrml-gl\openvrml-gl.vcproj", "{141F90C2-6630-4D7A-834F-D5D57C6CFC24}" ! ProjectSection(ProjectDependencies) = postProject ! {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C} = {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C} ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdl-viewer", "sdl-viewer\sdl-viewer.vcproj", "{2DD5D192-3E85-4E64-854B-DF7A1FF06B76}" ! ProjectSection(ProjectDependencies) = postProject ! {141F90C2-6630-4D7A-834F-D5D57C6CFC24} = {141F90C2-6630-4D7A-834F-D5D57C6CFC24} ! {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C} = {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C} ! {ED407BF6-F8A1-4C7E-9952-E5454896AC63} = {ED407BF6-F8A1-4C7E-9952-E5454896AC63} ! EndProjectSection ! EndProject ! Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0961B1CF-A5CE-47BF-AC8B-CFC8AB30B5DA}" ! ProjectSection(SolutionItems) = preProject ! ..\..\..\..\AUTHORS = ..\..\..\..\AUTHORS ! ..\..\..\..\ChangeLog = ..\..\..\..\ChangeLog ! ..\..\..\..\COPYING = ..\..\..\..\COPYING ! ..\..\..\..\COPYING.LESSER = ..\..\..\..\COPYING.LESSER ! ..\..\..\..\INSTALL = ..\..\..\..\INSTALL ! ..\..\..\..\NEWS = ..\..\..\..\NEWS ! ..\..\..\..\README = ..\..\..\..\README ! ..\..\..\..\THANKS = ..\..\..\..\THANKS ! EndProjectSection ! EndProject ! Global ! GlobalSection(SolutionConfigurationPlatforms) = preSolution ! Debug|Win32 = Debug|Win32 ! Release|Win32 = Release|Win32 ! EndGlobalSection ! GlobalSection(ProjectConfigurationPlatforms) = postSolution ! {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Debug|Win32.ActiveCfg = Debug|Win32 ! {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Debug|Win32.Build.0 = Debug|Win32 ! {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Release|Win32.ActiveCfg = Release|Win32 ! {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Release|Win32.Build.0 = Release|Win32 ! {ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Debug|Win32.ActiveCfg = Debug|Win32 ! {ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Debug|Win32.Build.0 = Debug|Win32 ! {ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Release|Win32.ActiveCfg = Release|Win32 ! {ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Release|Win32.Build.0 = Release|Win32 ! {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Debug|Win32.ActiveCfg = Debug|Win32 ! {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Debug|Win32.Build.0 = Debug|Win32 ! {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Release|Win32.ActiveCfg = Release|Win32 ! {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Release|Win32.Build.0 = Release|Win32 ! {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Debug|Win32.ActiveCfg = Debug|Win32 ! {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Debug|Win32.Build.0 = Debug|Win32 ! {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Release|Win32.ActiveCfg = Release|Win32 ! {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Release|Win32.Build.0 = Release|Win32 ! EndGlobalSection ! GlobalSection(SolutionProperties) = preSolution ! HideSolutionNode = FALSE ! EndGlobalSection ! EndGlobal |
|
From: Braden M. <br...@us...> - 2006-09-22 22:23:11
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv946 Modified Files: ChangeLog Log Message: Removed static library configurations from the Visual C++ project files. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1332 retrieving revision 1.1333 diff -C2 -d -r1.1332 -r1.1333 *** ChangeLog 22 Sep 2006 01:12:00 -0000 1.1332 --- ChangeLog 22 Sep 2006 22:23:09 -0000 1.1333 *************** *** 1,2 **** --- 1,13 ---- + 2006-09-22 Braden McDaniel <br...@en...> + + Removed static library configurations from the Visual C++ project + files. + + * ide-projects/Windows/VisualC8_0/OpenVRML/OpenVRML.sln + * ide-projects/Windows/VisualC8_0/OpenVRML/antlr/antlr.vcproj + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/openvrml.vcproj + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj + * ide-projects/Windows/VisualC8_0/OpenVRML/sdl-viewer/sdl-viewer.vcproj + 2006-09-21 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2006-09-22 22:23:11
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/antlr In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv946/ide-projects/Windows/VisualC8_0/OpenVRML/antlr Modified Files: antlr.vcproj Log Message: Removed static library configurations from the Visual C++ project files. Index: antlr.vcproj =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/antlr/antlr.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** antlr.vcproj 21 Feb 2006 23:01:02 -0000 1.3 --- antlr.vcproj 22 Sep 2006 22:23:09 -0000 1.4 *************** *** 1,606 **** ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="8.00" ! Name="antlr" ! ProjectGUID="{ED407BF6-F8A1-4C7E-9952-E5454896AC63}" ! RootNamespace="antlr" ! Keyword="Win32Proj" ! > ! <Platforms> [...1048 lines suppressed...] ! > ! </File> ! <File ! RelativePath="..\..\..\..\..\lib\antlr\antlr\TreeParser.hpp" ! > ! </File> ! <File ! RelativePath="..\..\..\..\..\lib\antlr\antlr\TreeParserSharedInputState.hpp" ! > ! </File> ! </Filter> ! <Filter ! Name="Resource Files" ! Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" ! > ! </Filter> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> |
|
From: Braden M. <br...@us...> - 2006-09-22 22:22:51
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/antlr In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv543/ide-projects/Windows/VisualC8_0/OpenVRML/antlr Modified Files: Tag: OpenVRML-0_16-BRANCH antlr.vcproj Log Message: Removed static library configurations from the Visual C++ project files. Index: antlr.vcproj =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/antlr/antlr.vcproj,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** antlr.vcproj 21 Feb 2006 23:01:02 -0000 1.3 --- antlr.vcproj 22 Sep 2006 22:22:48 -0000 1.3.2.1 *************** *** 19,157 **** Name="Debug|Win32" OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(OutDir)" - ConfigurationType="4" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\..\lib\antlr" - MinimalRebuild="true" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - TreatWChar_tAsBuiltInType="true" - ForceConformanceInForLoopScope="true" - RuntimeTypeInfo="true" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" - DisableSpecificWarnings="4231;4355" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(OutDir)" - ConfigurationType="4" - CharacterSet="2" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - OmitFramePointers="true" - AdditionalIncludeDirectories="..\..\..\..\..\lib\antlr" - PreprocessorDefinitions="NDEBUG" - StringPooling="true" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - TreatWChar_tAsBuiltInType="true" - ForceConformanceInForLoopScope="true" - RuntimeTypeInfo="true" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Debug DLL|Win32" - OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" --- 19,22 ---- *************** *** 218,222 **** </Configuration> <Configuration ! Name="Release DLL|Win32" OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" --- 83,87 ---- </Configuration> <Configuration ! Name="Release|Win32" OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" |
|
From: Braden M. <br...@us...> - 2006-09-22 22:22:51
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv543/ide-projects/Windows/VisualC8_0/OpenVRML Modified Files: Tag: OpenVRML-0_16-BRANCH OpenVRML.sln Log Message: Removed static library configurations from the Visual C++ project files. Index: OpenVRML.sln =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/OpenVRML.sln,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** OpenVRML.sln 28 Aug 2006 20:04:34 -0000 1.1.2.1 --- OpenVRML.sln 22 Sep 2006 22:22:48 -0000 1.1.2.2 *************** *** 34,73 **** Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug DLL|Win32 = Debug DLL|Win32 Debug|Win32 = Debug|Win32 - Release DLL|Win32 = Release DLL|Win32 Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Debug DLL|Win32.ActiveCfg = Debug DLL|Win32 - {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Debug DLL|Win32.Build.0 = Debug DLL|Win32 {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Debug|Win32.ActiveCfg = Debug|Win32 {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Debug|Win32.Build.0 = Debug|Win32 - {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Release DLL|Win32.ActiveCfg = Release DLL|Win32 - {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Release DLL|Win32.Build.0 = Release DLL|Win32 {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Release|Win32.ActiveCfg = Release|Win32 {E5287CD2-4BAC-4341-AF28-A1F9C0F5949C}.Release|Win32.Build.0 = Release|Win32 - {ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Debug DLL|Win32.ActiveCfg = Debug DLL|Win32 - {ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Debug DLL|Win32.Build.0 = Debug DLL|Win32 {ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Debug|Win32.ActiveCfg = Debug|Win32 {ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Debug|Win32.Build.0 = Debug|Win32 - {ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Release DLL|Win32.ActiveCfg = Release DLL|Win32 - {ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Release DLL|Win32.Build.0 = Release DLL|Win32 {ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Release|Win32.ActiveCfg = Release|Win32 {ED407BF6-F8A1-4C7E-9952-E5454896AC63}.Release|Win32.Build.0 = Release|Win32 - {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Debug DLL|Win32.ActiveCfg = Debug DLL|Win32 - {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Debug DLL|Win32.Build.0 = Debug DLL|Win32 {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Debug|Win32.ActiveCfg = Debug|Win32 {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Debug|Win32.Build.0 = Debug|Win32 - {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Release DLL|Win32.ActiveCfg = Release DLL|Win32 - {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Release DLL|Win32.Build.0 = Release DLL|Win32 {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Release|Win32.ActiveCfg = Release|Win32 {141F90C2-6630-4D7A-834F-D5D57C6CFC24}.Release|Win32.Build.0 = Release|Win32 - {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Debug DLL|Win32.ActiveCfg = Debug DLL|Win32 - {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Debug DLL|Win32.Build.0 = Debug DLL|Win32 {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Debug|Win32.ActiveCfg = Debug|Win32 {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Debug|Win32.Build.0 = Debug|Win32 - {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Release DLL|Win32.ActiveCfg = Release DLL|Win32 - {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Release DLL|Win32.Build.0 = Release DLL|Win32 {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Release|Win32.ActiveCfg = Release|Win32 {2DD5D192-3E85-4E64-854B-DF7A1FF06B76}.Release|Win32.Build.0 = Release|Win32 --- 34,55 ---- |
|
From: Braden M. <br...@us...> - 2006-09-22 22:22:51
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv543/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml Modified Files: Tag: OpenVRML-0_16-BRANCH openvrml.vcproj Log Message: Removed static library configurations from the Visual C++ project files. Index: openvrml.vcproj =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/openvrml.vcproj,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** openvrml.vcproj 28 Aug 2006 20:04:34 -0000 1.4.2.1 --- openvrml.vcproj 22 Sep 2006 22:22:49 -0000 1.4.2.2 *************** *** 19,163 **** Name="Debug|Win32" OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(OutDir)" - ConfigurationType="4" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/Zm400" - Optimization="0" - AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr" - PreprocessorDefinitions="WIN32;NOMINMAX;BOOST_SPIRIT_THREADSAFE;PACKAGE_VERSION=\"0.15.99\";OPENVRML_BUILD_LIB;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30" - MinimalRebuild="true" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - TreatWChar_tAsBuiltInType="true" - ForceConformanceInForLoopScope="true" - RuntimeTypeInfo="true" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" - DisableSpecificWarnings="4226;4250;4290;4355;4800" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="C:\cygwin\home\bmcdaniel\src\openvrml\openvrml\src\openvrml" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(OutDir)" - ConfigurationType="4" - CharacterSet="2" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/Zm400" - Optimization="2" - InlineFunctionExpansion="1" - OmitFramePointers="true" - AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr" - PreprocessorDefinitions="WIN32;NOMINMAX;BOOST_SPIRIT_THREADSAFE;NDEBUG;PACKAGE_VERSION=\"0.15.99\";OPENVRML_BUILD_LIB;BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30" - StringPooling="true" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - TreatWChar_tAsBuiltInType="true" - ForceConformanceInForLoopScope="true" - RuntimeTypeInfo="true" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - DisableSpecificWarnings="4226;4250;4290;4355;4800" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="C:\cygwin\home\bmcdaniel\src\openvrml\openvrml\src\openvrml" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Debug DLL|Win32" - OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" --- 19,22 ---- *************** *** 237,241 **** </Configuration> <Configuration ! Name="Release DLL|Win32" OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" --- 96,100 ---- </Configuration> <Configuration ! Name="Release|Win32" OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" *************** *** 337,348 **** /> </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - DisableSpecificWarnings="4996" - /> - </FileConfiguration> </File> <File --- 196,199 ---- *************** *** 361,372 **** /> </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - DisableSpecificWarnings="4355" - /> - </FileConfiguration> </File> <File --- 212,215 ---- *************** *** 436,458 **** /> </FileConfiguration> - <FileConfiguration - Name="Debug DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/bigobj" - MinimalRebuild="false" - DebugInformationFormat="1" - /> - </FileConfiguration> - <FileConfiguration - Name="Release DLL|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - EnableFunctionLevelLinking="false" - /> - </FileConfiguration> </File> <File --- 279,282 ---- |
|
From: Braden M. <br...@us...> - 2006-09-22 22:22:51
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv543/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl Modified Files: Tag: OpenVRML-0_16-BRANCH openvrml-gl.vcproj Log Message: Removed static library configurations from the Visual C++ project files. Index: openvrml-gl.vcproj =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** openvrml-gl.vcproj 28 Aug 2006 20:04:35 -0000 1.4.2.1 --- openvrml-gl.vcproj 22 Sep 2006 22:22:49 -0000 1.4.2.2 *************** *** 19,160 **** Name="Debug|Win32" OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(OutDir)" - ConfigurationType="4" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=".;"..\..\..\..\..\src\libopenvrml-gl";..\openvrml;..\..\..\..\..\src\libopenvrml" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_WINDOWS_H;OPENVRML_USE_LIB;OPENVRML_GL_BUILD_LIB" - MinimalRebuild="true" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - TreatWChar_tAsBuiltInType="true" - ForceConformanceInForLoopScope="true" - RuntimeTypeInfo="true" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" - DisableSpecificWarnings="4099;4250;4290;4800" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="..\..\..\..\..\src\libopenvrml" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(OutDir)" - ConfigurationType="4" - CharacterSet="2" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - OmitFramePointers="true" - AdditionalIncludeDirectories=""..\..\..\..\..\src\libopenvrml-gl";..\..\..\..\..\src\libopenvrml;..\openvrml;." - PreprocessorDefinitions="WIN32;NDEBUG;HAVE_WINDOWS_H;OPENVRML_GL_BUILD_LIB;OPENVRML_USE_LIB" - StringPooling="true" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - TreatWChar_tAsBuiltInType="true" - ForceConformanceInForLoopScope="true" - RuntimeTypeInfo="true" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - DisableSpecificWarnings="4099;4250;4290;4800" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Debug DLL|Win32" - OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" --- 19,22 ---- *************** *** 234,238 **** </Configuration> <Configuration ! Name="Release DLL|Win32" OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" --- 96,100 ---- </Configuration> <Configuration ! Name="Release|Win32" OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" |
|
From: Braden M. <br...@us...> - 2006-09-22 22:22:51
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv543 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Removed static library configurations from the Visual C++ project files. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.17 retrieving revision 1.1310.2.18 diff -C2 -d -r1.1310.2.17 -r1.1310.2.18 *** ChangeLog 22 Sep 2006 01:11:08 -0000 1.1310.2.17 --- ChangeLog 22 Sep 2006 22:22:48 -0000 1.1310.2.18 *************** *** 1,2 **** --- 1,13 ---- + 2006-09-22 Braden McDaniel <br...@en...> + + Removed static library configurations from the Visual C++ project + files. + + * ide-projects/Windows/VisualC8_0/OpenVRML/OpenVRML.sln + * ide-projects/Windows/VisualC8_0/OpenVRML/antlr/antlr.vcproj + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/openvrml.vcproj + * ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl/openvrml-gl.vcproj + * ide-projects/Windows/VisualC8_0/OpenVRML/sdl-viewer/sdl-viewer.vcproj + 2006-09-21 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2006-09-22 22:22:51
|
Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/sdl-viewer In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv543/ide-projects/Windows/VisualC8_0/OpenVRML/sdl-viewer Modified Files: Tag: OpenVRML-0_16-BRANCH sdl-viewer.vcproj Log Message: Removed static library configurations from the Visual C++ project files. Index: sdl-viewer.vcproj =================================================================== RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/sdl-viewer/sdl-viewer.vcproj,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** sdl-viewer.vcproj 19 May 2006 21:47:02 -0000 1.4 --- sdl-viewer.vcproj 22 Sep 2006 22:22:49 -0000 1.4.2.1 *************** *** 5,8 **** --- 5,9 ---- Name="sdl-viewer" ProjectGUID="{2DD5D192-3E85-4E64-854B-DF7A1FF06B76}" + RootNamespace="sdl-viewer" Keyword="Win32Proj" > *************** *** 17,184 **** <Configuration Name="Debug|Win32" - OutputDirectory="Debug" - IntermediateDirectory="Debug" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\openvrml;..\..\..\..\..\src\libopenvrml;"..\openvrml-gl";"..\..\..\..\..\src\libopenvrml-gl"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;OPENVRML_USE_LIB;OPENVRML_GL_USE_LIB" - MinimalRebuild="true" - BasicRuntimeChecks="0" - RuntimeLibrary="2" - TreatWChar_tAsBuiltInType="true" - ForceConformanceInForLoopScope="true" - RuntimeTypeInfo="true" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" - DisableSpecificWarnings="4250;4290;4355" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="ws2_32.lib opengl32.lib glu32.lib SDLmain.lib SDL.lib" - OutputFile="$(OutDir)/sdl-viewer.exe" - LinkIncremental="2" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/sdl-viewer.pdb" - SubSystem="2" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="Release" - IntermediateDirectory="Release" - ConfigurationType="1" - CharacterSet="2" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\..\..\src\libopenvrml;"..\..\..\..\..\src\libopenvrml-gl";..\openvrml;"..\openvrml-gl"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;OPENVRML_USE_LIB;OPENVRML_GL_USE_LIB" - RuntimeLibrary="2" - TreatWChar_tAsBuiltInType="true" - ForceConformanceInForLoopScope="true" - RuntimeTypeInfo="true" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - DisableSpecificWarnings="4226;4250;4290;4355;4800" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - OutputFile="$(OutDir)/sdl-viewer.exe" - LinkIncremental="1" - GenerateDebugInformation="true" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Debug DLL|Win32" OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" --- 18,21 ---- *************** *** 263,267 **** </Configuration> <Configuration ! Name="Release DLL|Win32" OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" --- 100,104 ---- </Configuration> <Configuration ! Name="Release|Win32" OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" |
|
From: Braden M. <br...@us...> - 2006-09-22 01:12:03
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17588 Modified Files: ChangeLog Log Message: Cache the visibility test result. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1331 retrieving revision 1.1332 diff -C2 -d -r1.1331 -r1.1332 *** ChangeLog 22 Sep 2006 01:06:06 -0000 1.1331 --- ChangeLog 22 Sep 2006 01:12:00 -0000 1.1332 *************** *** 1,4 **** --- 1,8 ---- 2006-09-21 Braden McDaniel <br...@en...> + * m4/ov_cxx_visibility.m4: Cache the test result. + + 2006-09-21 Braden McDaniel <br...@en...> + Clean up of breakage from Windows font support check-in. |
