doom soso port update

diff --git a/doomgeneric/Makefile.soso b/doomgeneric/Makefile.soso
index 86b0e24f1bfd88e7189cd3757886caffe9f84afd..cf028fa104217a042e88a73d9437b6638cc7f11e 100644 (file)
--- a/doomgeneric/Makefile.soso
+++ b/doomgeneric/Makefile.soso
@@ -16,11 +16,11 @@ CC=soso-clang  # gcc or g++
 CFLAGS+=-O3
 LDFLAGS+=$(SOSO_ROOT)/lib/crt1.o $(SOSO_ROOT)/lib/crti.o $(SOSO_ROOT)/lib/crtn.o
 CFLAGS+=-Wall -DNORMALUNIX -DLINUX -DSNDSERV -D_DEFAULT_SOURCE # -DUSEASM
-LIBS+=-lsosousdk -lm -lc /usr/lib/llvm-10/lib/clang/10.0.0/lib/linux/libclang_rt.builtins-i386.a
+LIBS+=-lm -lc /usr/lib/llvm-10/lib/clang/10.0.0/lib/linux/libclang_rt.builtins-i386.a
 
 # subdirectory for objects
 OBJDIR=build
-OUTPUT=doom-soso
+OUTPUT=fbdoom
 
 SRC_DOOM = i_main.o dummy.o am_map.o doomdef.o doomstat.o dstrings.o d_event.o d_items.o d_iwad.o d_loop.o d_main.o d_mode.o d_net.o f_finale.o f_wipe.o g_game.o hu_lib.o hu_stuff.o info.o i_cdmus.o i_endoom.o i_joystick.o i_scale.o i_sound.o i_system.o i_timer.o memio.o m_argv.o m_bbox.o m_cheat.o m_config.o m_controls.o m_fixed.o m_menu.o m_misc.o m_random.o p_ceilng.o p_doors.o p_enemy.o p_floor.o p_inter.o p_lights.o p_map.o p_maputl.o p_mobj.o p_plats.o p_pspr.o p_saveg.o p_setup.o p_sight.o p_spec.o p_switch.o p_telept.o p_tick.o p_user.o r_bsp.o r_data.o r_draw.o r_main.o r_plane.o r_segs.o r_sky.o r_things.o sha1.o sounds.o statdump.o st_lib.o st_stuff.o s_sound.o tables.o v_video.o wi_stuff.o w_checksum.o w_file.o w_main.o w_wad.o z_zone.o w_file_stdc.o i_input.o i_video.o doomgeneric.o doomgeneric_soso.o
 OBJS += $(addprefix $(OBJDIR)/, $(SRC_DOOM))

diff --git a/doomgeneric/doomgeneric_soso.c b/doomgeneric/doomgeneric_soso.c
index 2be12cbe518bf1ca26eb86db3af0f1ace76f1b79..cd4d5fa6aa0fcf1274535d4ec91f3f8ecd8494d8 100644 (file)
--- a/doomgeneric/doomgeneric_soso.c
+++ b/doomgeneric/doomgeneric_soso.c
@@ -12,9 +12,10 @@
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 
-#include <sosousdk.h>
 #include <termios.h>
 
+#include <soso.h>
+
 static int FrameBufferFd = -1;
 static int* FrameBuffer = 0;
 
@@ -225,12 +226,12 @@ void DG_DrawFrame()
 
 void DG_SleepMs(uint32_t ms)
 {
-    sleepMilliseconds(ms);
+    sleep_ms(ms);
 }
 
 uint32_t DG_GetTicksMs()
 {
-    return getUptimeMilliseconds();
+    return get_uptime_ms();
 }
 
 int DG_GetKey(int* pressed, unsigned char* doomKey)