** Qt porting for Common Source Code Project **
- June 18, 2016
+ Sep 23, 2016
K.Ohta <whatisthis.sowhat _at_ gmail.com>
* If you can't read Japanese, read readme.qt.txt .
用意しています。
ソースコード:
- https://github.com/Artanejp/common_source_project-fm7/releases/tag/SNAPSHOT_20160618-3
+ https://github.com/Artanejp/common_source_project-fm7/releases/tag/SNAPSHOT_20160923
追加情報:
各機種バイナリーは、osdn.jp もしくはミラーサイトより入手可能です。
Win32:
GNU/Linux(amd64) :
+【おねがい】
+ doc/以下の文書で日本語しかなかったものを英語に翻訳していますが、機械翻訳を使ってるのであやしいです。
+ 英語の上手い方、校正などお願いします m(_ _)m
1. 背景
CSPは、非常に優れた構造のエミュレータです(しかし、些か重くてコンパイラ
2. 最低限必要なもの(Qt版)
a. Qt5 ツールキット
- b. OpenGL, 多分、最低OpenGL 3.0は必要です。 (New!)
+ b. OpenGL, 多分、最低OpenGL 2.1は必要です。 (New!)
c. gcc / g++ (4.7以降?)もしくは llvm clang / clang++ (3.5以降?)
コンパイラツールチェーン。
d. SDL2 (SDL 1.xではないので注意)
e. CMake 2.8以降。
f. ffmpegから、libavとlibswが必要です。 http://ffmpeg.org/ より。
-
+ g. ffmpegは、それぞれのランタイムに必要なものをバンドルしてあります
+ ので、動かない時はインストールしてみてください。
+ h. GNU/Linuxビルドでは、Qt5.3でビルドしてあります(Ubuntu 16.04LTS向け)
* Windows もしくは GNU/Linux のcross tool chain (要Wine)で、
- MinGW と Qt 5.5.1 でのビルドができることを確認しました。
+ MinGW と Qt 5.7 でのビルドができることを確認しました。
* TIPS:
Windows等で動かした時に、画面の書き替えが表示されない場合は、
2カラム目はQtネィティブのスキャンキーコードです。
・UI部分の共通コンポーネント (src/qt/gui) を共有ライブラリlibCSPgui.soにまとめました。
・インストール用のBASHスクリプトを用意しました。src/tool/installer_unix.shです。
-
+ ・ROMと同じところに、特定のWAVファイル(VMによって異なる)を入れると、FDDのシーク音やテープのボタン音・リレー音を鳴らすことが出来ます。
5. 移植状況
a. 現在、Debian GNU/Linux "sid" の AMD64版でしかテストしていません。
Qt5を使っています。
添付してあるバイナリは、Qt 5.5でビルドしました(が、Qt 5.1以降なら動くはずです)。
- c.上流の2016-04-17現在でのPX7以外の全ての仮想マシンがQtに移植出来ています。
- d. Linux用ビルドでは、GCC 6をリンク時最適化(LTO)モードで使っています。
+ c. Linux用ビルドでは、GCC 6をリンク時最適化(LTO)モードで使っています。
+ d. MZ-2500のソケット機能を実装してみていますが、マトモにテストできてません(;´Д`)
6. Upstream repositry:
https://github.com/Artanejp/common_source_project-fm7
https://www.pikacode.com/Artanejp/common_source_project-fm7/
-7. Upstream (Takeda Toshiyaさんのオリジナル)
- http://homepage3.nifty.com/takeda-toshiya/
+7. Project Page:
+ https://osdn.jp/projects/csp-qt/
+
+8. Upstream (Takeda Toshiyaさんのオリジナル)
+ http://takeda-toshiya.my.coocan.jp/
Changes:
-* SNAPSHOT June 18, 2016
- * Upstream 2016-04-13 .
- * Build with FFMPEG 3.0.2 .
- * [MOVIE_SAVER] More safer open/close.
- * [MOVIE_SAVER] Fix deadlock when closing movie.
- * [MOVIE_SAVER] Selectable both MPEG4v1 and H.264(libx264) for video codec.
- * [MOVIE_SAVER][Qt] Temporally set video-codec to MPEG4 (not AVC).
- This is issue of discard frames with libx264 by ffmpeg's libavcodec/libavformat.
- This seems to be ffmpeg's issue, not my program.
- * Build with 629f7d70816c04b38c3ab8cc277147a6bd2c2d2a (or later).
-
--- Jun 18, 2016 03:32:06 +0900 K.Ohta <whatisthis.sowhat@gmail.com>
-
-* SNAPSHOT June 11, 2016
- * Upstream 2016-04-13 .
- * Use osdn.jp to distibute binaries.
- https://osdn.jp/projects/csp-qt .
- * [MOVIE_SAVER] Use ffmpeg internal aac codec, because faac or fdk_aac are not *Free* .
- * [VM/MOVIE_SAVER] Fix stopping when changing cartridge, now refer to upstream (split movies).
- * [Qt/Win32] Fix not work with WindowsXP, using homebrew version of ffmpeg-2.8.7.
- * Build with 89d31ce8daa733ea4a0c38f0a1890d3a0fcfce38 (or later).
-
--- Jun 11, 2016 05:09:55 +0900 K.Ohta <whatisthis.sowhat@gmail.com>
-
-* SNAPSHOT June 09, 2016
- * Upstream 2016-04-13 .
- * Now, all of binaries are built with ffmpeg-2.8.7 at GNU/Linux, with ffmpeg-3.0 at Windows.
- * Please read README.ffmpeg.txt .
- * [FM7/Disk] Add exceptions for Xanadu Scenario 2, this has not booted with changes 49dceaca9401d3c6037cb51ec013ca032ff0e83c .
- * Build with 64df71cd492be91289f883224640f42cace090ed (or later).
-
--- Jun 09, 2016 05:50:50 +0900 K.Ohta <whatisthis.sowhat@gmail.com>
-
-* SNAPSHOT June 08, 2016
- * Upstream 2016-04-13 .
- * Add movie saver, using libav with x264.
- * Now, all of binaries are built with ffmpeg-3.0.
- * Build with 2142d5c7426e21cfeedbaea0450f238f8b4d7d38 (or later).
-
--- Jun 08, 2016 07:34:45 +0900 K.Ohta <whatisthis.sowhat@gmail.com>
-
-* SNAPSHOT May 23-2, 2016
- * Win32 binary only RELEASE
- * Fix unable to run with some natibve Windows environment.
- * Build with c1448dc84f5439c7c8931614a8397dbefb6383da .
-
--- May 24, 2016 22:42:00 +0900 K.Ohta <whatisthis.sowhat@gmail.com>
-
-* SNAPSHOT May 23, 2016
- * Upstream 2016-04-13 .
- * [Win32] Now built with -msse -msse2 . You can run only later than Pentium4 .
- * Move FILEIO:: FIFO:: COMMON:: to libCSPemu_utils .
- * Make OSD:: to inherited by OSD_BASE:: .
- * [Win32] Disable LINKFLAGS with "-static-libgcc -static-libstdc++" to reduce size of executions, now, bundled libstc++ is for gcc-5 .
- * [Win32/Build] Support build with MSYS2 (but not display because MSYS2's Qt was build without OpenGL).
- * [Linux] Build shared libraries with Link-Time-Optimize, reduce size of libs.
- * [X1/VM] Configurable buttons for X1/Turbo/Turbo Z.
- * [FM7/FDC] Set MB8877_NO_BUSY_AFTER_SEEK. Fixed unable to boot OS0. Thanks to Anna_Wu.
- * [FM77AV/MB61VH010] ALULINE: Reduce CPU usage (at delta X > delta Y).
- * [UI/Qt/DRAW] Fix crash sometimes when exit emulator.
- * Build with 1c1ddc85dfa7456b1ce48662c2e2930dcc4fc9d8 (or later).
-
--- May 23, 2016 02:22:07 +0900 K.Ohta <whatisthis.sowhat@gmail.com>
+
+* SNAPSHOT September 23, 2016
+ * Upstream 2016-04-13
+ * [DOC] Translated some documents written in Japanese only to English using Google-Translate, still not enaugh to be corrected.
+ * [Qt/WIN32] Fix crash on startup (maybe true) caused by (´∀`)<ぬるぽ ヽ(・∀・)ノ┌┛ガッΣ(ノ`Д´)ノ
+ * [VM] Add original name and role to all device and VM components.
+ * [VM/FM7] JOYSTICK: Fix not redirect triggers.
+ * [VM/FM7][MB8877/DISK] Workaround for RIGLAS/FM-7. Perhaps, below have side-effect, add special-disk to RIGLAS FM.
+ ** Don't "NOT READY" even stopping motor.
+ ** Transfer even stopping motor.
+ * [EVENT] Remove logging on cancel event.
+ * [Qt/Debugger] Not hang-up when Opening debugger and exit emu{foo}. This is temporally workaround.
+ * [Qt/Debugger] Don't close with close button, this is temporally workaround.
+ * [UI/Qt] Fix selecting printers.
+ * [VM/PC9801] Add prepair of using ITF ROM, this is still only preparation.
+ * Built with GIT 8cdb1dbebf95d7371e514886c23edc6c9401848a (or later).
+
+-- Sep 23, 2016 19:48:12 +0900 K.Ohta <whatisthis.sowhat@gmail.com>
+
+* SNAPSHOT September 09, 2016
+ * Upstream 2016-04-13
+ * [LOGGER] Add extend logger.
+ * [LOGGER/Qt] Rename agar_logger.[cpp|h] to csp_logger.[cpp|h] .
+ * [VM] Ready to enable log per device.
+ * [VM] Update emu->out_debug_log to [DEVICE]->out_debug_log .
+ * [UI/Qt] Add log viewer window.
+ * [Qt/EMUTHREAD] Move commonly blocks to gui/ .
+ * [Qt/KEY] Use queue for keyin/out.
+ * [VM/OSD] Add socket (networking) featuers, but still not test (;´Д`)
+ * [VM/FM77AV] MB61VH010 : Faster drawing lines.
+ * [VM/FM7] MAINIO: Comment out logging around FIRQ, temporally.
+ * [OSD/KEYBOARD] Fix handling around SHIFT for some machines(i.e. PC8801).
+ * [MOVIE_SAVER] Use SIMD to transfer a picture OSD(VM)->MOVIE_SAVER .
+ * [DOC] Update updtream's URL, moved to takeda-toshiya.my.coocan.jp .
+ * Built with GIT 1884b5247665d71c06fc6590b17434c5f3350ad5 (or later).
+
+-- Sep 09, 2016 01:02:51 +0900 K.Ohta <whatisthis.sowhat@gmail.com>
+
+* SNAPSHOT August 19, 2016
+ * Upstream 2016-04-13
+ * [WIN32] Replace libICU to homebrew, fix not starting.
+ * [OSD/MOVIE_SAVER] Fix frames to enqueue to MOVIUE_SAVER, as if VIDEO FPS >= RECORD FPS.
+ * [MOVIE_LOADER] Sync A/V on playing MOVIE.
+ * Built with GIT 77380a77b25ca06965b912c84509e5c91085aeb1 (or later) .
+
+-- Aug 19, 2016 23:12:36 +0900 K.Ohta <whatisthis.sowhat@gmail.com>
+
+* SNAPSHOT August 15, 2016
+ * Upstream 2016-04-13
+ * [OSD][MOVIE_SAVER] Maybe correctness frame(s) counting with 60fps ヽ(=´▽=)ノ
+ * [MOVIE_SAVER] Fix sometimes crashing when stop to save movie.
+ * [PX7/MOVIE_LOADER] Sound Laser Disc, but not be smooth.
+ * [MOVIE_SAVER][PC8801][PC9801] Adjust sound frequency when OVERRIDE_48000Hz , still choppy.
+ * Built with GIT 3f4c809912dc92cdeb34d8ecdebe0087aa7f37b3 (or later) .
+
+-- Aug 16, 2016 02:40:55 +0900 K.Ohta <whatisthis.sowhat@gmail.com>
+
+* SNAPSHOT August 09, 2016
+ * Upstream 2016-04-13
+ * [PX7] Add movie loader for LD, but not tested enough yet.
+ * [MOVIE_SAVER/OpenGL] Add locking around drawing buffer.
+ * [BUILD] Update FFMPEG to 3.1.1 .
+ * [FFMPEG/LINUX] Enable OpenCL for ffmpeg @linux.You need libOpenCL.so.1 to use homebrew build.
+ * [FFMPEG/WIN32] Enable DXVA2 for video-decoding accelerator.
+ * [MOVIE_SAVER] Synchronous OPEN->ENCODEING->CLOSING.
+ * [UI/MOVIE_SAVER] DO NOT change state of "Save as movie" without *real* starting/stopping.
+ * [Draw/OpenGL] Optimize GLSL's by https://github.com/aras-p/glsl-optimizer .
+ * Built with GIT fc7a03a9337287414e00777464ab273c4f44ea44 (or later) .
+
+-- Aug 10, 2016 01:42:51 +0900 K.Ohta <whatisthis.sowhat@gmail.com>
Upstream changes:
-----