[svn-commits] trunk r212 - in /trunk: ./ format_mp3/Makefile

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Sun Apr 30 08:27:00 2006
New Revision: 212

URL: http://svn.digium.com/view/asterisk-addons?rev=212&view=rev
Log:
Merged revisions 211 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-addons/branches/1.2

........
r211 | kpfleming | 2006-04-30 08:26:09 -0500 (Sun, 30 Apr 2006) | 2 lines

there is no need to supply -m64 for building on 64-bit systems

........

Modified:
    trunk/   (props changed)
    trunk/format_mp3/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Apr 30 08:27:00 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-183,209
+/branches/1.2:1-183,209,211

Modified: trunk/format_mp3/Makefile
URL: http://svn.digium.com/view/asterisk-addons/trunk/format_mp3/Makefile?rev=212&r1=211&r2=212&view=diff
==============================================================================
--- trunk/format_mp3/Makefile (original)
+++ trunk/format_mp3/Makefile Sun Apr 30 08:27:00 2006
@@ -12,7 +12,7 @@
 # You must have GCC 3.4 to use k8, otherwise use athlon
 PROC=k8
 #PROC=athlon
-OPTIONS+=-m64
+#OPTIONS+=-m64
 endif
 ifeq ($(PROC),sparc64)
 #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.