minor adjustmens

more uncommited 1.80 code..


git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@928 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2011-05-21 18:18:27 +00:00
parent ed8e30f8c2
commit 38163dd7df
6 changed files with 48 additions and 16 deletions

View file

@ -106,21 +106,22 @@ readme.txt: ../../tools/textfilter ../base_readme.txt
../../tools/textfilter ../base_readme.txt $@ GP2X
# ----------- release -----------
ifneq ($(findstring rel,$(MAKECMDGOALS)),)
ifeq ($(VER),)
$(error need VER)
endif
endif
VER ?= $(shell head -n 1 version.h | sed 's/.*"\(.*\)\.\(.*\)".*/\1\2/g')
CODE940 = code940/pico940_v3.bin
rel: PicoDrive PicoDrive.gpe $(CODE940) readme.txt PicoDrive.png ../game_def.cfg \
warm_2.4.25.o warm_2.4.26-open2x.o warm_2.6.24.ko
zip -9 -j ../../PicoDrive_$(VER).zip $^
zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt
mkdir bin_to_cso_mp3
cp ../../tools/bin_to_cso_mp3/* bin_to_cso_mp3/
zip -9 -r ../../PicoDrive_$(VER).zip bin_to_cso_mp3
rm -rf bin_to_cso_mp3
rel: PicoDrive PicoDrive.gpe $(CODE940) readme.txt ../game_def.cfg \
PicoDrive.png PicoDrive_s.png PicoDrive_t.png \
warm_2.4.25.o warm_2.4.26-open2x.o warm_2.6.24.ko \
../../pico/carthw.cfg
mkdir -p out/PicoDrive/skin/
cp $^ out/PicoDrive/
cp PicoDrive.ini out/
cp skin/*.png out/PicoDrive/skin/
cp skin/*.txt out/PicoDrive/skin/
mkdir out/bin_to_cso_mp3
cp ../../tools/bin_to_cso_mp3/* out/bin_to_cso_mp3/
cd out && zip -9 -r ../../../PicoDrive_$(VER).zip *
rm -rf out
$(CODE940):
make -C code940/

View file

@ -67,8 +67,10 @@ void pemu_prep_defconfig(void)
soc = soc_detect();
if (soc == SOCID_MMSP2)
defaultConfig.s_PicoOpt |= POPT_EXT_FM;
else if (soc == SOCID_POLLUX)
else if (soc == SOCID_POLLUX) {
defaultConfig.EmuOpt |= EOPT_WIZ_TEAR_FIX|EOPT_SHOW_RTC;
defaultConfig.s_PicoOpt |= POPT_EN_MCD_GFX;
}
}
void pemu_validate_config(void)

View file

@ -149,7 +149,7 @@ static void gp2x_video_RGB_setscaling_(int ln_offs, int W, int H)
static void gp2x_video_wait_vsync_(void)
{
while (!(memregl[0x308c>>2] & (1 << 10)));
while (!(memregl[0x308c>>2] & (1 << 10)))
spend_cycles(128);
memregl[0x308c>>2] |= 1 << 10;
}