[ros-diffs] [sserapion] 36726: Stub setjmp and longjmp on freetype. This hack should be removed.

Author: sserapion
Date: Sun Oct 12 02:17:20 2008
New Revision: 36726

URL: http://svn.reactos.org/svn/reactos?rev=36726&view=rev
Log:
Stub setjmp and longjmp on freetype. This hack should be removed.

Added:
    branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/amd64/   (with props)
    branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/amd64/setjmplongjmp.s   (with
props)
Modified:
    branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/freetype.rbuild

Propchange: branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/amd64/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sun Oct 12 02:17:20 2008
@@ -1,0 +1,2 @@
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)

Propchange: branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/amd64/
------------------------------------------------------------------------------
    bugtraq:message = See issue #%BUGID% for more details.

Propchange: branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/amd64/
------------------------------------------------------------------------------
    bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/amd64/
------------------------------------------------------------------------------
    tsvn:logminsize = 10

Added: branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/amd64/setjmplongjmp.s
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/amd64/setjmplongjmp.s
(added)
+++ branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/amd64/setjmplongjmp.s
[iso-8859-1] Sun Oct 12 02:17:20 2008
@@ -1,0 +1,8 @@
+
+.globl __setjmp
+__setjmp:
+    ret
+
+.globl _longjmp
+_longjmp:
+    ret

Propchange:
branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/amd64/setjmplongjmp.s
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/freetype.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/freetype.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/3rdparty/freetype/freetype.rbuild [iso-8859-1]
Sun Oct 12 02:17:20 2008
@@ -7,6 +7,7 @@
 	<define name="__NTDRIVER__" />
 	<define name="__NO_CTYPE_INLINES" />
 	<define name="FT2_BUILD_LIBRARY"  />
+	<library>libcntpr</library>
 	<if property="NSWPAT" value="0">
 		<define name="TT_CONFIG_OPTION_UNPATENTED_HINTING" />
 	</if>
@@ -15,9 +16,16 @@
 	</if>
 	<library>ntoskrnl</library>
 	<library>libcntpr</library>
+	<if property="ARCH" value="i386">
 	<directory name="i386">
 		<file>setjmplongjmp.s</file>
 	</directory>
+	</if>
+	<if property="ARCH" value="amd64">
+	<directory name="amd64">
+		<file>setjmplongjmp.s</file>
+	</directory>
+	</if>
 	<directory name="src">
 		<directory name="base">
 			<file>ftsystem.c</file>