shithub: duke3d

Download patch

ref: 59e2ab3e7f70b6ac26f93f656977bafdff107233
parent: 64be9ec2f0fc074cdbbc0e9c8eda6ada27148fb1
author: fabien sanglard <[email protected]>
date: Sat Dec 15 23:01:00 EST 2012 

Fixed MacOS X build (Clang found function declaration/definitions discrepancies


--- a/Engine/src/a.h
+++ b/Engine/src/a.h
@@ -22,9 +22,9 @@
 void sethlinesizes(int32_t,int32_t,int32_t);
 void setpalookupaddress(uint8_t  *);
 
-void hlineasm4(int32_t,int32_t,int32_t,int32_t,int32_t,int32_t);
+void hlineasm4(int32_t,uint32_t,int32_t,uint32_t,uint32_t,int32_t);
 void setuprhlineasm4(int32_t,int32_t,int32_t,int32_t,int32_t,int32_t);
-void rhlineasm4(int32_t,int32_t,int32_t,int32_t,int32_t,int32_t);
+void rhlineasm4(int32_t,int32_t,int32_t,uint32_t,uint32_t,int32_t);
 void setuprmhlineasm4(int32_t,int32_t,int32_t,int32_t,int32_t,int32_t);
 void rmhlineasm4(int32_t,int32_t,int32_t,int32_t,int32_t,int32_t);
 
@@ -36,7 +36,7 @@
 void setuptvlineasm(int32_t);
 int32_t tvlineasm1(int32_t,int32_t,int32_t,int32_t,int32_t,int32_t);
 void setuptvlineasm2(int32_t,int32_t,int32_t);
-void tvlineasm2(int32_t,int32_t,int32_t,int32_t,int32_t,int32_t);
+void tvlineasm2(uint32_t,uint32_t,uint32_t,uint32_t,uint32_t,uint32_t);
 int32_t mvlineasm1(int32_t,int32_t,int32_t,int32_t,int32_t,int32_t);
 void setupvlineasm(int32_t);
 void vlineasm4(int32_t,int32_t);
@@ -43,19 +43,19 @@
 void setupmvlineasm(int32_t);
 void mvlineasm4(int32_t,int32_t);
 void setupspritevline(int32_t,int32_t,int32_t,int32_t,int32_t,int32_t);
-void spritevline(int32_t,int32_t,int32_t,int32_t,int32_t,int32_t);
+void spritevline(int32_t,uint32_t,int32_t,uint32_t,int32_t,int32_t);
 void msetupspritevline(int32_t,int32_t,int32_t,int32_t,int32_t,int32_t);
 void mspritevline(int32_t,int32_t,int32_t,int32_t,int32_t,int32_t);
 void tsetupspritevline(int32_t,int32_t,int32_t,int32_t,int32_t,int32_t);
-void tspritevline(int32_t,int32_t,int32_t,int32_t,int32_t,int32_t);
+void tspritevline(int32_t,int32_t,int32_t,uint32_t,int32_t,int32_t);
 void mhline(int32_t,int32_t,int32_t,int32_t,int32_t,int32_t);
-void mhlineskipmodify(int32_t,int32_t,int32_t,int32_t,int32_t,int32_t);
+void mhlineskipmodify(int32_t,uint32_t,uint32_t,int32_t,int32_t,int32_t);
 void msethlineshift(int32_t,int32_t);
 void thline(int32_t,int32_t,int32_t,int32_t,int32_t,int32_t);
-void thlineskipmodify(int32_t,int32_t,int32_t,int32_t,int32_t,int32_t);
+void thlineskipmodify(int32_t,uint32_t,uint32_t,int32_t,int32_t,int32_t);
 void tsethlineshift(int32_t,int32_t);
 void setupslopevlin(int32_t,int32_t,int32_t);
-void slopevlin(int32_t,int32_t,int32_t,int32_t,int32_t,int32_t);
+void slopevlin(int32_t,uint32_t,int32_t,int32_t,int32_t,int32_t);
 #define TRANS_NORMAL  0
 #define TRANS_REVERSE 1
 void settrans(int32_t type);
@@ -73,7 +73,7 @@
 //VISUALIZE RENDERER
 
 #define MAX_PIXEL_RENDERERED (800*600)
-extern int pixelsAllowed;
+extern uint32_t pixelsAllowed;
 
 #define RENDER_DRAW_WALL_BORDERS 1
 #define RENDER_DRAW_WALL_INSIDE 1
@@ -82,7 +82,7 @@
 #define RENDER_SLOPPED_CEILING_AND_FLOOR 1
 
 #if RENDER_DRAW_WALL_BORDERS && RENDER_DRAW_WALL_INSIDE && RENDER_DRAW_CEILING_AND_FLOOR  && RENDER_DRAW_TOP_AND_BOTTOM_COLUMN && RENDER_SLOPPED_CEILING_AND_FLOOR && MAX_PIXEL_RENDERERED!=0
-   #define CLEAR_FRAMEBUFFER 1
+   #define CLEAR_FRAMEBUFFER 0
 #else
    #define CLEAR_FRAMEBUFFER 1
 #endif
--- a/Game/src/audiolib/music.h
+++ b/Game/src/audiolib/music.h
@@ -81,7 +81,7 @@
 void  MUSIC_Continue( void );
 void  MUSIC_Pause( void );
 int   MUSIC_StopSong( void );
-int   MUSIC_PlaySong( uint8_t* songData, int loopflag );
+int   MUSIC_PlaySong( char* songData, int loopflag );
 void  MUSIC_SetContext( int context );
 int   MUSIC_GetContext( void );
 void  MUSIC_SetSongTick( uint32_t PositionInTicks );
--- a/xcode/Duke3D.xcodeproj/project.pbxproj
+++ b/xcode/Duke3D.xcodeproj/project.pbxproj
@@ -36,7 +36,6 @@
 		2D7B627716788F9B00E35E54 /* global.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D7B625416788F9B00E35E54 /* global.c */; };
 		2D7B627816788F9B00E35E54 /* keyboard.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D7B625616788F9B00E35E54 /* keyboard.c */; };
 		2D7B627916788F9B00E35E54 /* menues.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D7B625816788F9B00E35E54 /* menues.c */; };
