Permalink
Browse files

Fix BASSMOD header/import lib to not use @N suffixes, since the DLL d…

…oesn't
  • Loading branch information...
1 parent b80b07b commit e6532a097a451f8563a83d579877afda4f668f5b @dkl dkl committed Oct 14, 2012
Showing with 63 additions and 57 deletions.
  1. +35 −27 inc/bassmod.bi
  2. +28 −29 lib/win32/bassmod.def
  3. +0 −1 lib/win32/makefile
View
@@ -23,6 +23,12 @@ type BOOL as integer
#define MAKELONG(a,b) cint( cushort(a) or (cuint(cushort(b)) shl 16) )
#endif '' __FB_WIN32__
+#ifdef __FB_WIN32__
+extern "Windows-MS"
+#else
+extern "C"
+#endif
+
type HSYNC as DWORD
#define BASS_OK 0
@@ -73,32 +79,34 @@ type SYNCPROC as sub(byval as HSYNC, byval as DWORD, byval as DWORD)
#define BASS_ACTIVE_PLAYING 1
#define BASS_ACTIVE_PAUSED 3
-declare function BASSMOD_GetVersion alias "BASSMOD_GetVersion" () as DWORD
-declare function BASSMOD_ErrorGetCode alias "BASSMOD_ErrorGetCode" () as DWORD
-declare function BASSMOD_GetDeviceDescription alias "BASSMOD_GetDeviceDescription" (byval devnum as integer) as zstring ptr
-declare function BASSMOD_Init alias "BASSMOD_Init" (byval device as integer, byval freq as DWORD, byval flags as DWORD) as BOOL
-declare sub BASSMOD_Free alias "BASSMOD_Free" ()
-declare function BASSMOD_GetCPU alias "BASSMOD_GetCPU" () as single
-declare function BASSMOD_SetVolume alias "BASSMOD_SetVolume" (byval volume as DWORD) as BOOL
-declare function BASSMOD_GetVolume alias "BASSMOD_GetVolume" () as integer
-declare function BASSMOD_MusicLoad alias "BASSMOD_MusicLoad" (byval mem as BOOL, byval file as zstring ptr, byval offset as DWORD, byval length as DWORD, byval flags as DWORD) as BOOL
-declare sub BASSMOD_MusicFree alias "BASSMOD_MusicFree" ()
-declare function BASSMOD_MusicGetName alias "BASSMOD_MusicGetName" () as zstring ptr
-declare function BASSMOD_MusicGetLength alias "BASSMOD_MusicGetLength" (byval playlen as BOOL) as DWORD
-declare function BASSMOD_MusicPlay alias "BASSMOD_MusicPlay" () as BOOL
-declare function BASSMOD_MusicPlayEx alias "BASSMOD_MusicPlayEx" (byval pos as DWORD, byval flags as integer, byval reset as BOOL) as BOOL
-declare function BASSMOD_MusicDecode alias "BASSMOD_MusicDecode" (byval buffer as any ptr, byval length as DWORD) as DWORD
-declare function BASSMOD_MusicSetAmplify alias "BASSMOD_MusicSetAmplify" (byval amp as DWORD) as BOOL
-declare function BASSMOD_MusicSetPanSep alias "BASSMOD_MusicSetPanSep" (byval pan as DWORD) as BOOL
-declare function BASSMOD_MusicSetPositionScaler alias "BASSMOD_MusicSetPositionScaler" (byval scale as DWORD) as BOOL
-declare function BASSMOD_MusicSetVolume alias "BASSMOD_MusicSetVolume" (byval chanins as DWORD, byval volume as DWORD) as BOOL
-declare function BASSMOD_MusicGetVolume alias "BASSMOD_MusicGetVolume" (byval chanins as DWORD) as DWORD
-declare function BASSMOD_MusicIsActive alias "BASSMOD_MusicIsActive" () as DWORD
-declare function BASSMOD_MusicStop alias "BASSMOD_MusicStop" () as BOOL
-declare function BASSMOD_MusicPause alias "BASSMOD_MusicPause" () as BOOL
-declare function BASSMOD_MusicSetPosition alias "BASSMOD_MusicSetPosition" (byval pos as DWORD) as BOOL
-declare function BASSMOD_MusicGetPosition alias "BASSMOD_MusicGetPosition" () as DWORD
-declare function BASSMOD_MusicSetSync alias "BASSMOD_MusicSetSync" (byval type as DWORD, byval param as DWORD, byval proc as SYNCPROC ptr, byval user as DWORD) as HSYNC
-declare function BASSMOD_MusicRemoveSync alias "BASSMOD_MusicRemoveSync" (byval sync as HSYNC) as BOOL
+declare function BASSMOD_GetVersion() as DWORD
+declare function BASSMOD_ErrorGetCode() as DWORD
+declare function BASSMOD_GetDeviceDescription(byval devnum as integer) as zstring ptr
+declare function BASSMOD_Init(byval device as integer, byval freq as DWORD, byval flags as DWORD) as BOOL
+declare sub BASSMOD_Free()
+declare function BASSMOD_GetCPU() as single
+declare function BASSMOD_SetVolume(byval volume as DWORD) as BOOL
+declare function BASSMOD_GetVolume() as integer
+declare function BASSMOD_MusicLoad(byval mem as BOOL, byval file as zstring ptr, byval offset as DWORD, byval length as DWORD, byval flags as DWORD) as BOOL
+declare sub BASSMOD_MusicFree()
+declare function BASSMOD_MusicGetName() as zstring ptr
+declare function BASSMOD_MusicGetLength(byval playlen as BOOL) as DWORD
+declare function BASSMOD_MusicPlay() as BOOL
+declare function BASSMOD_MusicPlayEx(byval pos as DWORD, byval flags as integer, byval reset as BOOL) as BOOL
+declare function BASSMOD_MusicDecode(byval buffer as any ptr, byval length as DWORD) as DWORD
+declare function BASSMOD_MusicSetAmplify(byval amp as DWORD) as BOOL
+declare function BASSMOD_MusicSetPanSep(byval pan as DWORD) as BOOL
+declare function BASSMOD_MusicSetPositionScaler(byval scale as DWORD) as BOOL
+declare function BASSMOD_MusicSetVolume(byval chanins as DWORD, byval volume as DWORD) as BOOL
+declare function BASSMOD_MusicGetVolume(byval chanins as DWORD) as DWORD
+declare function BASSMOD_MusicIsActive() as DWORD
+declare function BASSMOD_MusicStop() as BOOL
+declare function BASSMOD_MusicPause() as BOOL
+declare function BASSMOD_MusicSetPosition(byval pos as DWORD) as BOOL
+declare function BASSMOD_MusicGetPosition() as DWORD
+declare function BASSMOD_MusicSetSync(byval type as DWORD, byval param as DWORD, byval proc as SYNCPROC ptr, byval user as DWORD) as HSYNC
+declare function BASSMOD_MusicRemoveSync(byval sync as HSYNC) as BOOL
+
+end extern
#endif
View
@@ -1,30 +1,29 @@
-LIBRARY BASSMOD.DLL
-
+LIBRARY BASSMOD.dll
EXPORTS
-BASSMOD_GetVersion@0 = BASSMOD_GetVersion
-BASSMOD_ErrorGetCode@0 = BASSMOD_ErrorGetCode
-BASSMOD_GetDeviceDescription@4 = BASSMOD_GetDeviceDescription
-BASSMOD_Init@12 = BASSMOD_Init
-BASSMOD_Free@0 = BASSMOD_Free
-BASSMOD_GetCPU@0 = BASSMOD_GetCPU
-BASSMOD_SetVolume@4 = BASSMOD_SetVolume
-BASSMOD_GetVolume@0 = BASSMOD_GetVolume
-BASSMOD_MusicLoad@20 = BASSMOD_MusicLoad
-BASSMOD_MusicFree@0 = BASSMOD_MusicFree
-BASSMOD_MusicGetName@0 = BASSMOD_MusicGetName
-BASSMOD_MusicGetLength@4 = BASSMOD_MusicGetLength
-BASSMOD_MusicPlay@0 = BASSMOD_MusicPlay
-BASSMOD_MusicPlayEx@12 = BASSMOD_MusicPlayEx
-BASSMOD_MusicDecode@8 = BASSMOD_MusicDecode
-BASSMOD_MusicSetAmplify@4 = BASSMOD_MusicSetAmplify
-BASSMOD_MusicSetPanSep@4 = BASSMOD_MusicSetPanSep
-BASSMOD_MusicSetPositionScaler@4 = BASSMOD_MusicSetPositionScaler
-BASSMOD_MusicSetVolume@8 = BASSMOD_MusicSetVolume
-BASSMOD_MusicGetVolume@4 = BASSMOD_MusicGetVolume
-BASSMOD_MusicIsActive@0 = BASSMOD_MusicIsActive
-BASSMOD_MusicStop@0 = BASSMOD_MusicStop
-BASSMOD_MusicPause@0 = BASSMOD_MusicPause
-BASSMOD_MusicSetPosition@4 = BASSMOD_MusicSetPosition
-BASSMOD_MusicGetPosition@0 = BASSMOD_MusicGetPosition
-BASSMOD_MusicSetSync@16 = BASSMOD_MusicSetSync
-BASSMOD_MusicRemoveSync@4 = BASSMOD_MusicRemoveSync
+BASSMOD_ErrorGetCode DATA
+BASSMOD_Free
+BASSMOD_GetCPU
+BASSMOD_GetDeviceDescription DATA
+BASSMOD_GetVersion DATA
+BASSMOD_GetVolume
+BASSMOD_Init
+BASSMOD_MusicDecode DATA
+BASSMOD_MusicFree DATA
+BASSMOD_MusicGetLength DATA
+BASSMOD_MusicGetName DATA
+BASSMOD_MusicGetPosition DATA
+BASSMOD_MusicGetVolume DATA
+BASSMOD_MusicIsActive
+BASSMOD_MusicLoad DATA
+BASSMOD_MusicPause
+BASSMOD_MusicPlay DATA
+BASSMOD_MusicPlayEx DATA
+BASSMOD_MusicRemoveSync DATA
+BASSMOD_MusicSetAmplify DATA
+BASSMOD_MusicSetPanSep DATA
+BASSMOD_MusicSetPosition DATA
+BASSMOD_MusicSetPositionScaler DATA
+BASSMOD_MusicSetSync DATA
+BASSMOD_MusicSetVolume DATA
+BASSMOD_MusicStop
+BASSMOD_SetVolume
View
@@ -7,7 +7,6 @@ all: $(LIBS)
# Some libraries need extra dlltool flags
libFreeImage.dll.a: DTFLAGS := --add-stdcall-underscore
-libbassmod.dll.a: DTFLAGS := --kill-at
libcrypt.dll.a: DTFLAGS := --kill-at
libglut32.dll.a: DTFLAGS := --kill-at
libglut.dll.a: DTFLAGS := --kill-at

0 comments on commit e6532a0

Please sign in to comment.