Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

…oesn't
  • Loading branch information...
commit e6532a097a451f8563a83d579877afda4f668f5b 1 parent b80b07b
dkl authored October 14, 2012
62  inc/bassmod.bi
@@ -23,6 +23,12 @@ type BOOL as integer
23 23
 #define MAKELONG(a,b) cint( cushort(a) or (cuint(cushort(b)) shl 16) )
24 24
 #endif '' __FB_WIN32__
25 25
 
  26
+#ifdef __FB_WIN32__
  27
+extern "Windows-MS"
  28
+#else
  29
+extern "C"
  30
+#endif
  31
+
26 32
 type HSYNC as DWORD
27 33
 
28 34
 #define BASS_OK 0
@@ -73,32 +79,34 @@ type SYNCPROC as sub(byval as HSYNC, byval as DWORD, byval as DWORD)
73 79
 #define BASS_ACTIVE_PLAYING 1
74 80
 #define BASS_ACTIVE_PAUSED 3
75 81
 
76  
-declare function BASSMOD_GetVersion alias "BASSMOD_GetVersion" () as DWORD
77  
-declare function BASSMOD_ErrorGetCode alias "BASSMOD_ErrorGetCode" () as DWORD
78  
-declare function BASSMOD_GetDeviceDescription alias "BASSMOD_GetDeviceDescription" (byval devnum as integer) as zstring ptr
79  
-declare function BASSMOD_Init alias "BASSMOD_Init" (byval device as integer, byval freq as DWORD, byval flags as DWORD) as BOOL
80  
-declare sub BASSMOD_Free alias "BASSMOD_Free" ()
81  
-declare function BASSMOD_GetCPU alias "BASSMOD_GetCPU" () as single
82  
-declare function BASSMOD_SetVolume alias "BASSMOD_SetVolume" (byval volume as DWORD) as BOOL
83  
-declare function BASSMOD_GetVolume alias "BASSMOD_GetVolume" () as integer
84  
-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
85  
-declare sub BASSMOD_MusicFree alias "BASSMOD_MusicFree" ()
86  
-declare function BASSMOD_MusicGetName alias "BASSMOD_MusicGetName" () as zstring ptr
87  
-declare function BASSMOD_MusicGetLength alias "BASSMOD_MusicGetLength" (byval playlen as BOOL) as DWORD
88  
-declare function BASSMOD_MusicPlay alias "BASSMOD_MusicPlay" () as BOOL
89  
-declare function BASSMOD_MusicPlayEx alias "BASSMOD_MusicPlayEx" (byval pos as DWORD, byval flags as integer, byval reset as BOOL) as BOOL
90  
-declare function BASSMOD_MusicDecode alias "BASSMOD_MusicDecode" (byval buffer as any ptr, byval length as DWORD) as DWORD
91  
-declare function BASSMOD_MusicSetAmplify alias "BASSMOD_MusicSetAmplify" (byval amp as DWORD) as BOOL
92  
-declare function BASSMOD_MusicSetPanSep alias "BASSMOD_MusicSetPanSep" (byval pan as DWORD) as BOOL
93  
-declare function BASSMOD_MusicSetPositionScaler alias "BASSMOD_MusicSetPositionScaler" (byval scale as DWORD) as BOOL
94  
-declare function BASSMOD_MusicSetVolume alias "BASSMOD_MusicSetVolume" (byval chanins as DWORD, byval volume as DWORD) as BOOL
95  
-declare function BASSMOD_MusicGetVolume alias "BASSMOD_MusicGetVolume" (byval chanins as DWORD) as DWORD
96  
-declare function BASSMOD_MusicIsActive alias "BASSMOD_MusicIsActive" () as DWORD
97  
-declare function BASSMOD_MusicStop alias "BASSMOD_MusicStop" () as BOOL
98  
-declare function BASSMOD_MusicPause alias "BASSMOD_MusicPause" () as BOOL
99  
-declare function BASSMOD_MusicSetPosition alias "BASSMOD_MusicSetPosition" (byval pos as DWORD) as BOOL
100  
-declare function BASSMOD_MusicGetPosition alias "BASSMOD_MusicGetPosition" () as DWORD
101  
-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
102  
-declare function BASSMOD_MusicRemoveSync alias "BASSMOD_MusicRemoveSync" (byval sync as HSYNC) as BOOL
  82
+declare function BASSMOD_GetVersion() as DWORD
  83
+declare function BASSMOD_ErrorGetCode() as DWORD
  84
+declare function BASSMOD_GetDeviceDescription(byval devnum as integer) as zstring ptr
  85
+declare function BASSMOD_Init(byval device as integer, byval freq as DWORD, byval flags as DWORD) as BOOL
  86
+declare sub BASSMOD_Free()
  87
+declare function BASSMOD_GetCPU() as single
  88
+declare function BASSMOD_SetVolume(byval volume as DWORD) as BOOL
  89
+declare function BASSMOD_GetVolume() as integer
  90
+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
  91
+declare sub BASSMOD_MusicFree()
  92
+declare function BASSMOD_MusicGetName() as zstring ptr
  93
+declare function BASSMOD_MusicGetLength(byval playlen as BOOL) as DWORD
  94
+declare function BASSMOD_MusicPlay() as BOOL
  95
+declare function BASSMOD_MusicPlayEx(byval pos as DWORD, byval flags as integer, byval reset as BOOL) as BOOL
  96
+declare function BASSMOD_MusicDecode(byval buffer as any ptr, byval length as DWORD) as DWORD
  97
+declare function BASSMOD_MusicSetAmplify(byval amp as DWORD) as BOOL
  98
+declare function BASSMOD_MusicSetPanSep(byval pan as DWORD) as BOOL
  99
