Changeset 080ef6eb120d94ba7ceaa89dffe9cd284d9a3975 for bor/openbor.c

Timestamp:

05/02/06 06:35:49 (6 years ago)

Author:

flupke <flupke@…>

Children:

22b42454812c85824c87192deee05abca95400c4

Parents:

857a6261c268f3b5b020553a4ba51d93d916a9f7

git-committer:

flupke <flupke@…> (05/02/06 06:35:49)

Message:

Tout compile sans erreur, il ne reste plus qu'à combler les trous dans gamelib3/subsystems/sdl
Les makefile sont pas terribles non plus, à finir

git-svn-id:  http://kawa.selfip.org/svn/projects@299 532e76a9-45ae-c241-9c6d-8309ac6440cd

File:

• bor/openbor.c (modified) (5 diffs)

bor/openbor.c

@@ -4 +4 @@
 */
 
+#include "defs.h"
 
 #include <malloc.h>
 #include <stdarg.h>
 #include <string.h>
-#include <io.h>
+#ifdef __linux__
+#  include <asm/io.h>
+#  include <dirent.h>
+#else
+#  include <io.h>
+#  include <conio.h>
+#  include <direct.h>
+#endif
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <conio.h>
-#include <direct.h>
-
-#include "gamelib3\types.h"
-#include "gamelib3\video.h"
-#include "gamelib3\vga.h"
-#include "gamelib3\screen.h"
-#include "gamelib3\loadimg.h"
-#include "gamelib3\bitmap.h"
-#include "gamelib3\sprite.h"
-#include "gamelib3\spriteq.h"
-#include "gamelib3\font.h"
-#include "gamelib3\timer.h"
-#include "gamelib3\savepcx.h"
-#include "gamelib3\rand32.h"
-#include "gamelib3\soundmix.h"
-#include "gamelib3\sblaster.h"
-#include "gamelib3\keyboard.h"
-#include "gamelib3\joy.h"
-#include "gamelib3\control.h"
-#include "gamelib3\draw.h"
-#include "gamelib3\packfile.h"
-#include "gamelib3\palette.h"
-#include "gamelib3\anigif.h"
-#include "gamelib3\texture.h"
+
+#include "gamelib3/types.h"
+#include "gamelib3/video.h"
+#include "gamelib3/vga.h"
+#include "gamelib3/screen.h"
+#include "gamelib3/loadimg.h"
+#include "gamelib3/bitmap.h"
+#include "gamelib3/sprite.h"
+#include "gamelib3/spriteq.h"
+#include "gamelib3/font.h"
+#include "gamelib3/timer.h"
+#include "gamelib3/savepcx.h"
+#include "gamelib3/rand32.h"
+#include "gamelib3/soundmix.h"
+#include "gamelib3/sblaster.h"
+#include "gamelib3/keyboard.h"
+#include "gamelib3/joy.h"
+#include "gamelib3/control.h"
+#include "gamelib3/draw.h"
+#include "gamelib3/packfile.h"
+#include "gamelib3/palette.h"
+#include "gamelib3/anigif.h"
+#include "gamelib3/texture.h"
 
 
@@ -784 +790 @@
 
     while(direntp = readdir(dirp)){
-
+      
+#ifdef __linux__
+        if(direntp->d_type == DT_REG){
+#else
         if(!(direntp->d_attr & (_A_SUBDIR | _A_VOLID | _A_SUBDIR))){
+#endif
 
             // This is a file. Is it a PAK file?
@@ -3194 +3204 @@
 
     level = NULL;
-    free(holesprite);
+    free((void*)holesprite);
 
     levelpos = 0;
@@ -10687 +10697 @@
 // ----------------------------------------------------------------------------
 
-void main(int argc, char **argv){
+int main(int argc, char **argv){
 
     int quit = 0;
@@ -10999 +11009 @@
         VERSION&0xFFFF
     );
-}
-
-
-
-
-
-
+
+    return 0;
+}
+
+
+
+
+
+