Changeset 080ef6eb120d94ba7ceaa89dffe9cd284d9a3975

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

Location:

bor

Files:

• Makefile (modified) (1 diff)
• defs.h (added)
• gamelib3/Makefile (modified) (1 diff)
• gamelib3/control.c (modified) (1 diff)
• gamelib3/defs.h (deleted)
• gamelib3/joy.h (modified) (1 diff)
• gamelib3/subsystems/Makefile (modified) (1 diff)
• gamelib3/subsystems/sdl/Makefile (modified) (1 diff)
• gamelib3/subsystems/sdl/asmcopy.c (added)
• gamelib3/subsystems/sdl/joy.c (added)
• gamelib3/subsystems/sdl/keyboard.c (added)
• gamelib3/subsystems/sdl/rand32.c (modified) (1 diff)
• gamelib3/subsystems/sdl/sblaster.c (added)
• gamelib3/subsystems/sdl/timer.c (added)
• gamelib3/subsystems/sdl/vga.c (added)
• gamelib3/subsystems/sdl/video.c (modified) (1 diff)
• gamelib3/timer.h (modified) (1 diff)
• gamelib3/video.h (modified) (1 diff)
• openbor.c (modified) (5 diffs)

bor/Makefile

@@ -1 +1 @@
 OBJECTS = openbor.o
 CFLAGS = -Igamelib3
+LDFLAGS = -Lgamelib3 -Lgamelib3/subsystems
 
-all: $(OBJECTS) gamelib3/gamelib3.a
-        $(LD) -o openbor $(OBJECTS) gamelib3/gamelib3.a
+all:
+        $(MAKE) -C gamelib3
+        gcc -o openbor $(OBJECTS) $(LDFLAGS) -lgamelib3 -lsubsystem -lm -lcurses
+
+openbor: $(OBJECTS) gamelib3
+        gcc -o openbor $(OBJECTS) $(LDFLAGS) -lgamelib3 -lsubsystem -lm -lcurses
+
+gamelib3:
+        $(MAKE) -C gamelib3
 
 clean:
         $(MAKE) -C gamelib3 clean
+        rm -f openbor *.o
 
-gamelib3/gamelib3.a:
-        $(MAKE) -C gamelib3
+distclean: clean
+        rm -f settings.sav

bor/gamelib3/Makefile

@@ -1 +1 @@
 export SUBSYSTEM = sdl
 OBJECTS = adpcm.o anigif.o bitmap.o control.o draw.o font.o loadimg.o packfile.o palette.o savepcx.o screen.o soundmix.o sprite.o spriteq.o ssprite.o texture.o
-CFLAGS =
+CFLAGS = -I..
+OUTPUT = libgamelib3.a
 
-all: gamelib3.a subsystems/subsystem.a
 
-gamelib3.a: $(OBJECTS)
-        ar rcs gamelib3.a $(OBJECTS)
+$(OUTPUT): $(OBJECTS) subsystem
+        ar rcs $(OUTPUT) $(OBJECTS)
 
-subsystems/subsystem.a: 
+subsystem: 
         $(MAKE) -C subsystems
 
 clean:
-        rm *.o gamelib3.a
+        $(MAKE) -C subsystems clean     
+        rm -f *.o $(OUTPUT)
+

bor/gamelib3/control.c

@@ -196 +196 @@
         joy_exit();
         usejoy = 0;
+#ifndef __linux__
         while(kbhit()) getch();
+#endif
 }
 

bor/gamelib3/joy.h

@@ -6 +6 @@
 #define JOY_H
 
+#include "defs.h"
 
 #define         JOY_1           0x0010

bor/gamelib3/subsystems/Makefile

@@ -1 @@
-$(SUBSYSTEM)/$(SUBSYSTEM).a:
+all: $(SUBSYSTEM)/lib$(SUBSYSTEM).a
+        cp $(SUBSYSTEM)/lib$(SUBSYSTEM).a libsubsystem.a
+
+$(SUBSYSTEM)/lib$(SUBSYSTEM).a:
         $(MAKE) -C $(SUBSYSTEM)
-        cp $(SUBSYSTEM)/$(SUBSYSTEM).a subsystem.a
 
 clean:
         $(MAKE) -C dos clean
         $(MAKE) -C sdl clean
-        rm subsystem.a 
+        rm -f libsubsystem.a 

bor/gamelib3/subsystems/sdl/Makefile

@@ -1 @@
-OBJECTS = rand32.o
+OBJECTS = rand32.o video.o vga.o timer.o sblaster.o keyboard.o joy.o asmcopy.o
+OUTPUT = libsdl.a
+CFLAGS =  -I../../ -I../../../
 
-all: sdl.a
+all: $(OUTPUT)
 
-sdl.a: $(OBJECTS)
-        ar rcs sdl.a $(OBJECTS)
+$(OUTPUT): $(OBJECTS)
+        ar rcs $(OUTPUT) $(OBJECTS)
 
 clean:
-        rm *.o sdl.a 
+        rm -f *.o $(OUTPUT)

bor/gamelib3/subsystems/sdl/rand32.c

@@ -1 +1 @@
 #include <stdlib.h>
-#include "../../rand32.h"
+#include "rand32.h"
 
 unsigned int rand32(void) {

bor/gamelib3/subsystems/sdl/video.c

@@ -1 @@
- 
+#include "video.h"
+
+s_vram current_videomode;
+
+int video_set_mode(int width, int height) {
+  return 0;
+}
+
+int video_copy_screen(s_screen *screen) {
+  return 0;
+}
+
+void video_clearscreen(void) {
+
+}

bor/gamelib3/timer.h

@@ -14 +14 @@
 */
 
-
+#include "defs.h"
 
 #define         PIT_FREQ        1193181

bor/gamelib3/video.h

@@ -2 +2 @@
 #define VIDEO_H
 
+#include "defs.h"
+#include "types.h"
 
 extern s_vram current_videomode;

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;
+}
+
+
+
+
+
+