Skip to content

Commit a1cbca9

Browse files
hissoriihissorii
committed
display real version at UI
1 parent 1bccc47 commit a1cbca9

13 files changed

+62
-17
lines changed

‎Makefile

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
include version.txt
2+
13
CC = gcc
24
CXX = c++
35
CXXLINK = $(CXX)
@@ -51,6 +53,8 @@ CDEBUGFLAGS+= -DNO_MERCURY
5153
# CDEBUGFLAGS+= -DINLINE=
5254
# CDEBUGFLAGS+= -DUSE_GAS
5355

56+
CDEBUGFLAGS+=-DPX68K_VERSION=$(PX68K_VERSION)
57+
5458
ifdef SDL2
5559
# SDL 2.0
5660
SDL_CONFIG?= sdl2-config

‎Makefile.psp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION=0.10
1+
include version.txt
22

33
#if defined(NO_SOUND)
44
EXTRA_DEFINES+= -DNOSOUND
@@ -61,7 +61,7 @@ SDL_INCLUDE= `$(SDL_CONFIG) --cflags`
6161
SDL_LIB= `$(SDL_CONFIG) --libs`
6262

6363
INCDIR = ./x11 ./x68k ./fmgen ./win32api
64-
CFLAGS = -G0 -O2 -Wall $(SDL_INCLUDE)
64+
CFLAGS = -G0 -O2 -Wall $(SDL_INCLUDE) -DPX68K_VERSION=$(PX68K_VERSION)
6565
# for debugging
6666
#CFLAGS = -g -G0 -Wall $(SDL_INCLUDE)
6767
CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti
@@ -71,7 +71,7 @@ LDFLAGS =
7171
LIBS= -lpspgum -lpspgu -lm -lstdc++ $(SDL_LIB)
7272

7373
EXTRA_TARGETS = EBOOT.PBP
74-
PSP_EBOOT_TITLE = PX68K for PSP ver.$(VERSION)
74+
PSP_EBOOT_TITLE = PX68K for PSP ver.$(PX68K_VERSION)
7575
PSP_EBOOT_ICON = psp_logo.png
7676

7777
PSPSDK=$(shell psp-config --pspsdk-path)

‎develop.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
PX68K ( Portable (x)keropi PRO-68K )
33

44
ソースを自分でコンパイルする際に役に立つかもしれないドキュメント
5-
2014/04/01 ひっそりぃ
5+
2014/07/04 ひっそりぃ
66

77
■開発環境について
88

@@ -28,9 +28,9 @@ PX68K ( Portable (x)keropi PRO-68K )
2828

2929
・Mac OS X
3030

31-
Mac OS X 10.9.2
32-
SDL2-2.0.1
33-
SDL2_gfx-1.0.0
31+
Mac OS X 10.9.3
32+
SDL2-2.0.3
33+
SDL2_gfx-1.0.1
3434
Xcode 5.0.2 (GUIは使わずMakefileを用いてコマンドからmake)
3535

3636

‎kaiseki.txt

+23
Original file line numberDiff line numberDiff line change
@@ -509,3 +509,26 @@ Software Keyboard は PSP または OpenGL ES 1.1 専用
509509
Page0の(0, 0)を下位4ビットに, Page1の(0, 0)を上位4ビットに,
510510
Page0の(1, 0)を下位4ビットに, Page1の(1, 0)を上位4ビットに,
511511

512+
** 2014/07/04
513+
514+
* 一度解析したはずだが、すっかり忘れているのでもう一度
515+
516+
#define C68K_FETCH_BITS 8 // [4-12] default = 8
517+
#define C68K_ADR_BITS 24
518+
#define C68K_FETCH_SFT (C68K_ADR_BITS - C68K_FETCH_BITS) -> 16
519+
#define C68K_FETCH_BANK (1 << C68K_FETCH_BITS) -> 256
520+
#define C68K_FETCH_MASK (C68K_FETCH_BANK - 1) -> 255 = 0xff
521+
522+
CPU->Fetch[256]
523+
524+
C68k_Set_Fetch(&C68K, 0xc00000, 0xc7ffff, (UINT32)GVRAM);
525+
526+
i = 0xc0, j = 0xc7
527+
fetch_adr = fetch_adr - (0xc0 << 16) = 0x12345678 - 0xc00000
528+
CPU->Fetch[0xc0] = fetch_adr
529+
CPU->Fetch[0xc1] = fetch_adr
530+
: :
531+
CPU->Ftech[0xc7] = fetch_adr
532+
533+
仮想MPUが0xc12345にアクセスする場合は、
534+
CPU->Fetch[0xc1] + 0xc12345 がホストCPUのアドレスになる

‎px68k-android/jni/src/Android.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
LOCAL_PATH := $(call my-dir)
22

3+
include ../../../version.txt
34
include $(CLEAR_VARS)
45

56
LOCAL_MODULE := main
@@ -80,7 +81,7 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c $(PX68KSRCS)
8081

8182
LOCAL_SHARED_LIBRARIES := SDL2
8283

83-
LOCAL_CFLAGS += -DUSE_OGLES11
84+
LOCAL_CFLAGS += -DUSE_OGLES11 -DPX68K_VERSION=$(PX68K_VERSION)
8485

8586
LOCAL_LDLIBS := -lGLESv1_CM -llog
8687

‎px68k-ios/mk_deb_pkg.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,16 @@ cd px68k-ios
3434

3535
mkdir DEBIAN
3636

37+
VER=`cat ~/src/px68k/version.txt | sed '/PX68K_VERSION=//'`
38+
3739
# make DEBIAN/control file
3840
cat <<EOF > DEBIAN/control
3941
Name: px68k
4042
Package: com.fc2.blog45.hissorii.px68k
4143
Author: hissorii
4244
Maintainer: hissorii <[email protected]>
4345
Section: Games
44-
Version: 0.05
46+
Version: ${VER}
4547
Architecture: iphoneos-arm
4648
Description: Portable X68000 Emulator
4749
Depiction: http://hissorii.blog45.fc2.com