-		2D7B627A16788F9B00E35E54 /* win_midiout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D7B625B16788F9B00E35E54 /* win_midiout.cpp */; };
 		2D7B627C16788F9B00E35E54 /* player.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D7B626116788F9B00E35E54 /* player.c */; };
 		2D7B627D16788F9B00E35E54 /* premap.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D7B626216788F9B00E35E54 /* premap.c */; };
 		2D7B627E16788F9B00E35E54 /* rts.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D7B626316788F9B00E35E54 /* rts.c */; };
@@ -144,7 +143,6 @@
 		2D7B625616788F9B00E35E54 /* keyboard.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = keyboard.c; path = ../../Game/src/keyboard.c; sourceTree = "<group>"; };
 		2D7B625716788F9B00E35E54 /* keyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = keyboard.h; path = ../../Game/src/keyboard.h; sourceTree = "<group>"; };
 		2D7B625816788F9B00E35E54 /* menues.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = menues.c; path = ../../Game/src/menues.c; sourceTree = "<group>"; };
-		2D7B625B16788F9B00E35E54 /* win_midiout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = win_midiout.cpp; sourceTree = "<group>"; };
 		2D7B625F16788F9B00E35E54 /* mouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mouse.h; path = ../../Game/src/mouse.h; sourceTree = "<group>"; };
 		2D7B626016788F9B00E35E54 /* names.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = names.h; path = ../../Game/src/names.h; sourceTree = "<group>"; };
 		2D7B626116788F9B00E35E54 /* player.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = player.c; path = ../../Game/src/player.c; sourceTree = "<group>"; };
@@ -347,7 +345,6 @@
 		2D7B625916788F9B00E35E54 /* midi */ = {
 			isa = PBXGroup;
 			children = (
-				2D7B625B16788F9B00E35E54 /* win_midiout.cpp */,
 				2D4FB6FE167D430F00915887 /* sdl_midi.c */,
 			);
 			name = midi;
@@ -448,7 +445,6 @@
 				2D7B627716788F9B00E35E54 /* global.c in Sources */,
 				2D7B627816788F9B00E35E54 /* keyboard.c in Sources */,
 				2D7B627916788F9B00E35E54 /* menues.c in Sources */,
-				2D7B627A16788F9B00E35E54 /* win_midiout.cpp in Sources */,
 				2D7B627C16788F9B00E35E54 /* player.c in Sources */,
 				2D7B627D16788F9B00E35E54 /* premap.c in Sources */,
 				2D7B627E16788F9B00E35E54 /* rts.c in Sources */,