Codebase list xjadeo / c76d542
Merge commit 'upstream/0.6.0_rc6' Alessio Treglia 13 years ago
3 changed file(s) with 11 addition(s) and 5 deletion(s). Raw diff Collapse all Expand all
+1
-1
config.h less more
238238 /* #undef TTFFONTFILE */
239239
240240 /* Version number of package */
241 #define VERSION "0.6.0-rc5"
241 #define VERSION "0.6.0-rc6"
242242
243243 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
244244 significant byte first (like Motorola and SPARC, unlike Intel). */
+5
-2
configure less more
25902590
25912591 VERSION_MAJOR=0
25922592 VERSION_MINOR=6
2593 VERSION_SUB=0-rc5
2593 VERSION_SUB=0-rc6
25942594
25952595 am__api_version='1.11'
25962596
63896389
63906390 fi
63916391 if test "x$FOUND_H_PORTMIDI$FOUND_L_PORTMIDI" = "xyesyes"; then
6392 MIDI_LIBS="-lportmidi -lporttime"
6392 MIDI_LIBS="-lportmidi"
6393 if test "$PM_OS" != "mac"; then
6394 MIDI_LIBS="${MIDI_LIBS} -lporttime"
6395 fi
63936396 fi
63946397
63956398 if test "x$PORTMIDI" != "xno" -a -n "$portmidisrc" -a -n "$PM_OS"; then
+5
-2
configure.ac less more
77
88 VERSION_MAJOR=0
99 VERSION_MINOR=6
10 VERSION_SUB=0-rc5
10 VERSION_SUB=0-rc6
1111
1212 dnl Every other copy of the package version number gets its value from here
1313 AM_INIT_AUTOMAKE(xjadeo, [${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_SUB}])
218218 AC_CHECK_LIB([portmidi], [Pm_CountDevices], [FOUND_L_PORTMIDI=yes])
219219 fi
220220 if test "x$FOUND_H_PORTMIDI$FOUND_L_PORTMIDI" = "xyesyes"; then
221 MIDI_LIBS="-lportmidi -lporttime"
221 MIDI_LIBS="-lportmidi"
222 if test "$PM_OS" != "mac"; then
223 MIDI_LIBS="${MIDI_LIBS} -lporttime"
224 fi
222225 fi
223226
224227 if test "x$PORTMIDI" != "xno" -a -n "$portmidisrc" -a -n "$PM_OS"; then