[Performous-commit] John Stumpo : Split portmidi into portmidi and porttime so the cmake scripts detect it correctly .

[Tapio V. <aa...@us...>]

Module: performous
Branch: joinmenu
Commit: a755874fcf1d1f1f816fffaa4a4865cef935ae11

Author: John Stumpo <st...@js...>
Date:   Fri Jun 25 19:23:57 2010 -0400

Split portmidi into portmidi and porttime so the cmake scripts detect it correctly.

---

 win32/cross-from-debian/makedeps.sh |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/win32/cross-from-debian/makedeps.sh b/win32/cross-from-debian/makedeps.sh
index f92de94..355a4d2 100755
--- a/win32/cross-from-debian/makedeps.sh
+++ b/win32/cross-from-debian/makedeps.sh
@@ -269,9 +269,10 @@ if test ! -f "$PREFIX"/build-stamps/portmidi; then
   download http://download.sourceforge.net/portmedia/portmidi-src-200.zip
   unzip -o portmidi-src-200.zip
   cd portmidi
-  $CROSS_GCC -g -O2 -W -Wall -Ipm_common -Iporttime -DNDEBUG -D_WINDLL -mdll -o portmidi.dll -Wl,--out-implib,libportmidi.a pm_win/pmwin.c pm_win/pmwinmm.c porttime/ptwinmm.c pm_common/pmutil.c pm_common/portmidi.c -lwinmm
-  cp -v portmidi.dll "$PREFIX"/bin
-  cp -v libportmidi.a "$PREFIX"/lib
+  $CROSS_GCC -g -O2 -W -Wall -Iporttime -DNDEBUG -D_WINDLL -mdll -o porttime.dll -Wl,--out-implib,libporttime.a porttime/ptwinmm.c -lwinmm
+  $CROSS_GCC -g -O2 -W -Wall -Ipm_common -Iporttime -DNDEBUG -D_WINDLL -mdll -o portmidi.dll -Wl,--out-implib,libportmidi.a pm_win/pmwin.c pm_win/pmwinmm.c pm_common/pmutil.c pm_common/portmidi.c -L. -lporttime -lwinmm
+  cp -v portmidi.dll porttime.dll "$PREFIX"/bin
+  cp -v libportmidi.a libporttime.a "$PREFIX"/lib
   cp -v pm_common/portmidi.h porttime/porttime.h "$PREFIX"/include
   cd ..
   touch "$PREFIX"/build-stamps/portmidi