[build] Osx fixes

szlldm · Apr 23, 2017 · a284c6d · a284c6d
1 parent e7264c9
commit a284c6d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/avidemux/qt4/ADM_openGL/src/ADM_openGlDownload_asm.asm b/avidemux/qt4/ADM_openGL/src/ADM_openGlDownload_asm.asm
@@ -51,10 +51,12 @@ MASK:
       dq 0x00ff000000ff0000
 section .text
 INIT_MMX mmx
+default rel
 cglobal glYUV444_Init
         movq          m7,[MASK]
         ret
 
+default abs
 INIT_MMX mmx
 cglobal glYUV444_luma, 3,4,4, src, dst, count
 .luma:

diff --git a/bootStrapOsx_Sierra.bash b/bootStrapOsx_Sierra.bash
@@ -213,11 +213,11 @@ echo "**  Remapping libraries **"
 python $TOP/cmake/osx_libs_remap.py
 python $TOP/cmake/osx_libs_remap.py
 echo "** Finishing **"
-cp $TOP/cmake/osx/Info.plist $PREFIX/../
+cat $TOP/cmake/osx/Info.plist.in  | sed "s/2\.6/$API_VERSION//g" > $PREFIX/../Info.plist
 mkdir $PREFIX/fonts
 cp $TOP/cmake/osx/fonts.conf $PREFIX/fonts
 mkdir -p $PREFIX/../MacOS
-cp $TOP/cmake/osx/Avidemux${API_VERSION} $PREFIX/../MacOS/Avidemux${API_VERSION}.app
+cp $TOP/cmake/osx/Avidemux.in $PREFIX/../MacOS/Avidemux${API_VERSION}.app
 chmod +x $PREFIX/../MacOS/Avidemux${API_VERSION}.app
 # Copy icons
 echo "Copying icons"

diff --git a/cmake/osx/Avidemux2.6 → cmake/osx/Avidemux.in b/cmake/osx/Avidemux2.6 → cmake/osx/Avidemux.in
diff --git a/cmake/osx/Info.plist → cmake/osx/Info.plist.in b/cmake/osx/Info.plist → cmake/osx/Info.plist.in