From 8222b8d95636857767d5d80ecfeae61306e8e618 Mon Sep 17 00:00:00 2001
From: nickysn <nickysn@gmail.com>
Date: Sun, 18 Nov 2012 15:46:32 +0000
Subject: [PATCH] * enable the assembler by default in hermes.pp

git-svn-id: trunk@23015 -
---
 packages/hermes/Makefile.fpc.fpcmake | 18 +++++++++---------
 packages/hermes/src/hermes.pp        |  8 ++++++++
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/packages/hermes/Makefile.fpc.fpcmake b/packages/hermes/Makefile.fpc.fpcmake
index d5b0ac84cf..77a598daae 100644
--- a/packages/hermes/Makefile.fpc.fpcmake
+++ b/packages/hermes/Makefile.fpc.fpcmake
@@ -10,15 +10,15 @@ version=2.7.1
 units=hermes
 
 [compiler]
-options_i386_linux=-dI386_ASSEMBLER
-options_i386_win32=-dI386_ASSEMBLER
-options_i386_go32v2=-dI386_ASSEMBLER
-options_i386_freebsd=-dI386_ASSEMBLER
-options_i386_haiku=-dI386_ASSEMBLER
-options_i386_beos=-dI386_ASSEMBLER
-options_x86_64_linux=-dX86_64_ASSEMBLER
-options_x86_64_win64=-dX86_64_ASSEMBLER
-options_x86_64_freebsd=-dX86_64_ASSEMBLER
+#options_i386_linux=-dI386_ASSEMBLER
+#options_i386_win32=-dI386_ASSEMBLER
+#options_i386_go32v2=-dI386_ASSEMBLER
+#options_i386_freebsd=-dI386_ASSEMBLER
+#options_i386_haiku=-dI386_ASSEMBLER
+#options_i386_beos=-dI386_ASSEMBLER
+#options_x86_64_linux=-dX86_64_ASSEMBLER
+#options_x86_64_win64=-dX86_64_ASSEMBLER
+#options_x86_64_freebsd=-dX86_64_ASSEMBLER
 
 unitdir=
 targetdir=.
diff --git a/packages/hermes/src/hermes.pp b/packages/hermes/src/hermes.pp
index 9f61ea2e46..b9b76a14c0 100644
--- a/packages/hermes/src/hermes.pp
+++ b/packages/hermes/src/hermes.pp
@@ -34,6 +34,14 @@ unit Hermes;
 
 {$MODE objfpc}
 
+{$IF defined(cpui386) and not defined(noassembler)}
+  {$DEFINE I386_ASSEMBLER}
+{$ENDIF}
+
+{$IF defined(cpux86_64) and not defined(noassembler)}
+  {$DEFINE X86_64_ASSEMBLER}
+{$ENDIF}
+
 interface
 
 const