openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File seal-1.07.dif of Package seal

--- src/Linux/Makefile
+++ src/Linux/Makefile
@@ -4,11 +4,14 @@
 AR = ar
 RANLIB = ranlib
 STRIP = strip
-CFLAGS = -c -Wall -mpentium -O3 -D__LINUX__ -D__ASM__
+ASMFLAGS = -D__ASM__
+CFLAGS = -c -Wall $(RPM_OPT_FLAGS) -D__LINUX__ $(ASMFLAGS)
 LFLAGS = -L../lib/Linux -laudio
 
 OBJS = audio.o wavfile.o xmfile.o s3mfile.o modfile.o mtmfile.o \
-	iofile.o modeng.o nondrv.o mixdrv.o lnxdrv.o _mixdrv.o
+	iofile.o modeng.o nondrv.o mixdrv.o lnxdrv.o
+	
+ASMOBJS = _mixdrv.o
 
 LIB = ../lib/Linux/libaudio.a
 
@@ -19,8 +22,8 @@
 	$(CC) -o mp mp.o $(LFLAGS)
 	$(STRIP) mp
 
-$(LIB) : $(OBJS)
-	$(AR) rc $(LIB) $(OBJS)
+$(LIB) : $(OBJS) $(ASMOBJS)
+	$(AR) rc $(LIB) $(OBJS) $(ASMOBJS)
 	$(RANLIB) $(LIB)
 
 .c.o:
--- src/_mixdrv.S
+++ src/_mixdrv.S
@@ -18,7 +18,11 @@
 /* assembly linkage macros */
 #ifdef __LINUX__
 #define __ASSEMBLY__
-#include <linux/linkage.h>
+//#include <linux/linkage.h>
+#define SYMBOL_NAME(name) name
+#define SYMBOL_NAME_LABEL(name) name##:
+#define ALIGN .align 4,0x90
+#define ENTRY(name) .globl SYMBOL_NAME(name); ALIGN; SYMBOL_NAME_LABEL(name)
 #else
 #ifdef __BEOS__
 #define ALIGN .align 4,0x90
--- src/audio.h
+++ src/audio.h
@@ -293,9 +293,9 @@
     } AUDIOTRACK, *LPAUDIOTRACK;
 
 /* audio callback function defines */
-    typedef VOID (AIAPI* LPFNAUDIOWAVE)(LPBYTE, UINT);
-    typedef VOID (AIAPI* LPFNAUDIOTIMER)(VOID);
-    typedef VOID (AIAPI* LPFNAUDIOCALLBACK)(BYTE, UINT, UINT);
+    typedef void (AIAPI* LPFNAUDIOWAVE)(LPBYTE, UINT);
+    typedef void (AIAPI* LPFNAUDIOTIMER)(void);
+    typedef void (AIAPI* LPFNAUDIOCALLBACK)(BYTE, UINT, UINT);
 
 /* audio handle defines */
     typedef HANDLE  HAC;
@@ -304,28 +304,28 @@
 #pragma pack()
 
 /* audio interface API prototypes */
-    UINT AIAPI AInitialize(VOID);
-    UINT AIAPI AGetVersion(VOID);
-    UINT AIAPI AGetAudioNumDevs(VOID);
+    UINT AIAPI AInitialize(void);
+    UINT AIAPI AGetVersion(void);
+    UINT AIAPI AGetAudioNumDevs(void);
     UINT AIAPI AGetAudioDevCaps(UINT nDeviceId, LPAUDIOCAPS lpCaps);
     UINT AIAPI AGetErrorText(UINT nErrorCode, LPSTR lpText, UINT nSize);
 
     UINT AIAPI APingAudio(LPUINT lpnDeviceId);
     UINT AIAPI AOpenAudio(LPAUDIOINFO lpInfo);
-    UINT AIAPI ACloseAudio(VOID);
-    UINT AIAPI AUpdateAudio(VOID);
+    UINT AIAPI ACloseAudio(void);
+    UINT AIAPI AUpdateAudio(void);
     UINT AIAPI AUpdateAudioEx(UINT nFrames);
 
     UINT AIAPI ASetAudioMixerValue(UINT nChannel, UINT nValue);
 
     UINT AIAPI AOpenVoices(UINT nVoices);
-    UINT AIAPI ACloseVoices(VOID);
+    UINT AIAPI ACloseVoices(void);
 
     UINT AIAPI ASetAudioCallback(LPFNAUDIOWAVE lpfnAudioWave);
     UINT AIAPI ASetAudioTimerProc(LPFNAUDIOTIMER lpfnAudioTimer);
     UINT AIAPI ASetAudioTimerRate(UINT nTimerRate);
 
-    LONG AIAPI AGetAudioDataAvail(VOID);
+    LONG AIAPI AGetAudioDataAvail(void);
     UINT AIAPI ACreateAudioData(LPAUDIOWAVE lpWave);
     UINT AIAPI ADestroyAudioData(LPAUDIOWAVE lpWave);
     UINT AIAPI AWriteAudioData(LPAUDIOWAVE lpWave, DWORD dwOffset, UINT nCount);
@@ -350,9 +350,9 @@
     UINT AIAPI AGetVoiceStatus(HAC hVoice, LPBOOL lpnStatus);
 
     UINT AIAPI APlayModule(LPAUDIOMODULE lpModule);
-    UINT AIAPI AStopModule(VOID);
-    UINT AIAPI APauseModule(VOID);
-    UINT AIAPI AResumeModule(VOID);
+    UINT AIAPI AStopModule(void);
+    UINT AIAPI APauseModule(void);
+    UINT AIAPI AResumeModule(void);
     UINT AIAPI ASetModuleVolume(UINT nVolume);
     UINT AIAPI ASetModulePosition(UINT nOrder, UINT nRow);
     UINT AIAPI AGetModuleVolume(LPUINT lpnVolume);

Places

File seal-1.07.dif of Package seal

Places