diff --git a/Makefile.gc b/Makefile.gc index e1f6560..7305178 100644 --- a/Makefile.gc +++ b/Makefile.gc @@ -17,10 +17,10 @@ include $(DEVKITPPC)/gamecube_rules #--------------------------------------------------------------------------------- TARGET := genplus_cube BUILD := build_cube -SOURCES := source source/m68k source/z80 source/sound source/ntsc source/input_hw source/cd_hw source/cart_hw source/cart_hw/svp \ - source/tremor source/gx source/gx/utils source/gx/gui source/gx/fileio source/gx/images source/gx/sounds -INCLUDES := source source/m68k source/z80 source/sound source/ntsc source/input_hw source/cd_hw source/cart_hw source/cart_hw/svp \ - source/tremor source/gx source/gx/utils source/gx/gui source/gx/fileio source/gx/images source/gx/sounds \ +SOURCES := core core/m68k core/z80 core/sound core/tremor core/ntsc core/input_hw core/cd_hw core/cart_hw core/cart_hw/svp \ + gx gx/utils gx/gui gx/fileio gx/images gx/sounds +INCLUDES := core core/m68k core/z80 core/sound core/tremor core/ntsc core/input_hw core/cd_hw core/cart_hw core/cart_hw/svp \ + gx gx/utils gx/gui gx/fileio gx/images gx/sounds \ $(BUILD) #--------------------------------------------------------------------------------- diff --git a/Makefile.libretro b/Makefile.libretro index a99bb2f..e4e210d 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -2,7 +2,7 @@ DEBUG = 0 LOGSOUND = 0 FRONTEND_SUPPORTS_RGB565 = 1 -GENPLUS_SRC_DIR := source +GENPLUS_SRC_DIR := core LIBRETRO_DIR := libretro ifeq ($(platform),) diff --git a/Makefile.wii b/Makefile.wii index ea93c64..10db880 100644 --- a/Makefile.wii +++ b/Makefile.wii @@ -17,10 +17,10 @@ include $(DEVKITPPC)/wii_rules #--------------------------------------------------------------------------------- TARGET := genplus_wii BUILD := build_wii -SOURCES := source source/m68k source/z80 source/sound source/ntsc source/input_hw source/cd_hw source/cart_hw source/cart_hw/svp \ - source/tremor source/gx source/gx/utils source/gx/gui source/gx/fileio source/gx/images source/gx/sounds -INCLUDES := source source/m68k source/z80 source/sound source/ntsc source/input_hw source/cd_hw source/cart_hw source/cart_hw/svp \ - source/tremor source/gx source/gx/utils source/gx/gui source/gx/fileio source/gx/images source/gx/sounds \ +SOURCES := core core/m68k core/z80 core/sound core/tremor core/ntsc core/input_hw core/cd_hw core/cart_hw core/cart_hw/svp \ + gx gx/utils gx/gui gx/fileio gx/images gx/sounds +INCLUDES := core core/m68k core/z80 core/sound core/tremor core/ntsc core/input_hw core/cd_hw core/cart_hw core/cart_hw/svp \ + gx gx/utils gx/gui gx/fileio gx/images gx/sounds \ $(BUILD) #--------------------------------------------------------------------------------- diff --git a/source/gx/config.c b/gx/config.c similarity index 100% rename from source/gx/config.c rename to gx/config.c diff --git a/source/gx/config.h b/gx/config.h similarity index 100% rename from source/gx/config.h rename to gx/config.h diff --git a/source/gx/fileio/file_load.c b/gx/fileio/file_load.c similarity index 100% rename from source/gx/fileio/file_load.c rename to gx/fileio/file_load.c diff --git a/source/gx/fileio/file_load.h b/gx/fileio/file_load.h similarity index 100% rename from source/gx/fileio/file_load.h rename to gx/fileio/file_load.h diff --git a/source/gx/fileio/file_slot.c b/gx/fileio/file_slot.c similarity index 100% rename from source/gx/fileio/file_slot.c rename to gx/fileio/file_slot.c diff --git a/source/gx/fileio/file_slot.h b/gx/fileio/file_slot.h similarity index 100% rename from source/gx/fileio/file_slot.h rename to gx/fileio/file_slot.h diff --git a/source/gx/fileio/fileio.c b/gx/fileio/fileio.c similarity index 100% rename from source/gx/fileio/fileio.c rename to gx/fileio/fileio.c diff --git a/source/gx/fileio/fileio.h b/gx/fileio/fileio.h similarity index 100% rename from source/gx/fileio/fileio.h rename to gx/fileio/fileio.h diff --git a/source/gx/fileio/history.c b/gx/fileio/history.c similarity index 100% rename from source/gx/fileio/history.c rename to gx/fileio/history.c diff --git a/source/gx/fileio/history.h b/gx/fileio/history.h similarity index 100% rename from source/gx/fileio/history.h rename to gx/fileio/history.h diff --git a/source/gx/gui/cheats.c b/gx/gui/cheats.c similarity index 100% rename from source/gx/gui/cheats.c rename to gx/gui/cheats.c diff --git a/source/gx/gui/cheats.h b/gx/gui/cheats.h similarity index 100% rename from source/gx/gui/cheats.h rename to gx/gui/cheats.h diff --git a/source/gx/gui/filesel.c b/gx/gui/filesel.c similarity index 100% rename from source/gx/gui/filesel.c rename to gx/gui/filesel.c diff --git a/source/gx/gui/filesel.h b/gx/gui/filesel.h similarity index 100% rename from source/gx/gui/filesel.h rename to gx/gui/filesel.h diff --git a/source/gx/gui/font.c b/gx/gui/font.c similarity index 100% rename from source/gx/gui/font.c rename to gx/gui/font.c diff --git a/source/gx/gui/font.h b/gx/gui/font.h similarity index 100% rename from source/gx/gui/font.h rename to gx/gui/font.h diff --git a/source/gx/gui/gui.c b/gx/gui/gui.c similarity index 100% rename from source/gx/gui/gui.c rename to gx/gui/gui.c diff --git a/source/gx/gui/gui.h b/gx/gui/gui.h similarity index 100% rename from source/gx/gui/gui.h rename to gx/gui/gui.h diff --git a/source/gx/gui/legal.c b/gx/gui/legal.c similarity index 100% rename from source/gx/gui/legal.c rename to gx/gui/legal.c diff --git a/source/gx/gui/menu.c b/gx/gui/menu.c similarity index 100% rename from source/gx/gui/menu.c rename to gx/gui/menu.c diff --git a/source/gx/gui/menu.h b/gx/gui/menu.h similarity index 100% rename from source/gx/gui/menu.h rename to gx/gui/menu.h diff --git a/source/gx/gui/saveicon.h b/gx/gui/saveicon.h similarity index 100% rename from source/gx/gui/saveicon.h rename to gx/gui/saveicon.h diff --git a/source/gx/gx_audio.c b/gx/gx_audio.c similarity index 100% rename from source/gx/gx_audio.c rename to gx/gx_audio.c diff --git a/source/gx/gx_audio.h b/gx/gx_audio.h similarity index 100% rename from source/gx/gx_audio.h rename to gx/gx_audio.h diff --git a/source/gx/gx_input.c b/gx/gx_input.c similarity index 100% rename from source/gx/gx_input.c rename to gx/gx_input.c diff --git a/source/gx/gx_input.h b/gx/gx_input.h similarity index 100% rename from source/gx/gx_input.h rename to gx/gx_input.h diff --git a/source/gx/gx_video.c b/gx/gx_video.c similarity index 100% rename from source/gx/gx_video.c rename to gx/gx_video.c diff --git a/source/gx/gx_video.h b/gx/gx_video.h similarity index 100% rename from source/gx/gx_video.h rename to gx/gx_video.h diff --git a/source/gx/images/Banner_bottom.png b/gx/images/Banner_bottom.png similarity index 100% rename from source/gx/images/Banner_bottom.png rename to gx/images/Banner_bottom.png diff --git a/source/gx/images/Banner_main.png b/gx/images/Banner_main.png similarity index 100% rename from source/gx/images/Banner_main.png rename to gx/images/Banner_main.png diff --git a/source/gx/images/Banner_top.png b/gx/images/Banner_top.png similarity index 100% rename from source/gx/images/Banner_top.png rename to gx/images/Banner_top.png diff --git a/source/gx/images/Bg_credits.png b/gx/images/Bg_credits.png similarity index 100% rename from source/gx/images/Bg_credits.png rename to gx/images/Bg_credits.png diff --git a/source/gx/images/Bg_intro_c1.png b/gx/images/Bg_intro_c1.png similarity index 100% rename from source/gx/images/Bg_intro_c1.png rename to gx/images/Bg_intro_c1.png diff --git a/source/gx/images/Bg_intro_c2.png b/gx/images/Bg_intro_c2.png similarity index 100% rename from source/gx/images/Bg_intro_c2.png rename to gx/images/Bg_intro_c2.png diff --git a/source/gx/images/Bg_intro_c3.png b/gx/images/Bg_intro_c3.png similarity index 100% rename from source/gx/images/Bg_intro_c3.png rename to gx/images/Bg_intro_c3.png diff --git a/source/gx/images/Bg_intro_c4.png b/gx/images/Bg_intro_c4.png similarity index 100% rename from source/gx/images/Bg_intro_c4.png rename to gx/images/Bg_intro_c4.png diff --git a/source/gx/images/Bg_layer.png b/gx/images/Bg_layer.png similarity index 100% rename from source/gx/images/Bg_layer.png rename to gx/images/Bg_layer.png diff --git a/source/gx/images/Bg_overlay.png b/gx/images/Bg_overlay.png similarity index 100% rename from source/gx/images/Bg_overlay.png rename to gx/images/Bg_overlay.png diff --git a/source/gx/images/Browser_dir.png b/gx/images/Browser_dir.png similarity index 100% rename from source/gx/images/Browser_dir.png rename to gx/images/Browser_dir.png diff --git a/source/gx/images/Button_arrow.png b/gx/images/Button_arrow.png similarity index 100% rename from source/gx/images/Button_arrow.png rename to gx/images/Button_arrow.png diff --git a/source/gx/images/Button_arrow_over.png b/gx/images/Button_arrow_over.png similarity index 100% rename from source/gx/images/Button_arrow_over.png rename to gx/images/Button_arrow_over.png diff --git a/source/gx/images/Button_delete.png b/gx/images/Button_delete.png similarity index 100% rename from source/gx/images/Button_delete.png rename to gx/images/Button_delete.png diff --git a/source/gx/images/Button_delete_over.png b/gx/images/Button_delete_over.png similarity index 100% rename from source/gx/images/Button_delete_over.png rename to gx/images/Button_delete_over.png diff --git a/source/gx/images/Button_digit.png b/gx/images/Button_digit.png similarity index 100% rename from source/gx/images/Button_digit.png rename to gx/images/Button_digit.png diff --git a/source/gx/images/Button_digit_over.png b/gx/images/Button_digit_over.png similarity index 100% rename from source/gx/images/Button_digit_over.png rename to gx/images/Button_digit_over.png diff --git a/source/gx/images/Button_down.png b/gx/images/Button_down.png similarity index 100% rename from source/gx/images/Button_down.png rename to gx/images/Button_down.png diff --git a/source/gx/images/Button_down_over.png b/gx/images/Button_down_over.png similarity index 100% rename from source/gx/images/Button_down_over.png rename to gx/images/Button_down_over.png diff --git a/source/gx/images/Button_icon.png b/gx/images/Button_icon.png similarity index 100% rename from source/gx/images/Button_icon.png rename to gx/images/Button_icon.png diff --git a/source/gx/images/Button_icon_over.png b/gx/images/Button_icon_over.png similarity index 100% rename from source/gx/images/Button_icon_over.png rename to gx/images/Button_icon_over.png diff --git a/source/gx/images/Button_icon_sm.png b/gx/images/Button_icon_sm.png similarity index 100% rename from source/gx/images/Button_icon_sm.png rename to gx/images/Button_icon_sm.png diff --git a/source/gx/images/Button_icon_sm_over.png b/gx/images/Button_icon_sm_over.png similarity index 100% rename from source/gx/images/Button_icon_sm_over.png rename to gx/images/Button_icon_sm_over.png diff --git a/source/gx/images/Button_load.png b/gx/images/Button_load.png similarity index 100% rename from source/gx/images/Button_load.png rename to gx/images/Button_load.png diff --git a/source/gx/images/Button_load_over.png b/gx/images/Button_load_over.png similarity index 100% rename from source/gx/images/Button_load_over.png rename to gx/images/Button_load_over.png diff --git a/source/gx/images/Button_save.png b/gx/images/Button_save.png similarity index 100% rename from source/gx/images/Button_save.png rename to gx/images/Button_save.png diff --git a/source/gx/images/Button_save_over.png b/gx/images/Button_save_over.png similarity index 100% rename from source/gx/images/Button_save_over.png rename to gx/images/Button_save_over.png diff --git a/source/gx/images/Button_sm_blue.png b/gx/images/Button_sm_blue.png similarity index 100% rename from source/gx/images/Button_sm_blue.png rename to gx/images/Button_sm_blue.png diff --git a/source/gx/images/Button_sm_grey.png b/gx/images/Button_sm_grey.png similarity index 100% rename from source/gx/images/Button_sm_grey.png rename to gx/images/Button_sm_grey.png diff --git a/source/gx/images/Button_sm_yellow.png b/gx/images/Button_sm_yellow.png similarity index 100% rename from source/gx/images/Button_sm_yellow.png rename to gx/images/Button_sm_yellow.png diff --git a/source/gx/images/Button_special.png b/gx/images/Button_special.png similarity index 100% rename from source/gx/images/Button_special.png rename to gx/images/Button_special.png diff --git a/source/gx/images/Button_special_over.png b/gx/images/Button_special_over.png similarity index 100% rename from source/gx/images/Button_special_over.png rename to gx/images/Button_special_over.png diff --git a/source/gx/images/Button_text.png b/gx/images/Button_text.png similarity index 100% rename from source/gx/images/Button_text.png rename to gx/images/Button_text.png diff --git a/source/gx/images/Button_text_over.png b/gx/images/Button_text_over.png similarity index 100% rename from source/gx/images/Button_text_over.png rename to gx/images/Button_text_over.png diff --git a/source/gx/images/Button_up.png b/gx/images/Button_up.png similarity index 100% rename from source/gx/images/Button_up.png rename to gx/images/Button_up.png diff --git a/source/gx/images/Button_up_over.png b/gx/images/Button_up_over.png similarity index 100% rename from source/gx/images/Button_up_over.png rename to gx/images/Button_up_over.png diff --git a/source/gx/images/CD_access_off.png b/gx/images/CD_access_off.png similarity index 100% rename from source/gx/images/CD_access_off.png rename to gx/images/CD_access_off.png diff --git a/source/gx/images/CD_access_on.png b/gx/images/CD_access_on.png similarity index 100% rename from source/gx/images/CD_access_on.png rename to gx/images/CD_access_on.png diff --git a/source/gx/images/CD_ready_off.png b/gx/images/CD_ready_off.png similarity index 100% rename from source/gx/images/CD_ready_off.png rename to gx/images/CD_ready_off.png diff --git a/source/gx/images/CD_ready_on.png b/gx/images/CD_ready_on.png similarity index 100% rename from source/gx/images/CD_ready_on.png rename to gx/images/CD_ready_on.png diff --git a/source/gx/images/Cart_gg.png b/gx/images/Cart_gg.png similarity index 100% rename from source/gx/images/Cart_gg.png rename to gx/images/Cart_gg.png diff --git a/source/gx/images/Cart_md.png b/gx/images/Cart_md.png similarity index 100% rename from source/gx/images/Cart_md.png rename to gx/images/Cart_md.png diff --git a/source/gx/images/Cart_ms.png b/gx/images/Cart_ms.png similarity index 100% rename from source/gx/images/Cart_ms.png rename to gx/images/Cart_ms.png diff --git a/source/gx/images/Cart_sg.png b/gx/images/Cart_sg.png similarity index 100% rename from source/gx/images/Cart_sg.png rename to gx/images/Cart_sg.png diff --git a/source/gx/images/Crosshair_p1.png b/gx/images/Crosshair_p1.png similarity index 100% rename from source/gx/images/Crosshair_p1.png rename to gx/images/Crosshair_p1.png diff --git a/source/gx/images/Crosshair_p2.png b/gx/images/Crosshair_p2.png similarity index 100% rename from source/gx/images/Crosshair_p2.png rename to gx/images/Crosshair_p2.png diff --git a/source/gx/images/Ctrl_4wayplay.png b/gx/images/Ctrl_4wayplay.png similarity index 100% rename from source/gx/images/Ctrl_4wayplay.png rename to gx/images/Ctrl_4wayplay.png diff --git a/source/gx/images/Ctrl_activator.png b/gx/images/Ctrl_activator.png similarity index 100% rename from source/gx/images/Ctrl_activator.png rename to gx/images/Ctrl_activator.png diff --git a/source/gx/images/Ctrl_config.png b/gx/images/Ctrl_config.png similarity index 100% rename from source/gx/images/Ctrl_config.png rename to gx/images/Ctrl_config.png diff --git a/source/gx/images/Ctrl_gamepad_md.png b/gx/images/Ctrl_gamepad_md.png similarity index 100% rename from source/gx/images/Ctrl_gamepad_md.png rename to gx/images/Ctrl_gamepad_md.png diff --git a/source/gx/images/Ctrl_gamepad_ms.png b/gx/images/Ctrl_gamepad_ms.png similarity index 100% rename from source/gx/images/Ctrl_gamepad_ms.png rename to gx/images/Ctrl_gamepad_ms.png diff --git a/source/gx/images/Ctrl_justifiers.png b/gx/images/Ctrl_justifiers.png similarity index 100% rename from source/gx/images/Ctrl_justifiers.png rename to gx/images/Ctrl_justifiers.png diff --git a/source/gx/images/Ctrl_lightphaser.png b/gx/images/Ctrl_lightphaser.png similarity index 100% rename from source/gx/images/Ctrl_lightphaser.png rename to gx/images/Ctrl_lightphaser.png diff --git a/source/gx/images/Ctrl_menacer.png b/gx/images/Ctrl_menacer.png similarity index 100% rename from source/gx/images/Ctrl_menacer.png rename to gx/images/Ctrl_menacer.png diff --git a/source/gx/images/Ctrl_mouse.png b/gx/images/Ctrl_mouse.png similarity index 100% rename from source/gx/images/Ctrl_mouse.png rename to gx/images/Ctrl_mouse.png diff --git a/source/gx/images/Ctrl_none.png b/gx/images/Ctrl_none.png similarity index 100% rename from source/gx/images/Ctrl_none.png rename to gx/images/Ctrl_none.png diff --git a/source/gx/images/Ctrl_pad3b.png b/gx/images/Ctrl_pad3b.png similarity index 100% rename from source/gx/images/Ctrl_pad3b.png rename to gx/images/Ctrl_pad3b.png diff --git a/source/gx/images/Ctrl_pad6b.png b/gx/images/Ctrl_pad6b.png similarity index 100% rename from source/gx/images/Ctrl_pad6b.png rename to gx/images/Ctrl_pad6b.png diff --git a/source/gx/images/Ctrl_paddle.png b/gx/images/Ctrl_paddle.png similarity index 100% rename from source/gx/images/Ctrl_paddle.png rename to gx/images/Ctrl_paddle.png diff --git a/source/gx/images/Ctrl_sportspad.png b/gx/images/Ctrl_sportspad.png similarity index 100% rename from source/gx/images/Ctrl_sportspad.png rename to gx/images/Ctrl_sportspad.png diff --git a/source/gx/images/Ctrl_teamplayer.png b/gx/images/Ctrl_teamplayer.png similarity index 100% rename from source/gx/images/Ctrl_teamplayer.png rename to gx/images/Ctrl_teamplayer.png diff --git a/source/gx/images/Ctrl_xe_a1p.png b/gx/images/Ctrl_xe_a1p.png similarity index 100% rename from source/gx/images/Ctrl_xe_a1p.png rename to gx/images/Ctrl_xe_a1p.png diff --git a/source/gx/images/Frame_s1.png b/gx/images/Frame_s1.png similarity index 100% rename from source/gx/images/Frame_s1.png rename to gx/images/Frame_s1.png diff --git a/source/gx/images/Frame_s1_title.png b/gx/images/Frame_s1_title.png similarity index 100% rename from source/gx/images/Frame_s1_title.png rename to gx/images/Frame_s1_title.png diff --git a/source/gx/images/Frame_s2.png b/gx/images/Frame_s2.png similarity index 100% rename from source/gx/images/Frame_s2.png rename to gx/images/Frame_s2.png diff --git a/source/gx/images/Frame_s2_title.png b/gx/images/Frame_s2_title.png similarity index 100% rename from source/gx/images/Frame_s2_title.png rename to gx/images/Frame_s2_title.png diff --git a/source/gx/images/Frame_s3.png b/gx/images/Frame_s3.png similarity index 100% rename from source/gx/images/Frame_s3.png rename to gx/images/Frame_s3.png diff --git a/source/gx/images/Frame_throbber.png b/gx/images/Frame_throbber.png similarity index 100% rename from source/gx/images/Frame_throbber.png rename to gx/images/Frame_throbber.png diff --git a/source/gx/images/Key_A_gcn.png b/gx/images/Key_A_gcn.png similarity index 100% rename from source/gx/images/Key_A_gcn.png rename to gx/images/Key_A_gcn.png diff --git a/source/gx/images/Key_A_wii.png b/gx/images/Key_A_wii.png similarity index 100% rename from source/gx/images/Key_A_wii.png rename to gx/images/Key_A_wii.png diff --git a/source/gx/images/Key_B_gcn.png b/gx/images/Key_B_gcn.png similarity index 100% rename from source/gx/images/Key_B_gcn.png rename to gx/images/Key_B_gcn.png diff --git a/source/gx/images/Key_B_wii.png b/gx/images/Key_B_wii.png similarity index 100% rename from source/gx/images/Key_B_wii.png rename to gx/images/Key_B_wii.png diff --git a/source/gx/images/Key_DPAD.png b/gx/images/Key_DPAD.png similarity index 100% rename from source/gx/images/Key_DPAD.png rename to gx/images/Key_DPAD.png diff --git a/source/gx/images/Key_L_gcn.png b/gx/images/Key_L_gcn.png similarity index 100% rename from source/gx/images/Key_L_gcn.png rename to gx/images/Key_L_gcn.png diff --git a/source/gx/images/Key_Minus_wii.png b/gx/images/Key_Minus_wii.png similarity index 100% rename from source/gx/images/Key_Minus_wii.png rename to gx/images/Key_Minus_wii.png diff --git a/source/gx/images/Key_Plus_wii.png b/gx/images/Key_Plus_wii.png similarity index 100% rename from source/gx/images/Key_Plus_wii.png rename to gx/images/Key_Plus_wii.png diff --git a/source/gx/images/Key_R_gcn.png b/gx/images/Key_R_gcn.png similarity index 100% rename from source/gx/images/Key_R_gcn.png rename to gx/images/Key_R_gcn.png diff --git a/source/gx/images/Load_cd.png b/gx/images/Load_cd.png similarity index 100% rename from source/gx/images/Load_cd.png rename to gx/images/Load_cd.png diff --git a/source/gx/images/Load_gg.png b/gx/images/Load_gg.png similarity index 100% rename from source/gx/images/Load_gg.png rename to gx/images/Load_gg.png diff --git a/source/gx/images/Load_md.png b/gx/images/Load_md.png similarity index 100% rename from source/gx/images/Load_md.png rename to gx/images/Load_md.png diff --git a/source/gx/images/Load_ms.png b/gx/images/Load_ms.png similarity index 100% rename from source/gx/images/Load_ms.png rename to gx/images/Load_ms.png diff --git a/source/gx/images/Load_recent.png b/gx/images/Load_recent.png similarity index 100% rename from source/gx/images/Load_recent.png rename to gx/images/Load_recent.png diff --git a/source/gx/images/Load_sg.png b/gx/images/Load_sg.png similarity index 100% rename from source/gx/images/Load_sg.png rename to gx/images/Load_sg.png diff --git a/source/gx/images/Main_cheats.png b/gx/images/Main_cheats.png similarity index 100% rename from source/gx/images/Main_cheats.png rename to gx/images/Main_cheats.png diff --git a/source/gx/images/Main_file.png b/gx/images/Main_file.png similarity index 100% rename from source/gx/images/Main_file.png rename to gx/images/Main_file.png diff --git a/source/gx/images/Main_load.png b/gx/images/Main_load.png similarity index 100% rename from source/gx/images/Main_load.png rename to gx/images/Main_load.png diff --git a/source/gx/images/Main_logo.png b/gx/images/Main_logo.png similarity index 100% rename from source/gx/images/Main_logo.png rename to gx/images/Main_logo.png diff --git a/source/gx/images/Main_options.png b/gx/images/Main_options.png similarity index 100% rename from source/gx/images/Main_options.png rename to gx/images/Main_options.png diff --git a/source/gx/images/Main_play_gcn.png b/gx/images/Main_play_gcn.png similarity index 100% rename from source/gx/images/Main_play_gcn.png rename to gx/images/Main_play_gcn.png diff --git a/source/gx/images/Main_play_wii.png b/gx/images/Main_play_wii.png similarity index 100% rename from source/gx/images/Main_play_wii.png rename to gx/images/Main_play_wii.png diff --git a/source/gx/images/Main_quit.png b/gx/images/Main_quit.png similarity index 100% rename from source/gx/images/Main_quit.png rename to gx/images/Main_quit.png diff --git a/source/gx/images/Main_reset.png b/gx/images/Main_reset.png similarity index 100% rename from source/gx/images/Main_reset.png rename to gx/images/Main_reset.png diff --git a/source/gx/images/Main_showinfo.png b/gx/images/Main_showinfo.png similarity index 100% rename from source/gx/images/Main_showinfo.png rename to gx/images/Main_showinfo.png diff --git a/source/gx/images/Main_takeshot.png b/gx/images/Main_takeshot.png similarity index 100% rename from source/gx/images/Main_takeshot.png rename to gx/images/Main_takeshot.png diff --git a/source/gx/images/Option_ctrl.png b/gx/images/Option_ctrl.png similarity index 100% rename from source/gx/images/Option_ctrl.png rename to gx/images/Option_ctrl.png diff --git a/source/gx/images/Option_menu.png b/gx/images/Option_menu.png similarity index 100% rename from source/gx/images/Option_menu.png rename to gx/images/Option_menu.png diff --git a/source/gx/images/Option_sound.png b/gx/images/Option_sound.png similarity index 100% rename from source/gx/images/Option_sound.png rename to gx/images/Option_sound.png diff --git a/source/gx/images/Option_system.png b/gx/images/Option_system.png similarity index 100% rename from source/gx/images/Option_system.png rename to gx/images/Option_system.png diff --git a/source/gx/images/Option_video.png b/gx/images/Option_video.png similarity index 100% rename from source/gx/images/Option_video.png rename to gx/images/Option_video.png diff --git a/source/gx/images/Overlay_bar.png b/gx/images/Overlay_bar.png similarity index 100% rename from source/gx/images/Overlay_bar.png rename to gx/images/Overlay_bar.png diff --git a/source/gx/images/Snap_empty.png b/gx/images/Snap_empty.png similarity index 100% rename from source/gx/images/Snap_empty.png rename to gx/images/Snap_empty.png diff --git a/source/gx/images/Star_empty.png b/gx/images/Star_empty.png similarity index 100% rename from source/gx/images/Star_empty.png rename to gx/images/Star_empty.png diff --git a/source/gx/images/Star_full.png b/gx/images/Star_full.png similarity index 100% rename from source/gx/images/Star_full.png rename to gx/images/Star_full.png diff --git a/source/gx/images/ctrl_classic.png b/gx/images/ctrl_classic.png similarity index 100% rename from source/gx/images/ctrl_classic.png rename to gx/images/ctrl_classic.png diff --git a/source/gx/images/ctrl_gamecube.png b/gx/images/ctrl_gamecube.png similarity index 100% rename from source/gx/images/ctrl_gamecube.png rename to gx/images/ctrl_gamecube.png diff --git a/source/gx/images/ctrl_nunchuk.png b/gx/images/ctrl_nunchuk.png similarity index 100% rename from source/gx/images/ctrl_nunchuk.png rename to gx/images/ctrl_nunchuk.png diff --git a/source/gx/images/ctrl_option_off.png b/gx/images/ctrl_option_off.png similarity index 100% rename from source/gx/images/ctrl_option_off.png rename to gx/images/ctrl_option_off.png diff --git a/source/gx/images/ctrl_option_on.png b/gx/images/ctrl_option_on.png similarity index 100% rename from source/gx/images/ctrl_option_on.png rename to gx/images/ctrl_option_on.png diff --git a/source/gx/images/ctrl_wiimote.png b/gx/images/ctrl_wiimote.png similarity index 100% rename from source/gx/images/ctrl_wiimote.png rename to gx/images/ctrl_wiimote.png diff --git a/source/gx/images/generic_point.png b/gx/images/generic_point.png similarity index 100% rename from source/gx/images/generic_point.png rename to gx/images/generic_point.png diff --git a/source/gx/main.c b/gx/main.c similarity index 100% rename from source/gx/main.c rename to gx/main.c diff --git a/source/gx/osd.h b/gx/osd.h similarity index 100% rename from source/gx/osd.h rename to gx/osd.h diff --git a/source/gx/sounds/button_over.pcm b/gx/sounds/button_over.pcm similarity index 100% rename from source/gx/sounds/button_over.pcm rename to gx/sounds/button_over.pcm diff --git a/source/gx/sounds/button_select.pcm b/gx/sounds/button_select.pcm similarity index 100% rename from source/gx/sounds/button_select.pcm rename to gx/sounds/button_select.pcm diff --git a/source/gx/sounds/intro.pcm b/gx/sounds/intro.pcm similarity index 100% rename from source/gx/sounds/intro.pcm rename to gx/sounds/intro.pcm diff --git a/source/gx/utils/oggplayer.c b/gx/utils/oggplayer.c similarity index 100% rename from source/gx/utils/oggplayer.c rename to gx/utils/oggplayer.c diff --git a/source/gx/utils/oggplayer.h b/gx/utils/oggplayer.h similarity index 100% rename from source/gx/utils/oggplayer.h rename to gx/utils/oggplayer.h diff --git a/source/gx/utils/vi_encoder.c b/gx/utils/vi_encoder.c similarity index 100% rename from source/gx/utils/vi_encoder.c rename to gx/utils/vi_encoder.c diff --git a/source/gx/utils/vi_encoder.h b/gx/utils/vi_encoder.h similarity index 100% rename from source/gx/utils/vi_encoder.h rename to gx/utils/vi_encoder.h diff --git a/source/win/CHANGELOG.txt b/sdl/CHANGELOG.txt similarity index 100% rename from source/win/CHANGELOG.txt rename to sdl/CHANGELOG.txt diff --git a/source/win/LICENSE.txt b/sdl/LICENSE.txt similarity index 100% rename from source/win/LICENSE.txt rename to sdl/LICENSE.txt diff --git a/source/win/Makefile.win32 b/sdl/Makefile.sdl similarity index 67% rename from source/win/Makefile.win32 rename to sdl/Makefile.sdl index 4c4c20d..1dd05ce 100644 --- a/source/win/Makefile.win32 +++ b/sdl/Makefile.sdl @@ -26,9 +26,10 @@ CFLAGS = `sdl-config --cflags` -march=i686 -O6 -fomit-frame-pointer -Wall -Wn #-g -ggdb -pg #-fomit-frame-pointer #LDFLAGS = -pg -DEFINES = -DLSB_FIRST -DUSE_16BPP_RENDERING +DEFINES = -DLSB_FIRST -DUSE_16BPP_RENDERING -DUSE_LIBTREMOR -INCLUDES = -Isource -Isource/z80 -Isource/m68k -Isource/sound -Isource/input_hw -Isource/cart_hw -Isource/cd_hw -Isource/cart_hw/svp -Isource/ntsc -Isource/win +SRCDIR = ../core +INCLUDES = -I$(SRCDIR) -I$(SRCDIR)/z80 -I$(SRCDIR)/m68k -I$(SRCDIR)/sound -I$(SRCDIR)/input_hw -I$(SRCDIR)/cart_hw -I$(SRCDIR)/cart_hw/svp -I$(SRCDIR)/cd_hw -I$(SRCDIR)/ntsc -I$(SRCDIR)/tremor -I$(SRCDIR)/../sdl LIBS = `sdl-config --libs` -lz -lm OBJDIR = ./build_sdl @@ -96,6 +97,22 @@ OBJECTS += $(OBJDIR)/main.o \ $(OBJDIR)/unzip.o \ $(OBJDIR)/fileio.o +OBJECTS += $(OBJDIR)/bitwise.o \ + $(OBJDIR)/block.o \ + $(OBJDIR)/codebook.o \ + $(OBJDIR)/floor0.o \ + $(OBJDIR)/floor1.o \ + $(OBJDIR)/framing.o \ + $(OBJDIR)/info.o \ + $(OBJDIR)/mapping0.o \ + $(OBJDIR)/mdct.o \ + $(OBJDIR)/registry.o \ + $(OBJDIR)/res012.o \ + $(OBJDIR)/sharedbook.o \ + $(OBJDIR)/synthesis.o \ + $(OBJDIR)/vorbisfile.o \ + $(OBJDIR)/window.o + OBJECTS += $(OBJDIR)/icon.o all: $(NAME) @@ -106,41 +123,47 @@ $(NAME): $(OBJDIR) $(OBJECTS) $(OBJDIR) : @[ -d $@ ] || mkdir -p $@ -$(OBJDIR)/%.o : source/%.c source/%.h +$(OBJDIR)/%.o : $(SRCDIR)/%.c $(SRCDIR)/%.h $(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@ -$(OBJDIR)/%.o : source/sound/%.c source/sound/%.h +$(OBJDIR)/%.o : $(SRCDIR)/sound/%.c $(SRCDIR)/sound/%.h $(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@ -$(OBJDIR)/%.o : source/input_hw/%.c source/input_hw/%.h +$(OBJDIR)/%.o : $(SRCDIR)/input_hw/%.c $(SRCDIR)/input_hw/%.h $(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@ -$(OBJDIR)/%.o : source/cart_hw/%.c source/cart_hw/%.h +$(OBJDIR)/%.o : $(SRCDIR)/cart_hw/%.c $(SRCDIR)/cart_hw/%.h $(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@ -$(OBJDIR)/%.o : source/cart_hw/svp/%.c +$(OBJDIR)/%.o : $(SRCDIR)/cart_hw/svp/%.c $(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@ -$(OBJDIR)/%.o : source/cart_hw/svp/%.c source/cart_hw/svp/%.h +$(OBJDIR)/%.o : $(SRCDIR)/cart_hw/svp/%.c $(SRCDIR)/cart_hw/svp/%.h $(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@ -$(OBJDIR)/%.o : source/cd_hw/%.c source/cd_hw/%.h +$(OBJDIR)/%.o : $(SRCDIR)/cd_hw/%.c $(SRCDIR)/cd_hw/%.h $(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@ -$(OBJDIR)/%.o : source/z80/%.c source/z80/%.h +$(OBJDIR)/%.o : $(SRCDIR)/z80/%.c $(SRCDIR)/z80/%.h $(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@ -$(OBJDIR)/%.o : source/m68k/%.c +$(OBJDIR)/%.o : $(SRCDIR)/m68k/%.c $(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@ -$(OBJDIR)/%.o : source/ntsc/%.c source/ntsc/%.h +$(OBJDIR)/%.o : $(SRCDIR)/ntsc/%.c $(SRCDIR)/ntsc/%.h $(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@ -$(OBJDIR)/%.o : source/win/%.c source/win/%.h +$(OBJDIR)/%.o : $(SRCDIR)/tremor/%.c $(SRCDIR)/tremor/%.h + $(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@ + +$(OBJDIR)/%.o : $(SRCDIR)/tremor/%.c + $(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@ + +$(OBJDIR)/%.o : $(SRCDIR)/../sdl/%.c $(SRCDIR)/../sdl/%.h $(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@ $(OBJDIR)/icon.o : - windres source/win/icon.rc $@ + windres $(SRCDIR)/../sdl/icon.rc $@ pack : strip $(NAME) diff --git a/source/win/README.txt b/sdl/README.txt similarity index 100% rename from source/win/README.txt rename to sdl/README.txt diff --git a/source/win/config.c b/sdl/config.c similarity index 100% rename from source/win/config.c rename to sdl/config.c diff --git a/source/win/config.h b/sdl/config.h similarity index 100% rename from source/win/config.h rename to sdl/config.h diff --git a/source/win/error.c b/sdl/error.c similarity index 100% rename from source/win/error.c rename to sdl/error.c diff --git a/source/win/error.h b/sdl/error.h similarity index 100% rename from source/win/error.h rename to sdl/error.h diff --git a/source/win/fileio.c b/sdl/fileio.c similarity index 100% rename from source/win/fileio.c rename to sdl/fileio.c diff --git a/source/win/fileio.h b/sdl/fileio.h similarity index 100% rename from source/win/fileio.h rename to sdl/fileio.h diff --git a/source/win/icon.rc b/sdl/icon.rc similarity index 100% rename from source/win/icon.rc rename to sdl/icon.rc diff --git a/source/win/main.c b/sdl/main.c similarity index 100% rename from source/win/main.c rename to sdl/main.c diff --git a/source/win/main.h b/sdl/main.h similarity index 100% rename from source/win/main.h rename to sdl/main.h diff --git a/source/win/md.ico b/sdl/md.ico similarity index 100% rename from source/win/md.ico rename to sdl/md.ico diff --git a/source/win/osd.h b/sdl/osd.h similarity index 100% rename from source/win/osd.h rename to sdl/osd.h diff --git a/source/win/readme-sdl.txt b/sdl/readme-sdl.txt similarity index 100% rename from source/win/readme-sdl.txt rename to sdl/readme-sdl.txt diff --git a/source/win/unzip.c b/sdl/unzip.c similarity index 100% rename from source/win/unzip.c rename to sdl/unzip.c diff --git a/source/win/unzip.h b/sdl/unzip.h similarity index 100% rename from source/win/unzip.h rename to sdl/unzip.h