+declare function BASSMOD_MusicSetPositionScaler(byval scale as DWORD) as BOOL
  100
+declare function BASSMOD_MusicSetVolume(byval chanins as DWORD, byval volume as DWORD) as BOOL
  101
+declare function BASSMOD_MusicGetVolume(byval chanins as DWORD) as DWORD
  102
+declare function BASSMOD_MusicIsActive() as DWORD
  103
+declare function BASSMOD_MusicStop() as BOOL
  104
+declare function BASSMOD_MusicPause() as BOOL
  105
+declare function BASSMOD_MusicSetPosition(byval pos as DWORD) as BOOL
  106
+declare function BASSMOD_MusicGetPosition() as DWORD
  107
+declare function BASSMOD_MusicSetSync(byval type as DWORD, byval param as DWORD, byval proc as SYNCPROC ptr, byval user as DWORD) as HSYNC
  108
+declare function BASSMOD_MusicRemoveSync(byval sync as HSYNC) as BOOL
  109
+
  110
+end extern
103 111
 
104 112
 #endif
57  lib/win32/bassmod.def
... ...
@@ -1,30 +1,29 @@
1  
-LIBRARY     BASSMOD.DLL
2  
-
  1
+LIBRARY BASSMOD.dll
3 2
 EXPORTS
4  
-BASSMOD_GetVersion@0 = BASSMOD_GetVersion
5  
-BASSMOD_ErrorGetCode@0 = BASSMOD_ErrorGetCode
6  
-BASSMOD_GetDeviceDescription@4 = BASSMOD_GetDeviceDescription
7  
-BASSMOD_Init@12 = BASSMOD_Init
8  
-BASSMOD_Free@0 = BASSMOD_Free
9  
-BASSMOD_GetCPU@0 = BASSMOD_GetCPU
10  
-BASSMOD_SetVolume@4 = BASSMOD_SetVolume
11  
-BASSMOD_GetVolume@0 = BASSMOD_GetVolume
12  
-BASSMOD_MusicLoad@20 = BASSMOD_MusicLoad
13  
-BASSMOD_MusicFree@0 = BASSMOD_MusicFree
14  
-BASSMOD_MusicGetName@0 = BASSMOD_MusicGetName
15  
-BASSMOD_MusicGetLength@4 = BASSMOD_MusicGetLength
16  
-BASSMOD_MusicPlay@0 = BASSMOD_MusicPlay
17  
-BASSMOD_MusicPlayEx@12 = BASSMOD_MusicPlayEx
18  
-BASSMOD_MusicDecode@8 = BASSMOD_MusicDecode
19  
-BASSMOD_MusicSetAmplify@4 = BASSMOD_MusicSetAmplify
20  
-BASSMOD_MusicSetPanSep@4 = BASSMOD_MusicSetPanSep
21  
-BASSMOD_MusicSetPositionScaler@4 = BASSMOD_MusicSetPositionScaler
22  
-BASSMOD_MusicSetVolume@8 = BASSMOD_MusicSetVolume
23  
-BASSMOD_MusicGetVolume@4 = BASSMOD_MusicGetVolume
24  
-BASSMOD_MusicIsActive@0 = BASSMOD_MusicIsActive
25  
-BASSMOD_MusicStop@0 = BASSMOD_MusicStop
26  
-BASSMOD_MusicPause@0 = BASSMOD_MusicPause
27  
-BASSMOD_MusicSetPosition@4 = BASSMOD_MusicSetPosition
28  
-BASSMOD_MusicGetPosition@0 = BASSMOD_MusicGetPosition
29  
-BASSMOD_MusicSetSync@16 = BASSMOD_MusicSetSync
30  
-BASSMOD_MusicRemoveSync@4 = BASSMOD_MusicRemoveSync
  3
+BASSMOD_ErrorGetCode DATA
  4
+BASSMOD_Free
  5
+BASSMOD_GetCPU
  6
+BASSMOD_GetDeviceDescription DATA
  7
+BASSMOD_GetVersion DATA
  8
+BASSMOD_GetVolume
  9
+BASSMOD_Init
  10
+BASSMOD_MusicDecode DATA
  11
+BASSMOD_MusicFree DATA
  12
+BASSMOD_MusicGetLength DATA
  13
+BASSMOD_MusicGetName DATA
  14
+BASSMOD_MusicGetPosition DATA
  15
+BASSMOD_MusicGetVolume DATA
  16
+BASSMOD_MusicIsActive
  17
+BASSMOD_MusicLoad DATA
  18
+BASSMOD_MusicPause
  19
+BASSMOD_MusicPlay DATA
  20
+BASSMOD_MusicPlayEx DATA
  21
+BASSMOD_MusicRemoveSync DATA
  22
+BASSMOD_MusicSetAmplify DATA
  23
+BASSMOD_MusicSetPanSep DATA
  24
+BASSMOD_MusicSetPosition DATA
  25
+BASSMOD_MusicSetPositionScaler DATA
  26
+BASSMOD_MusicSetSync DATA
  27
+BASSMOD_MusicSetVolume DATA
  28
+BASSMOD_MusicStop
  29
+BASSMOD_SetVolume
1  lib/win32/makefile
@@ -7,7 +7,6 @@ all: $(LIBS)
7 7
 
8 8
 # Some libraries need extra dlltool flags
9 9
 libFreeImage.dll.a:    DTFLAGS := --add-stdcall-underscore
10  
-libbassmod.dll.a:      DTFLAGS := --kill-at
11 10
 libcrypt.dll.a:        DTFLAGS := --kill-at
12 11
 libglut32.dll.a:       DTFLAGS := --kill-at
13 12
 libglut.dll.a:         DTFLAGS := --kill-at

0 notes on commit e6532a0

Please sign in to comment.
Something went wrong with that request. Please try again.