Skip to content

Commit

Permalink
Merge branch 'ocornut:master' into modern_windows_crashless_fullscreen
Browse files Browse the repository at this point in the history
  • Loading branch information
@bsittler
bsittler authored May 11, 2023
2 parents b014714 + 7c635bd commit 36bf498
Show file tree
Hide file tree
Showing 14 changed files with 230 additions and 128 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,5 @@ allegro.log
*.vcproj.*.user
*.vcxproj.user
.*.swp
*~
.*~
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ git clone --recursive https://github.com/ocornut/meka.git meka
Build
-----

- Windows: Using Visual Studio 2017 (free community edition is ok), open `meka/srcs/projects/msvc/Meka.sln` and build. The project is setup to grab dependencies (Allegro, Nasm) using Nuget.
- Windows: Using Visual Studio 2022 (free community edition is ok), open `meka/srcs/projects/msvc/Meka.sln` and build. The project is setup to grab dependencies (Allegro, Nasm) using Nuget.
- Linux: `cd meka/srcs ; make`
- OSX: `cd meka/srcs ; make` or open `meka/srcs/projects/xcode` with xcode (may be not up to date)

Expand Down
25 changes: 16 additions & 9 deletions meka/compat.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@
PAD/(PAD): Requires/Supports Paddle Control (ala Steering Wheel)
SP/(SP): Requires/Supports Sports Pad Controller
3D: Uses 3-D Glasses
SMS/GG: This version is a GG cartridge using the SMS compatibility mode
SMS-GG: This version is a GG cartridge using the SMS compatibility mode
SMS-MD: This version is an MD cartridge using the SMS compatibility mode
-----------------------------------------------------------------------------
128 Hap (KR) - *Ok
2 Hap in 1 (Moai-ui bomul, David-2) (KR) - *Ok
20 em 1 (BR) - Ok
3D Gunner [Proto] LP,3D Ok
4 PAK All Action (AU) - Ok
Expand Down Expand Up @@ -213,15 +215,16 @@
Fushigi no Oshiro Pit Pot (JP) - Ok
Fushigi no Oshiro Pit Pot [Proto] (JP) - Ok
Gaegujangi Kkachi (KR) - Ok
Game Mo-eumjip 188 Hap (KR) - Ok
Game Mo-eumjip 188 Hap [v0] (KR) - Ok
Game Mo-eumjip 188 Hap [v1] (KR) - Ok
Gain Ground 1 - Ok
Gain Ground [Proto] - Ok
Galactic Protector (JP) FM,PAD Ok
Galaxian (KR) - Ok
Galaxy Force FM Ok
Galaxy Force (US) FM Ok
Game Box Série Esportes Radicais (BR) FM Ok
Game Chongjiphap 200 (KR) - *Ok
Game Chongjiphap 200 (KR) - Ok
Game De Check! Koutsuu Anzen [Proto] (JP) FM Ok
Game Jiphap 30 Hap [SMS-MD] (KR) - *Ok
Gangcheol RoboCop (KR) - Ok
Expand Down Expand Up @@ -301,7 +304,8 @@
Incredible Hulk, The - Ok
Indiana Jones and the Last Crusade - Ok
Indiana Jones and the Last Crusade [Proto] - Ok
Jaemiissneun Game Mo-eumjip 42 Hap [SMS-MD] - *Ok
Jaemiissneun Game Mo-eumjip 42 Hap [SMS-MD] (KR) - *Ok
Jaemiissneun Game Mo-eumjip 65 Hap [SMS-MD] (KR) - *Ok
James Bond 007: The Duel - Ok
James Bond 007: The Duel (BR) - Ok
James "Buster" Douglas Knockout Boxing - Ok
Expand Down Expand Up @@ -357,6 +361,7 @@
Megumi Rescue (JP) FM,PAD Ok
Mercs - Ok
Mega Mode Super Game 30 [SMS-MD] (KR) - *Ok
Mega Mode Super Game 138 [SMS-MD] (KR) - *Ok
Mickey's Ultimate Challenge (BR) - Ok
Micro Machines - Ok
Micro Xevious, The (KR) - Ok
Expand Down Expand Up @@ -415,6 +420,7 @@
Phantasy Star (BR) - Ok
Phantasy Star (KR) - Ok
Phantasy Star Fukkokuban [SMS-MD] (JP) FM Ok
Pigu-Wang 7 Hap - Jaemiiss-neun Game Mo-eumjip (KR) - Ok
Pit-Fighter - Ok
Pit-Fighter (BR) - Ok
Populous - Ok
Expand Down Expand Up @@ -552,16 +558,16 @@
Super Bubble Bobble (KR) - Ok
Super Columns (KR) - Ok
Super Futebol II [Game Box Série Esportes] (BR)- Ok
Super Game 45 (KR) - Ok
Super Game 52 Hap (KR) - Ok
Super Game 150 (KR) - *Ok
Super Game 180 (KR) - *Ok
Super Game 200 (KR) - *Ok
Super Game 270 (KR) - *Ok
Super Game 270 Hap ~ Jaemissneun-270 (KR) - *Ok
Super Game 45 (KR) - *Ok
Super Game 52 Hap (KR) - *Ok
Super Game World 260 Hap (KR) - *Ok
Super Game World 30 Hap (KR) - *Ok
Super Game World 75 Hap (KR) - *Ok
Super Game World 260 Hap (KR) - *Ok
Superman - The Man of Steel - Ok
Super Kick Off - Ok
Super Monaco GP [v0] - Ok
Expand All @@ -571,7 +577,7 @@
Super Monaco GP [Proto 2] (US) - Ok
Super Monaco GP II (Ayrton Senna's) - Ok
Super Multi Game - Super 75 in 1 (KR) - *Ok
Super Multi Game - Super 125 in 1 (KR) - *Ok
Super Multi Game - Super 125 in 1 (KR) - Ok
Super Off Road - Ok
Super Off Road [Proto] - Ok
Super Penguin (KR) - Ok
Expand All @@ -581,6 +587,7 @@
Super Tennis - Ok
Super Tetris - Ok
Super Wonder Boy Monster World (Super...) (JP) FM Ok
Super World 30 Hap (KR) - *Ok
T2: The Arcade Game - Ok
Taito Chase H.Q. - Ok
Taito Chase H.Q. [Proto] - Ok
Expand Down Expand Up @@ -665,7 +672,7 @@
Zillion II: The Tri Formation [Proto] FM Ok
Zool - Ok
-----------------------------------------------------------------------------
645 games tested - 641 are "Ok"
651 games tested - 647 are "Ok"
-----------------------------------------------------------------------------

-----------------------------------------------------------------------------
Expand Down
Loading

0 comments on commit 36bf498

Please sign in to comment.