NJ has once again updated his source for Cps1, Cps2, and MVS. He has updated it to v1.63. Now all that needs to be done is get a compiled version of this.
NJ has once again updated his source for Cps1, Cps2, and MVS. He has updated it to v1.63. Now all that needs to be done is get a compiled version of this.
Holy crap... this guy doesnt stop. Way to go NJ.
Keep trying Gunntims . . hopefully we can get the EBOOTS sometime soon. :D
well thr problem lies in the make file of the source, my compiler is using the function of the maketree, but it isnt compiling. I compiled other things so its working i think the problem lies in the code of the makefile i might have to edit it for my compiler
the make file looks like this
I think i have to add this in the makefile somewhere but i dont know whereCode:#------------------------------------------------------------------------------
#
# CPS1/CPS2/NEOGEO Emulator for PSP Makefile
#
#------------------------------------------------------------------------------
#------------------------------------------------------------------------------
# Configration
#------------------------------------------------------------------------------
#BUILD_CPS1PSP = 1
BUILD_CPS2PSP = 1
#BUILD_MVSPSP = 1
SAVE_STATE = 1
#KERNEL_MODE = 1
#SOUND_TEST = 1
RELEASE = 1
#------------------------------------------------------------------------------
# Defines
#------------------------------------------------------------------------------
VERSION_MAJOR = 1
VERSION_MINOR = 6
VERSION_BUILD = 3
ifdef BUILD_CPS1PSP
BUILD_CPS2PSP=
BUILD_MVSPSP=
SOUND_TEST=
TARGET = CPS1PSP
PSP_EBOOT_ICON = data/cps1.png
endif
ifdef BUILD_CPS2PSP
BUILD_MVSPSP=
SOUND_TEST=
TARGET = CPS2PSP
PSP_EBOOT_ICON = data/cps2.png
endif
ifdef BUILD_MVSPSP
VERSION_MAJOR = 1
VERSION_MINOR = 6
VERSION_BUILD = 3
TARGET = MVSPSP
PSP_EBOOT_ICON = data/mvs.png
endif
PBPNAME_STR = $(TARGET)
ifdef BUILD_MVSPSP
VERSION_STR = $(VERSION_MAJOR).$(VERSION_MINOR)$(VERSION_BUILD)[Final]
else
VERSION_STR = $(VERSION_MAJOR).$(VERSION_MINOR)$(VERSION_BUILD)
endif
PSP_EBOOT_TITLE = $(PBPNAME_STR) $(VERSION_STR)
EXTRA_TARGETS = mkdir EBOOT.PBP delelf
EXTRA_CLEAN = pspclean
#------------------------------------------------------------------------------
# Compiler Flags
#------------------------------------------------------------------------------
CFLAGS = -O3 -Wundef -Wunused
#------------------------------------------------------------------------------
# Compiler Defines
#------------------------------------------------------------------------------
CDEFS = -DINLINE='static __inline' \
-Dinline=__inline \
-D__inline__=__inline \
-DBUILD_$(TARGET)=1 \
-DPBPNAME_STR=\"$(PBPNAME_STR)\" \
-DVERSION_STR=\"$(VERSION_STR)\" \
-DVERSION_MAJOR=$(VERSION_MAJOR) \
-DVERSION_MINOR=$(VERSION_MINOR) \
-DVERSION_BUILD=$(VERSION_BUILD) \
-DPSP
ifdef KERNEL_MODE
CDEFS += -DKERNEL_MODE=1
endif
ifdef SAVE_STATE
CDEFS += -DSAVE_STATE=1
endif
ifdef SOUND_TEST
CDEFS += -DSOUND_TEST=1
endif
ifdef RELEASE
CDEFS += -DRELEASE=1
else
CDEFS += -DRELEASE=0
endif
#------------------------------------------------------------------------------
# Object File Output Directtory
#------------------------------------------------------------------------------
ifdef BUILD_CPS1PSP
OBJ = obj_cps1
endif
ifdef BUILD_CPS2PSP
OBJ = obj_cps2
endif
ifdef BUILD_MVSPSP
OBJ = obj_mvs
endif
#------------------------------------------------------------------------------
# File include path
#------------------------------------------------------------------------------
INCDIR = \
src \
src/cpu/m68000 \
src/cpu/z80 \
src/zip \
src/zlib
ifdef BUILD_CPS1PSP
INCDIR += src/cps1
endif
ifdef BUILD_CPS2PSP
INCDIR += src/cps2
endif
ifdef BUILD_MVSPSP
INCDIR += src/mvs
endif
#------------------------------------------------------------------------------
# Linker Flags
#------------------------------------------------------------------------------
LIBDIR =
LDFLAGS =
#------------------------------------------------------------------------------
# Library
#------------------------------------------------------------------------------
USE_PSPSDK_LIBC = 1
LIBS = -lm -lc -lpspaudio -lpspgu -lpsppower -lpsprtc
#------------------------------------------------------------------------------
# Object Directory
#------------------------------------------------------------------------------
OBJDIRS = \
$(OBJ) \
$(OBJ)/cpu \
$(OBJ)/cpu/m68000 \
$(OBJ)/cpu/z80 \
$(OBJ)/common \
$(OBJ)/sound \
$(OBJ)/zip \
$(OBJ)/zlib \
$(OBJ)/psp \
$(OBJ)/psp/font \
$(OBJ)/psp/icon
ifdef BUILD_CPS1PSP
OBJDIRS += $(OBJ)/cps1
endif
ifdef BUILD_CPS2PSP
OBJDIRS += $(OBJ)/cps2
endif
ifdef BUILD_MVSPSP
OBJDIRS += $(OBJ)/mvs
endif
#------------------------------------------------------------------------------
# Object Files (common)
#------------------------------------------------------------------------------
MAINOBJS = \
$(OBJ)/emumain.o \
$(OBJ)/zip/zfile.o \
$(OBJ)/zip/unzip.o \
$(OBJ)/cpu/m68000/m68000.o \
$(OBJ)/cpu/m68000/c68k.o \
$(OBJ)/cpu/z80/z80.o \
$(OBJ)/cpu/z80/cz80.o \
$(OBJ)/sound/sndintrf.o \
$(OBJ)/common/cache.o \
$(OBJ)/common/loadrom.o
ifndef BUILD_MVSPSP
MAINOBJS += $(OBJ)/common/coin.o
endif
ifdef SAVE_STATE
MAINOBJS += $(OBJ)/common/state.o
endif
ifdef SOUND_TEST
MAINOBJS += $(OBJ)/common/sndtest.o
endif
#------------------------------------------------------------------------------
# Object Files (CPS1PSP)
#------------------------------------------------------------------------------
ifdef BUILD_CPS1PSP
COREOBJS = \
$(OBJ)/cps1/cps1.o \
$(OBJ)/cps1/driver.o \
$(OBJ)/cps1/memintrf.o \
$(OBJ)/cps1/inptport.o \
$(OBJ)/cps1/dipsw.o \
$(OBJ)/cps1/timer.o \
$(OBJ)/cps1/vidhrdw.o \
$(OBJ)/cps1/sprite.o \
$(OBJ)/cps1/eeprom.o \
$(OBJ)/cps1/kabuki.o \
$(OBJ)/sound/2151intf.o \
$(OBJ)/sound/ym2151.o \
$(OBJ)/sound/qsound.o
ICONOBJS = \
$(OBJ)/psp/icon/cps_s.o \
$(OBJ)/psp/icon/cps_l.o
endif
#------------------------------------------------------------------------------
# Object Files (CPS2PSP)
#------------------------------------------------------------------------------
ifdef BUILD_CPS2PSP
COREOBJS = \
$(OBJ)/cps2/cps2.o \
$(OBJ)/cps2/driver.o \
$(OBJ)/cps2/memintrf.o \
$(OBJ)/cps2/inptport.o \
$(OBJ)/cps2/timer.o \
$(OBJ)/cps2/vidhrdw.o \
$(OBJ)/cps2/sprite.o \
$(OBJ)/cps2/eeprom.o \
$(OBJ)/sound/qsound.o
ICONOBJS = \
$(OBJ)/psp/icon/cps_s.o \
$(OBJ)/psp/icon/cps_l.o
endif
#------------------------------------------------------------------------------
# Object Files (MVSPSP)
#------------------------------------------------------------------------------
ifdef BUILD_MVSPSP
COREOBJS = \
$(OBJ)/mvs/mvs.o \
$(OBJ)/mvs/driver.o \
$(OBJ)/mvs/memintrf.o \
$(OBJ)/mvs/inptport.o \
$(OBJ)/mvs/dipsw.o \
$(OBJ)/mvs/timer.o \
$(OBJ)/mvs/vidhrdw.o \
$(OBJ)/mvs/sprite.o \
$(OBJ)/mvs/pd4990a.o \
$(OBJ)/mvs/biosmenu.o \
$(OBJ)/sound/2610intf.o \
$(OBJ)/sound/ym2610.o
ICONOBJS = \
$(OBJ)/psp/icon/mvs_s.o \
$(OBJ)/psp/icon/mvs_l.o
endif
#------------------------------------------------------------------------------
# Object Files (common)
#------------------------------------------------------------------------------
FONTOBJS = \
$(OBJ)/psp/font/jpnfont.o \
$(OBJ)/psp/font/graphic.o \
$(OBJ)/psp/font/ascii_14p.o \
$(OBJ)/psp/font/font_s.o \
$(OBJ)/psp/font/bshadow.o
EXTOBJS = \
$(OBJ)/psp/psp.o \
$(OBJ)/psp/blend.o \
$(OBJ)/psp/config.o \
$(OBJ)/psp/filer.o \
$(OBJ)/psp/help.o \
$(OBJ)/psp/input.o \
$(OBJ)/psp/menu.o \
$(OBJ)/psp/mesbox.o \
$(OBJ)/psp/misc.o \
$(OBJ)/psp/ticker.o \
$(OBJ)/psp/usrintrf.o \
$(OBJ)/psp/video.o \
$(OBJ)/psp/sound.o
ifdef BUILD_CPS1PSP
EXTOBJS += $(OBJ)/psp/png.o
else
EXTOBJS += $(OBJ)/psp/bmp.o
endif
EXTOBJS += $(FONTOBJS) $(ICONOBJS) $(ADHOCOBJS)
ZLIB = $(OBJ)/zlib.a
OBJS= $(MAINOBJS) $(COREOBJS) $(EXTOBJS) $(ZLIB)
#------------------------------------------------------------------------------
# Rules to make libraries
#------------------------------------------------------------------------------
PSPSDK=$(shell psp-config --pspsdk-path)
include $(PSPSDK)/lib/build.mak
$(OBJ)/zlib.a: \
$(OBJ)/zlib/adler32.o \
$(OBJ)/zlib/compress.o \
$(OBJ)/zlib/crc32.o \
$(OBJ)/zlib/deflate.o \
$(OBJ)/zlib/inflate.o \
$(OBJ)/zlib/inftrees.o \
$(OBJ)/zlib/inffast.o \
$(OBJ)/zlib/trees.o \
$(OBJ)/zlib/zutil.o
#---------------------------------------------------------------------
# Rules to manage files (CZ80)
#---------------------------------------------------------------------
Z80_SRC = \
src/cpu/z80/cz80.c \
src/cpu/z80/cz80_op.c \
src/cpu/z80/cz80_opCB.c \
src/cpu/z80/cz80_opED.c \
src/cpu/z80/cz80_opXY.c \
src/cpu/z80/cz80_opXYCB.c
$(OBJ)/cpu/z80/cz80.o: $(Z80_SRC)
@echo Compiling $<...
@$(CC) $(CDEFS) $(CFLAGS) -c $< -o$@
#------------------------------------------------------------------------------
# Rules to manage files
#------------------------------------------------------------------------------
$(OBJ)/%.o: src/%.c
@echo Compiling $<...
@$(CC) $(CDEFS) $(CFLAGS) -c $< -o$@
$(OBJ)/%.o: src/%.S
@echo Assembling $<...
@$(CC) $(CDEFS) $(CFLAGS) -c $< -o$@
$(OBJ)/%.o: src/%.s
@echo Assembling $<...
@$(AS) $(ASDEFS) $(ASFLAGS) -c $< -o$@
$(OBJ)/%.a:
@echo Archiving $@...
@$(AR) -r $@ $^
$(sort $(OBJDIRS)):
@mkdir -p $(subst //,\,$@)
pspclean:
@echo Remove all object files and directories.
@rm -rd $(OBJ)
@rm -rf $(PSP_EBOOT_SFO)
@rm -rf $(TARGET).elf
delelf:
@rm -rf $(PSP_EBOOT_SFO)
@rm -rf $(TARGET).elf
maketree:
@echo Making object tree...
mkdir: maketree $(sort $(OBJDIRS))
I could be wrong, Im working on trying to compile it just isnt working for me...Code:EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = Emulator
PSPSDK=$(shell psp-config --pspsdk-path)
include $(PSPSDK)/lib/build.mak
Does NJ even sleep? :|
ok the problem that i get is this
C:/pspdev/psp/sdk/samples/njemu_source_20061218>make
making object tree...
The syntax of the command is incorrect.
make: *** [obj_cps2/common] Error1
NJ is on crack! If only every dev was as devoted as he is.
i think i know what the problem is there is no common folder found in there obj_cps2 folder thats why im getting a error, i have to go into the makefile and change or just add a common folder in that directory. I post what happens
dont give up :D
once compiled do you guys think someone will put it in noob version i had some one IM me yesterday and could not get it to work and i am still on 1.61 so i could not help him
OMG!!!!!
i know what the problem is but i have to make a whole bunch of new folders and files in the obj_cps2 folder. Which in turn is alot of work, i did it but there are to many files and folders i have to create...
Sorry guys, everyone will just have to wait for someone else to compile it :(
LOLZ another update, I keep updating his emulators XD
And about the compiling, one thing I was always bad at was working with someone elses code, so I would really just like, let NJ do his thing ;)
Yo i got to compile it but when i run on my psp i get inside theemu and then get the error: "Could not find zipname.cps2" if this is coes i miss compile please tell me otherwise il post my Eboot 1.0 and 1.5.
Also when i compile is it normal i got only one EBoot and Not 3?(Cps1/2 and MVS)
And do i need a Bios what bios(Cps1/2 and MVS) and what do i name it?
Bear_XI could you post what you've got plz?
Here tell me if it works for you?(If you have a 1.5 tell me i can Kxploit them for you.)
Here is NJ's latest source compiled njemu_source_20061218.zip
As far as I can tell he did fix a video related bug. As yesturday I was messing around with his last source 20061217 and found if we set the Optimization to -O2 there would be some video tearing happening. Well what ever he did I tried it again on his latest and he fixed the issue. Though he didn't change his makefile (His still had -O3 set for CFLAGS) I compiled it for -O2 and these were my following findings....
CPS1 Settings and we can achieve 60 fps.
ROM: Cadilacs and Dinosaurs
Raster Effects: ON
Video Sync: ON
Frameskip: Disabled
60fps limit: OFF - Don't need this to be on if Video Sync is ON.
Sample Rate: 44100Hz
CPU: 266 MHz
CPS2 Settings and we can achieve 55~60 fps.
ROM: Street Fighter 3 Alpha
Raster Effects: ON
Video Sync: ON
Frameskip: Disabled
60fps limit: OFF - Don't need this to be on if Video Sync is ON.
Sample Rate: 44100Hz
CPU: 333 MHz
MVS Settings and we can achieve 50~60 fps.
ROM: SNK Vs Capcom: Chaos
Raster Effects: OFF
Video Sync: ON
Frameskip: Disabled
60fps limit: OFF - Don't need this to be on if Video Sync is ON.
Sample Rate: 44100Hz
CPU: 333 MHz
So just to repeat myself because its fun...... the moral of the story is he fixed a video related bug which in turn allowed his source to compile at -O2 instead of -O3 for Optimizations which in turn gives us a nice little speed boost!
All Versions included. Which means KERNEL/Normal Compilations.
Just so people know I normally don't like to compile others people code and release it. But I am a big fan of his work!!! So enjoy his latest update as you might think it was nothing significant but it was....
And lastly... if you running 1.5 firmware then kxploit it with PSPBrew.
1st up Samurai, thanks I've been waiting for this -
2nd up NJ - Only tested Cps2 so far but had to post - I thought it was perfect - I was wrong - it was Lampards goal tonight at 1.50, it was Drogbas at 1.60 - but this one is West Ham beating Man U in the same weekend!
gonna test MVS and Cps1 now, expecting a lot!
EDIT: 2.71 sec kernal btw - just a quick note - I want to keep playing - the pitch has gone in supersidekicks 3 again - not that I understand that ball thingy game
Thanks SamuraiX For the compile.I love NJ's Work it rocks.
Thank you SamuraiX!!
can someone please make a 1.50 compatabul so 1.50 gamers dont have to use pspbrew i would be very thankful
SamuraiX,
I'm excited to see how comfortable you are tinkering with Nj's source. I sent you a PM about possibly adding support for other arcade machines that also use A6800 and Z80.
Perhaps you might be able to make a CavePSP for starters.
what makes these versions better than the already 60fps 1.51version?
Metal Slug 4 keeps crashing halfway through the motorbike bit. I've tried a few different bios' but still the same. Which one do others recommend?
I'm struggling against that problem for days now.. :(
Tried every bios, every config possible, with no luck...
EDIT: What makes me mad is that sometimes (5%) it actually don't crash at the bike part.
Then why does it crash the other 95% of the times?
Of course you can avoid the crash by going underground instead of the going to the bike part. But is just that I'm so *anal* when it comes to MetalSlug that I would love to see it perfect!!
Thanks for the compile SamuraiX. Nj really knows how to make these holiday seasons worthwhile :)
NJ is certainly an amazing programmer! His updates continue to amaze me and I don't mind his daily updates.... I look forward everyday to download his emu!
Thanks alot for this SamuraiX...Is it me, or does all 3(mvs.cps1&2)realy goes a bit faster?..And if you set "Sample Rate" to 44100Hz...Wauw, it all sound crisp and clear.All in all AMAZING..You wonder what NJ will do with MAME(Outrun,Space Harrier)..Sorry for being so creedy hihihi.:thumbup:
thanks for the compiled sources SamuraiX
now that i remember, off to borgeneration to check on updates for your emulator (is that even the right word for BoR?)
has anyone try the converter for MVS i seem to get sprite error when trying to convert it for the psp.
can someone just PLEASE post a compiled eboot of the newer version i can't keep up wid dis guy...
For those who have Metal Slug 4 playing past the bike bit, can you post your config file so I can see what I'm doing wrong? Maybe my mslug4 rom is wrong?
Thanks!
Seems that I can't submit news...
NJ released CPS1PSP 1.64 and CPS2PSP 1.64 in the form of source code. njemu_source_20061219.zip
MVSPSP stays at 1.63(final).
So, this time, compiled by me: :D
(kernel versions)
Enjoy:
Are those kernal or normal modes? Thanks for doing that!