Skip to content

Commit 2019640

Browse files
committed
doom soso port update
1 parent 0f488ee commit 2019640

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

doomgeneric/Makefile.soso

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ CC=soso-clang # gcc or g++
1616
CFLAGS+=-O3
1717
LDFLAGS+=$(SOSO_ROOT)/lib/crt1.o $(SOSO_ROOT)/lib/crti.o $(SOSO_ROOT)/lib/crtn.o
1818
CFLAGS+=-Wall -DNORMALUNIX -DLINUX -DSNDSERV -D_DEFAULT_SOURCE # -DUSEASM
19-
LIBS+=-lsosousdk -lm -lc /usr/lib/llvm-10/lib/clang/10.0.0/lib/linux/libclang_rt.builtins-i386.a
19+
LIBS+=-lm -lc /usr/lib/llvm-10/lib/clang/10.0.0/lib/linux/libclang_rt.builtins-i386.a
2020

2121
# subdirectory for objects
2222
OBJDIR=build
23-
OUTPUT=doom-soso
23+
OUTPUT=fbdoom
2424

2525
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
2626
OBJS += $(addprefix $(OBJDIR)/, $(SRC_DOOM))

doomgeneric/doomgeneric_soso.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212
#include <sys/ioctl.h>
1313
#include <sys/mman.h>
1414

15-
#include <sosousdk.h>
1615
#include <termios.h>
1716

17+
#include <soso.h>
18+
1819
static int FrameBufferFd = -1;
1920
static int* FrameBuffer = 0;
2021

@@ -225,12 +226,12 @@ void DG_DrawFrame()
225226

226227
void DG_SleepMs(uint32_t ms)
227228
{
228-
sleepMilliseconds(ms);
229+
sleep_ms(ms);
229230
}
230231

231232
uint32_t DG_GetTicksMs()
232233
{
233-
return getUptimeMilliseconds();
234+
return get_uptime_ms();
234235
}
235236

236237
int DG_GetKey(int* pressed, unsigned char* doomKey)

0 commit comments

Comments
 (0)