ignatenkobrain pushed to angelscript (master). "Revert "drop asm file due to already defined error" (..more)"

[notifications at fedoraproject.org]

From 7e7b7f9263076ed501fec6f139880cbcb866471a Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date: Thu, 21 May 2015 00:34:12 +0300
Subject: Revert "drop asm file due to already defined error"

This reverts commit 78fa1c19dfc43ddc8eaa31c08083f30090c5c6e7.

diff --git a/angelscript-meson.build b/angelscript-meson.build
index 3af3b39..274542d 100644
--- a/angelscript-meson.build
+++ b/angelscript-meson.build
@@ -1,4 +1,4 @@
-project('angelscript', 'cpp')
+project('angelscript', 'cpp', 'c')
 
 arch = run_command('uname', '-p')
 
@@ -42,7 +42,7 @@ srcs = [
 ]
 
 if arch.stdout().strip() == 'armv7l'
-  srcs = srcs + ['source/as_callfunc_arm.cpp']
+  srcs = srcs + ['source/as_callfunc_arm.cpp', 'source/as_callfunc_arm_gcc.s']
 endif
 
 shared_library(
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/angelscript.git/commit/?h=master&id=7e7b7f9263076ed501fec6f139880cbcb866471a