diff options
| -rw-r--r-- | melonDS.cbp | 22 | ||||
| -rw-r--r-- | src/libui_sdl/MelonCap.cpp | 43 | ||||
| -rw-r--r-- | src/libui_sdl/MelonCap.h | 34 | ||||
| -rw-r--r-- | src/libui_sdl/main.cpp | 16 |
4 files changed, 115 insertions, 0 deletions
diff --git a/melonDS.cbp b/melonDS.cbp index 0af2f4a..a9a7b72 100644 --- a/melonDS.cbp +++ b/melonDS.cbp @@ -53,6 +53,22 @@ <Add option="-m64" /> </Linker> </Target> + <Target title="DebugFast-Cap Windows"> + <Option platforms="Windows;" /> + <Option output="bin/DebugFast/melonDS" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj/DebugFast/" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-O3" /> + <Add option="-m64" /> + <Add option="-D_FILE_OFFSET_BITS=64" /> + <Add option="-DMELONCAP" /> + </Compiler> + <Linker> + <Add option="-m64" /> + </Linker> + </Target> </Build> <Compiler> <Add option="-Wall" /> @@ -143,6 +159,12 @@ <Unit filename="src/libui_sdl/LAN_PCap.h" /> <Unit filename="src/libui_sdl/LAN_Socket.cpp" /> <Unit filename="src/libui_sdl/LAN_Socket.h" /> + <Unit filename="src/libui_sdl/MelonCap.cpp"> + <Option target="DebugFast-Cap Windows" /> + </Unit> + <Unit filename="src/libui_sdl/MelonCap.h"> + <Option target="DebugFast-Cap Windows" /> + </Unit> <Unit filename="src/libui_sdl/OSD.cpp" /> <Unit filename="src/libui_sdl/OSD.h" /> <Unit filename="src/libui_sdl/Platform.cpp" /> diff --git a/src/libui_sdl/MelonCap.cpp b/src/libui_sdl/MelonCap.cpp new file mode 100644 index 0000000..aea187f --- /dev/null +++ b/src/libui_sdl/MelonCap.cpp @@ -0,0 +1,43 @@ +/* + Copyright 2016-2019 Arisotura + + This file is part of melonDS. + + melonDS is free software: you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free + Software Foundation, either version 3 of the License, or (at your option) + any later version. + + melonDS is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with melonDS. If not, see http://www.gnu.org/licenses/. +*/ + +#include <stdio.h> +#include <string.h> +#include "MelonCap.h" + + +namespace MelonCap +{ + +void Init() +{ + printf("MelonCap init\n"); +} + +void DeInit() +{ + // +} + + +void Update() +{ + // +} + +} diff --git a/src/libui_sdl/MelonCap.h b/src/libui_sdl/MelonCap.h new file mode 100644 index 0000000..1185dea --- /dev/null +++ b/src/libui_sdl/MelonCap.h @@ -0,0 +1,34 @@ +/* + Copyright 2016-2019 Arisotura + + This file is part of melonDS. + + melonDS is free software: you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free + Software Foundation, either version 3 of the License, or (at your option) + any later version. + + melonDS is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with melonDS. If not, see http://www.gnu.org/licenses/. +*/ + +#ifndef MELONCAP_H +#define MELONCAP_H + +#include "types.h" + +namespace MelonCap +{ + +void Init(); +void DeInit(); + +void Update(); + +} + +#endif // MELONCAP_H diff --git a/src/libui_sdl/main.cpp b/src/libui_sdl/main.cpp index d4afa22..13778ec 100644 --- a/src/libui_sdl/main.cpp +++ b/src/libui_sdl/main.cpp @@ -48,6 +48,10 @@ #include "OSD.h" +#ifdef MELONCAP +#include "MelonCap.h" +#endif // MELONCAP + // savestate slot mapping // 1-8: regular slots (quick access) @@ -999,6 +1003,10 @@ int EmuThreadFunc(void* burp) // emulate u32 nlines = NDS::RunFrame(); +#ifdef MELONCAP + MelonCap::Update(); +#endif // MELONCAP + if (EmuRunning == 0) break; if (Screen_UseGL) @@ -2739,6 +2747,10 @@ int main(int argc, char** argv) uiMenuItemSetChecked(MenuItem_AudioSync, Config::AudioSync==1); uiMenuItemSetChecked(MenuItem_ShowOSD, Config::ShowOSD==1); +#ifdef MELONCAP + MelonCap::Init(); +#endif // MELONCAP + AudioSync = SDL_CreateCond(); AudioSyncLock = SDL_CreateMutex(); @@ -2822,6 +2834,10 @@ int main(int argc, char** argv) if (MicWavBuffer) delete[] MicWavBuffer; +#ifdef MELONCAP + MelonCap::DeInit(); +#endif // MELONCAP + if (ScreenBitmap[0]) uiDrawFreeBitmap(ScreenBitmap[0]); if (ScreenBitmap[1]) uiDrawFreeBitmap(ScreenBitmap[1]); |