diff --git a/README.md b/README.md index cecf275..9b48f6e 100644 --- a/README.md +++ b/README.md @@ -27,9 +27,9 @@ I have ported to Windows, X11, and Soso. Just look at (doomgeneric_win.c or doom Note that X11 port is not efficient since it generates pixmap by XDrawPoint. It can be further improved by using X11 extensions. -## OSX +## SDL -![OSX](screenshots/osx.png) +![SDL](screenshots/sdl.png) ## Windows ![Windows](screenshots/windows.png) diff --git a/doomgeneric/DOOM1.WAD b/doomgeneric/DOOM1.WAD deleted file mode 100644 index 1a58f66..0000000 Binary files a/doomgeneric/DOOM1.WAD and /dev/null differ diff --git a/doomgeneric/Makefile.osx b/doomgeneric/Makefile.sdl similarity index 96% rename from doomgeneric/Makefile.osx rename to doomgeneric/Makefile.sdl index 2458c01..a694125 100644 --- a/doomgeneric/Makefile.osx +++ b/doomgeneric/Makefile.sdl @@ -26,7 +26,7 @@ LIBS+=-lm -lc -lSDL2 OBJDIR=build OUTPUT=doomgeneric -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_osx.o +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_sdl.o OBJS += $(addprefix $(OBJDIR)/, $(SRC_DOOM)) all: $(OUTPUT) diff --git a/doomgeneric/doomgeneric b/doomgeneric/doomgeneric deleted file mode 100755 index 6f9fefb..0000000 Binary files a/doomgeneric/doomgeneric and /dev/null differ diff --git a/doomgeneric/doomgeneric_osx.c b/doomgeneric/doomgeneric_sdl.c similarity index 100% rename from doomgeneric/doomgeneric_osx.c rename to doomgeneric/doomgeneric_sdl.c diff --git a/screenshots/osx.png b/screenshots/sdl.png similarity index 100% rename from screenshots/osx.png rename to screenshots/sdl.png