‎px68k-ios/px68k-ios.xcodeproj/project.pbxproj

+8-2
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,10 @@
784784
INFOPLIST_FILE = "px68k-ios/px68k-ios-Info.plist";
785785
IPHONEOS_DEPLOYMENT_TARGET = 6.1;
786786
LIBRARY_SEARCH_PATHS = libsdl/debug;
787-
OTHER_CFLAGS = "-DUSE_OGLES11";
787+
OTHER_CFLAGS = (
788+
"-DUSE_OGLES11",
789+
"-DPX68K_VERSION=0.15",
790+
);
788791
OTHER_LDFLAGS = "-lSDL2";
789792
PRODUCT_NAME = "$(TARGET_NAME)";
790793
WRAPPER_EXTENSION = app;
@@ -808,7 +811,10 @@
808811
INFOPLIST_FILE = "px68k-ios/px68k-ios-Info.plist";
809812
IPHONEOS_DEPLOYMENT_TARGET = 6.1;
810813
LIBRARY_SEARCH_PATHS = libsdl/release;
811-
OTHER_CFLAGS = "-DUSE_OGLES11";
814+
OTHER_CFLAGS = (
815+
"-DUSE_OGLES11",
816+
"-DPX68K_VERSION=0.15",
817+
);
812818
OTHER_LDFLAGS = "-lSDL2";
813819
PRODUCT_NAME = "$(TARGET_NAME)";
814820
WRAPPER_EXTENSION = app;

‎readme.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ポータブルX68000エミュレータ
22
PX68K ( Portable (x)keropi PRO-68K )
3-
2014/07/03
3+
2014/07/09
44

55
いろいろなデバイスで X68000 エミュレータが動作したら楽しいな、
66
と思い立ち、この PX68K を作りはじめました。
@@ -607,6 +607,7 @@ PX68K は以下の成分からできています。
607607
2014/07/03 UI の FDD/HDD 番号を 0 origin に変更
608608
2014/07/03 2 台目の HDD イメージに対応
609609
2014/07/03 サウンドの出力周波数を UI で変更できるようにした
610+
2014/07/09 PX68K のバージョンを UI に表示するようにした
610611

611612

612613
9. 免責

‎version.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
PX68K_VERSION=0.15

‎x11/menu_str_sjis.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ char twaku_str[] = "
22
char twaku2_str[] = "�� ��";
33
char twaku3_str[] = "������������������������������������������������������";
44

5-
char title_str[] = "�r�v�h�s�b�g ������ �o�w�U�W�j Version 0.03";
5+
char title_str[] = "�r�v�h�s�b�g ������ �o�w�U�W�j Version ";
66

7-
char pc98_title1_str[] = "�r�v�h�s�b�g�R�}���h Ver. 0.03";
7+
char pc98_title1_str[] = "�r�v�h�s�b�g�R�}���h Ver. ";
88
char pc98_title2_str[] = "�������������������������������� Copyright (C) hissorii 2013";
99
char pc98_title3_str[] = " (���݂̐ݒ�l)";
1010

‎x11/windraw.c

+5-2
Original file line numberDiff line numberDiff line change
@@ -1788,6 +1788,7 @@ static void ogles11_draw_menu(void)
17881788
void WinDraw_DrawMenu(int menu_state, int mkey_pos, int mkey_y, int *mval_y)
17891789
{
17901790
int i, drv;
1791+
char tmp[256];
17911792

17921793
// ソフトウェアキーボード描画時にset_sbp(kbd_buffer)されているので戻す
17931794
#if defined(PSP) || defined(USE_OGLES11)
@@ -1810,11 +1811,13 @@ void WinDraw_DrawMenu(int menu_state, int mkey_pos, int mkey_y, int *mval_y)
18101811

18111812
set_mcolor(0xffff);
18121813
set_mlocateC(1, 1);
1813-
draw_str(title_str);
1814+
sprintf(tmp, "%s%s", title_str, PX68KVERSTR);
1815+
draw_str(tmp);
18141816
} else {
18151817
set_mcolor(0xffff);
18161818
set_mlocateC(0, 0);
1817-
draw_str(pc98_title1_str);
1819+
sprintf(tmp, "%s%s", pc98_title1_str, PX68KVERSTR);
1820+
draw_str(tmp);
18181821
set_mlocateC(0, 2);
18191822
draw_str(pc98_title3_str);
18201823
set_mcolor(0x07ff);

‎x11/winx68k.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ int main(int argc, char *argv[])
594594
sceCtrlSetSamplingMode(PSP_CTRL_MODE_ANALOG);
595595
#endif
596596

597-
p6logd("20131205 %d %s\n", 123, "hoge");
597+
p6logd("PX68K Ver.%s\n", PX68KVERSTR);
598598

599599
#ifdef RFMDRV
600600
struct sockaddr_in dest;

‎x11/winx68k.h

+4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ extern int rfd_sock;
2121
#define FULLSCREEN_POSX ((FULLSCREEN_WIDTH - SCREEN_WIDTH) / 2)
2222
#define FULLSCREEN_POSY ((FULLSCREEN_HEIGHT - SCREEN_HEIGHT) / 2)
2323

24+
#define TOSTR(s) #s
25+
#define _TOSTR(s) TOSTR(s)
26+
#define PX68KVERSTR _TOSTR(PX68K_VERSION)
27+
2428
extern BYTE* FONT;
2529

2630
extern WORD VLINE_TOTAL;

0 commit comments

Comments
 (0)