# objects\r
\r
# launcher\r
-OBJ += App.o Engine.o Dialogs.o CSimpleTextParser.o emu.o\r
+OBJS += App.o Engine.o Dialogs.o CSimpleTextParser.o emu.o\r
# engine\r
-OBJ += engine/main.o engine/vid.o engine/polledas.o engine/audio_mediaserver.o engine/debug.o\r
+OBJS += engine/main.o engine/vid.o engine/polledas.o engine/audio_mediaserver.o engine/debug.o\r
ifeq "$(asm_blit)" "1"\r
-OBJ += engine/blit_asm.o\r
+OBJS += engine/blit_asm.o\r
else\r
-OBJ += engine/blit.o\r
+OBJS += engine/blit.o\r
endif\r
# common\r
-OBJ += ../common/emu.o ../common/config.o ../common/menu.o ../common/mp3_helix.o\r
+OBJS += ../common/emu.o ../common/config.o ../common/menu.o ../common/mp3_helix.o\r
# Pico\r
-OBJ += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.o Pico/Pico.o Pico/Sek.o \\r
- Pico/VideoPort.o Pico/Draw2.o Pico/Draw.o Pico/Patch.o Pico/Debug.o\r
+OBJS += pico/area.o pico/cart.o pico/memory.o pico/misc.o pico/pico.o pico/sek.o \\r
+ pico/videoport.o pico/draw2.o pico/draw.o pico/patch.o pico/debug.o\r
# Pico - CD\r
-OBJ += Pico/cd/Pico.o Pico/cd/Memory.o Pico/cd/Sek.o Pico/cd/LC89510.o \\r
- Pico/cd/cd_sys.o Pico/cd/cd_file.o Pico/cd/cue.o Pico/cd/gfx_cd.o \\r
- Pico/cd/Area.o Pico/cd/Misc.o Pico/cd/pcm.o Pico/cd/buffering.o\r
+OBJS += pico/cd/pico.o pico/cd/memory.o pico/cd/sek.o pico/cd/LC89510.o \\r
+ pico/cd/cd_sys.o pico/cd/cd_file.o pico/cd/cue.o pico/cd/gfx_cd.o \\r
+ pico/cd/area.o pico/cd/misc.o pico/cd/pcm.o pico/cd/buffering.o\r
# Pico - Pico\r
-OBJ += Pico/Pico/Pico.o Pico/Pico/Memory.o Pico/Pico/xpcm.o\r
+OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o\r
# Pico - carthw\r
-OBJ += Pico/carthw/carthw.o Pico/carthw/svp/svp.o Pico/carthw/svp/Memory.o \\r
- Pico/carthw/svp/ssp16.o Pico/carthw/svp/compiler.o Pico/carthw/svp/stub_arm.o\r
-\r
-# asm stuff\r
-ifeq "$(asm_render)" "1"\r
-CFLAGS += -D_ASM_DRAW_C\r
-OBJ += Pico/draw_asm.o Pico/draw2_asm.o\r
-endif\r
-ifeq "$(asm_memory)" "1"\r
-CFLAGS += -D_ASM_MEMORY_C\r
-OBJ += Pico/memory_asm.o\r
-endif\r
-ifeq "$(asm_ym2612)" "1"\r
-CFLAGS += -D_ASM_YM2612_C\r
-OBJ += Pico/sound/ym2612_asm.o\r
-endif\r
-ifeq "$(asm_misc)" "1"\r
-CFLAGS += -D_ASM_MISC_C\r
-OBJ += Pico/misc_asm.o\r
-OBJ += Pico/cd/misc_asm.o\r
-endif\r
-ifeq "$(asm_cdpico)" "1"\r
-CFLAGS += -D_ASM_CD_PICO_C\r
-OBJ += Pico/cd/pico_asm.o\r
-endif\r
-ifeq "$(asm_cdmemory)" "1"\r
-CFLAGS += -D_ASM_CD_MEMORY_C\r
-OBJ += Pico/cd/memory_asm.o\r
-endif\r
+OBJS += pico/carthw/carthw.o pico/carthw/svp/svp.o pico/carthw/svp/memory.o \\r
+ pico/carthw/svp/ssp16.o pico/carthw/svp/compiler.o pico/carthw/svp/stub_arm.o\r
\r
# Pico - sound\r
-OBJ += Pico/sound/sound.o\r
-OBJ += Pico/sound/mix_asm.o\r
-OBJ += Pico/sound/sn76496.o Pico/sound/ym2612.o\r
+OBJS += pico/sound/sound.o\r
+OBJS += pico/sound/mix_arm.o\r
+OBJS += pico/sound/sn76496.o pico/sound/ym2612.o\r
# zlib\r
-OBJ += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \\r
+OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \\r
zlib/deflate.o zlib/crc32.o zlib/adler32.o zlib/zutil.o zlib/compress.o\r
# unzip\r
-OBJ += unzip/unzip.o unzip/unzip_stream.o\r
+OBJS += unzip/unzip.o unzip/unzip_stream.o\r
# CPU cores\r
ifeq "$(use_musashi)" "1"\r
CFLAGS += -DEMU_M68K\r
-OBJ += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o\r
+OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o\r
endif\r
ifeq "$(use_cyclone)" "1"\r
CFLAGS += -DEMU_C68K\r
-OBJ += cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o\r
+OBJS += cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o\r
endif\r
# drz80\r
CFLAGS += -D_USE_DRZ80\r
-OBJ += cpu/DrZ80/drz80.o\r
+OBJS += cpu/DrZ80/drz80.o\r
# helix\r
-OBJ += ../common/helix/$(CROSS)helix-mp3.a\r
+OBJS += ../common/helix/$(CROSS)helix-mp3.a\r
\r
\r
vpath %.c = ../..\r
vpath %.s = ../..\r
vpath %.S = ../..\r
-DIRS = platform platform/common Pico Pico/cd Pico/Pico Pico/sound Pico/carthw/svp \\r
+DIRS = platform platform/common pico pico/cd pico/pico pico/sound pico/carthw/svp \\r
zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80\r
\r
ICONS := $(shell echo rsc/*.bmp)\r
\r
all: mkdirs sis\r
\r
-include uiq3.mak\r
include ../common/common_arm.mak\r
+include uiq3.mak\r
\r
\r
$(NAME).mbg $(NAME).mbm : $(ICONS)\r