From fd7c729bd17d8c1d8e98003d27e47a58c1c258ec Mon Sep 17 00:00:00 2001 From: Kent Mein Date: Mon, 4 Feb 2008 21:52:03 +0000 Subject: This is patch: [#8216] Make blender compile with gcc 4.3 minus one small include file that was commented out, I'm not sure why it was commented out but I'm pretty sure its needed. If there are still problems later we can sort it out, everything else is pretty simple. Kent --- intern/string/STR_String.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'intern/string') diff --git a/intern/string/STR_String.h b/intern/string/STR_String.h index 2da2b57c6f2..7b02e6c1855 100644 --- a/intern/string/STR_String.h +++ b/intern/string/STR_String.h @@ -47,6 +47,10 @@ #include #include + +#include +#include + using namespace std; -- cgit v1.2.3 From 5d0a207ecb843c4c73be897cfccbf3a0d2db574b Mon Sep 17 00:00:00 2001 From: Chris Want Date: Wed, 16 Apr 2008 22:40:48 +0000 Subject: Patch from GSR that a) fixes a whole bunch of GPL/BL license blocks that were previously missed; and b) greatly increase my ohloh stats! --- intern/string/CMakeLists.txt | 9 +++------ intern/string/Makefile | 9 +++------ intern/string/STR_HashedString.h | 9 +++------ intern/string/STR_String.h | 9 +++------ intern/string/intern/Makefile | 9 +++------ intern/string/intern/STR_String.cpp | 9 +++------ 6 files changed, 18 insertions(+), 36 deletions(-) (limited to 'intern/string') diff --git a/intern/string/CMakeLists.txt b/intern/string/CMakeLists.txt index bee946d3c15..e92a9f976c2 100644 --- a/intern/string/CMakeLists.txt +++ b/intern/string/CMakeLists.txt @@ -1,13 +1,10 @@ # $Id$ -# ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** +# ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. The Blender -# Foundation also sells licenses for use in proprietary software under -# the Blender License. See http://www.blender.org/BL/ for information -# about this. +# of the License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -25,7 +22,7 @@ # # Contributor(s): Jacques Beaurain. # -# ***** END GPL/BL DUAL LICENSE BLOCK ***** +# ***** END GPL LICENSE BLOCK ***** SET(INC .) diff --git a/intern/string/Makefile b/intern/string/Makefile index e3dffbe9e44..e885b87babe 100644 --- a/intern/string/Makefile +++ b/intern/string/Makefile @@ -1,15 +1,12 @@ # # $Id$ # -# ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** +# ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. The Blender -# Foundation also sells licenses for use in proprietary software under -# the Blender License. See http://www.blender.org/BL/ for information -# about this. +# of the License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -27,7 +24,7 @@ # # Contributor(s): Hans Lambermont # -# ***** END GPL/BL DUAL LICENSE BLOCK ***** +# ***** END GPL LICENSE BLOCK ***** # string main makefile. # diff --git a/intern/string/STR_HashedString.h b/intern/string/STR_HashedString.h index bf18a4e4da6..b052e92f1fe 100644 --- a/intern/string/STR_HashedString.h +++ b/intern/string/STR_HashedString.h @@ -1,14 +1,11 @@ /** * $Id$ - * ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** + * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. The Blender - * Foundation also sells licenses for use in proprietary software under - * the Blender License. See http://www.blender.org/BL/ for information - * about this. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -26,7 +23,7 @@ * * Contributor(s): none yet. * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** + * ***** END GPL LICENSE BLOCK ***** */ /** diff --git a/intern/string/STR_String.h b/intern/string/STR_String.h index 7b02e6c1855..ec945c80c7c 100644 --- a/intern/string/STR_String.h +++ b/intern/string/STR_String.h @@ -1,14 +1,11 @@ /** * $Id$ - * ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** + * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. The Blender - * Foundation also sells licenses for use in proprietary software under - * the Blender License. See http://www.blender.org/BL/ for information - * about this. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -26,7 +23,7 @@ * * Contributor(s): none yet. * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** + * ***** END GPL LICENSE BLOCK ***** */ /** diff --git a/intern/string/intern/Makefile b/intern/string/intern/Makefile index 925cdfed54a..4a461fb03b3 100644 --- a/intern/string/intern/Makefile +++ b/intern/string/intern/Makefile @@ -1,15 +1,12 @@ # # $Id$ # -# ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** +# ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. The Blender -# Foundation also sells licenses for use in proprietary software under -# the Blender License. See http://www.blender.org/BL/ for information -# about this. +# of the License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -27,7 +24,7 @@ # # Contributor(s): none yet. # -# ***** END GPL/BL DUAL LICENSE BLOCK ***** +# ***** END GPL LICENSE BLOCK ***** # string intern Makefile # diff --git a/intern/string/intern/STR_String.cpp b/intern/string/intern/STR_String.cpp index af8f0d11445..dcc52e2a3e7 100644 --- a/intern/string/intern/STR_String.cpp +++ b/intern/string/intern/STR_String.cpp @@ -1,14 +1,11 @@ /** * $Id$ - * ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** + * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. The Blender - * Foundation also sells licenses for use in proprietary software under - * the Blender License. See http://www.blender.org/BL/ for information - * about this. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -26,7 +23,7 @@ * * Contributor(s): none yet. * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** + * ***** END GPL LICENSE BLOCK ***** */ /** -- cgit v1.2.3 From 8eec6cecc076009b2fc23d4464315bd4c8936806 Mon Sep 17 00:00:00 2001 From: Benoit Bolsee Date: Mon, 10 Nov 2008 15:36:58 +0000 Subject: Add MSVC90 project files - part 1. --- intern/string/make/msvc_9_0/string.vcproj | 354 ++++++++++++++++++++++++++++++ 1 file changed, 354 insertions(+) create mode 100644 intern/string/make/msvc_9_0/string.vcproj (limited to 'intern/string') diff --git a/intern/string/make/msvc_9_0/string.vcproj b/intern/string/make/msvc_9_0/string.vcproj new file mode 100644 index 00000000000..d92498f6202 --- /dev/null +++ b/intern/string/make/msvc_9_0/string.vcproj @@ -0,0 +1,354 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 61a83d2fbadbaff39f72743d4a0a3c037cfcce8f Mon Sep 17 00:00:00 2001 From: Benoit Bolsee Date: Mon, 10 Nov 2008 21:22:22 +0000 Subject: Add MSVC90 project files - part 3. Extern and Intern projects are merged in projectfiles_vc9\blender\blender.sln solution, you just need to open that solution to compile everything with VS2008. --- intern/string/make/msvc_9_0/string.vcproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'intern/string') diff --git a/intern/string/make/msvc_9_0/string.vcproj b/intern/string/make/msvc_9_0/string.vcproj index d92498f6202..16df974ff9c 100644 --- a/intern/string/make/msvc_9_0/string.vcproj +++ b/intern/string/make/msvc_9_0/string.vcproj @@ -2,8 +2,9 @@ -- cgit v1.2.3