Преглед изворни кода

adjust link order for Ubuntu gcc

richarddobson пре 2 година
родитељ
комит
628fa3c16a

+ 2 - 2
dev/externals/paprogs/listaudevs/CMakeLists.txt

@@ -18,10 +18,10 @@ else()
 #    NB winmm must appear after any module that references it. Yes, that's weird.
     set(EXTRA_LIBRARIES1 dsound winspool ${PA} winmm ${EXTRA_LIBRARIES})
   else()
-link_directories (/usr/local/lib)
+    link_directories (/usr/local/lib)
     find_library(PA NAMES libportaudio.a)
     set(CMAKE_C_FLAGS "-O3 -Wall -Dlinux -Dunix -fomit-frame-pointer -funroll-loops")
-    set(EXTRA_LIBRARIES1 jack asound pthread ${PA} ${EXTRA_LIBRARIES})
+    set(EXTRA_LIBRARIES1 pthread ${PA} ${EXTRA_LIBRARIES} jack asound)
   endif()
 endif()
 

+ 1 - 1
dev/externals/paprogs/paplay/CMakeLists.txt

@@ -25,7 +25,7 @@ else()
     find_library(PA NAMES libportaudio.a)
     find_library(AAIOLIB NAMES libaaio.a)
     set(CMAKE_C_FLAGS "-O3 -Wall -Dlinux -Dunix -fomit-frame-pointer -funroll-loops")
-    set(EXTRA_LIBRARIES1 jack asound portsf portaudio pthread ${AAIOLIB} ${PA} ${EXTRA_LIBRARIES})
+    set(EXTRA_LIBRARIES1 portsf portaudio pthread ${AAIOLIB} ${PA} ${EXTRA_LIBRARIES} jack asound)
   endif()
 endif()
 

+ 1 - 1
dev/externals/paprogs/pvplay/CMakeLists.txt

@@ -24,7 +24,7 @@ else()
     find_library(AAIOLIB NAMES libaaio.a)
     find_library(PA NAMES libportaudio.a)
     set(CMAKE_C_FLAGS "-O3 -Wall -Dlinux -Dunix -fomit-frame-pointer -funroll-loops")
-    set(EXTRA_LIBRARIES1 asound jack pthread ${AAIOLIB} ${PA}  ${EXTRA_LIBRARIES})
+    set(EXTRA_LIBRARIES1 pthread ${AAIOLIB} ${PA}  ${EXTRA_LIBRARIES} asound jack)
   endif()
 endif()
 # ../portaudio/lib/.libs

+ 1 - 1
dev/externals/paprogs/recsf/CMakeLists.txt

@@ -23,7 +23,7 @@ else()
     find_library(AAIOLIB NAMES libaaio.a) 
     find_library(PA NAMES libportaudio.c)
     set(CMAKE_C_FLAGS "-O3 -Wall -Dlinux -Dunix -fomit-frame-pointer -funroll-loops")
-    set(EXTRA_LIBRARIES1 asound jack pthread m ${AAIOLIB} ${PA} ${EXTRA_LIBARIES})
+    set(EXTRA_LIBRARIES1 pthread m ${AAIOLIB} ${PA} ${EXTRA_LIBARIES} asound jack)
   endif()
 endif()