Skip to content

Commit

Permalink
Fix builds for non-Win32
Browse files Browse the repository at this point in the history
  • Loading branch information
RisingFog committed Sep 2, 2016
1 parent 7ca9087 commit 78d1af4
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
6 changes: 6 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1190,6 +1190,12 @@ else()
ext/disarm.cpp)
endif()

if (NOT MOBILE_DEVICE)
set(CoreExtra ${CoreExtra}
Core/AVIDump.cpp
Core/AVIDump.h)
endif()

if(ARMV7)
set(CORE_NEON Core/Util/AudioFormatNEON.cpp Core/Util/AudioFormatNEON.h)
endif()
Expand Down
9 changes: 8 additions & 1 deletion UI/EmuScreen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@

#include "Common/KeyMap.h"

#ifndef MOBILE_DEVICE
#include "Core/AVIDump.h"
#endif
#include "Core/Config.h"
#include "Core/CoreTiming.h"
#include "Core/CoreParameter.h"
Expand Down Expand Up @@ -71,7 +73,9 @@
#include "Windows/MainWindow.h"
#endif

#ifndef MOBILE_DEVICE
AVIDump avi;
#endif

static bool frameStep_;
static int lastNumFlips;
Expand All @@ -85,7 +89,7 @@ static void __EmuScreenVblank()
Core_EnableStepping(true);
lastNumFlips = gpuStats.numFlips;
}

#ifndef MOBILE_DEVICE
if (g_Config.bDumpFrames && !startDumping)
{
avi.Start(PSP_CoreParameter().renderWidth, PSP_CoreParameter().renderHeight);
Expand All @@ -102,6 +106,7 @@ static void __EmuScreenVblank()
osm.Show("AVI Dump stopped.", 3.0f);
startDumping = false;
}
#endif
}

EmuScreen::EmuScreen(const std::string &filename)
Expand Down Expand Up @@ -249,12 +254,14 @@ EmuScreen::~EmuScreen() {
// If we were invalid, it would already be shutdown.
PSP_Shutdown();
}
#ifndef MOBILE_DEVICE
if (g_Config.bDumpFrames && startDumping)
{
avi.Stop();
osm.Show("AVI Dump stopped.", 3.0f);
startDumping = false;
}
#endif
}

void EmuScreen::dialogFinished(const Screen *dialog, DialogResult result) {
Expand Down

0 comments on commit 78d1af4

Please sign in to comment.