[ros-diffs] [frik85] 23230: Add software patent setting to build config template. Implement the setting in freetype2 (rbuild file).

[frik85 at svn.reactos.org]

Author: frik85
Date: Sat Jul 22 23:38:18 2006
New Revision: 23230

URL: http://svn.reactos.org/svn/reactos?rev=23230&view=rev
Log:
Add software patent setting to build config template.

Implement the setting in freetype2 (rbuild file).

Modified:
    trunk/reactos/config-ppc.template.rbuild
    trunk/reactos/config.template.rbuild
    trunk/reactos/dll/3rdparty/freetype/devel/ftoption.h
    trunk/reactos/dll/3rdparty/freetype/freetype.rbuild

Modified: trunk/reactos/config-ppc.template.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config-ppc.template.rbuild?rev=23230&r1=23229&r2=23230&view=diff
==============================================================================
--- trunk/reactos/config-ppc.template.rbuild (original)
+++ trunk/reactos/config-ppc.template.rbuild Sat Jul 22 23:38:18 2006
@@ -53,4 +53,13 @@
 -->
 <property name="DBG" value="1" />
 
+
+<!--
+  Whether to compile apps/libs with features covered software patents or not.
+  If you live in a country where software patents are valid/apply, don't
+  enable this (except they/you purchased a license from the patent owner).
+  This settings is disabled (0) by default.
+-->
+<property name="NSWPAT" value="0" />
+
 </rbuild>

Modified: trunk/reactos/config.template.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev=23230&r1=23229&r2=23230&view=diff
==============================================================================
--- trunk/reactos/config.template.rbuild (original)
+++ trunk/reactos/config.template.rbuild Sat Jul 22 23:38:18 2006
@@ -60,4 +60,13 @@
 -->
 <property name="GDB" value="0" />
 
+
+<!--
+  Whether to compile apps/libs with features covered software patents or not.
+  If you live in a country where software patents are valid/apply, don't
+  enable this (except they/you purchased a license from the patent owner).
+  This settings is disabled (0) by default.
+-->
+<property name="NSWPAT" value="0" />
+
 </rbuild>

Modified: trunk/reactos/dll/3rdparty/freetype/devel/ftoption.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/freetype/devel/ftoption.h?rev=23230&r1=23229&r2=23230&view=diff
==============================================================================
--- trunk/reactos/dll/3rdparty/freetype/devel/ftoption.h (original)
+++ trunk/reactos/dll/3rdparty/freetype/devel/ftoption.h Sat Jul 22 23:38:18 2006
@@ -436,7 +436,7 @@
   /*   Do not #undef this macro here, since the build system might         */
   /*   define it for certain configurations only.                          */
   /*                                                                       */
-#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+/* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
 
 
   /*************************************************************************/

Modified: trunk/reactos/dll/3rdparty/freetype/freetype.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/freetype/freetype.rbuild?rev=23230&r1=23229&r2=23230&view=diff
==============================================================================
--- trunk/reactos/dll/3rdparty/freetype/freetype.rbuild (original)
+++ trunk/reactos/dll/3rdparty/freetype/freetype.rbuild Sat Jul 22 23:38:18 2006
@@ -6,6 +6,9 @@
 	<define name="__NTDRIVER__" />
 	<define name="__NO_CTYPE_INLINES" />
 	<define name="__USE_W32API" />
+	<if property="NSWPAT" value="1">
+		<define name="TT_CONFIG_OPTION_BYTECODE_INTERPRETER" />
+	</if>
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<directory name="i386">