Stub setjmp and longjmp on freetype. This hack should be removed.

svn path=/branches/ros-amd64-bringup/; revision=36726

diff --git a/reactos/dll/3rdparty/freetype/amd64/setjmplongjmp.s b/reactos/dll/3rdparty/freetype/amd64/setjmplongjmp.s
new file mode 100644 (file)
index 0000000..8197653
--- /dev/null
+++ b/reactos/dll/3rdparty/freetype/amd64/setjmplongjmp.s
@@ -0,0 +1,8 @@
+
+.globl __setjmp
+__setjmp:
+    ret
+
+.globl _longjmp
+_longjmp:
+    ret

diff --git a/reactos/dll/3rdparty/freetype/freetype.rbuild b/reactos/dll/3rdparty/freetype/freetype.rbuild
index 5d6c44b..4a6fa0f 100644 (file)
--- a/reactos/dll/3rdparty/freetype/freetype.rbuild
+++ b/reactos/dll/3rdparty/freetype/freetype.rbuild
@@ -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>