Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DSPSpy: Fix build failures #1841

Merged
merged 1 commit into from Jan 9, 2015
Merged

DSPSpy: Fix build failures #1841

merged 1 commit into from Jan 9, 2015

Conversation

ghost
Copy link

@ghost ghost commented Jan 7, 2015

Remove dangling #endif include guard left by d203804

main_spy.cpp
In file included from dolphin/Source/DSPSpy/./main_spy.cpp:47:0:
dolphin/Source/DSPSpy/./dsp_interface.h:36:2: error: #endif without #if
 #endif  // _DSP_INTERFACE_H
  ^

Enable C++0x support for nullptr introduced by d802d39
-std=c++0x was used instead of -std=c++11 to support older versions of DevkitPPC (r23-26) that use GCC 4.6.x

main_spy.cpp
dolphin/Source/DSPSpy/./main_spy.cpp:54:1: warning: identifier 'nullptr' is a keyword in C++11 [-Wc++0x-compat]
 static void *xfb = nullptr;
 ^
dolphin/Source/DSPSpy/./main_spy.cpp:54:20: error: 'nullptr' was not declared in this scope
 static void *xfb = nullptr;
                    ^
dolphin/Source/DSPSpy/./main_spy.cpp: In function 'void InitGeneral()':
dolphin/Source/DSPSpy/./main_spy.cpp:529:33: error: 'nullptr' was not declared in this scope
  rmode = VIDEO_GetPreferredMode(nullptr);
                                 ^

Tested and built using DevkitPPC r27

- Remove dangling #endif include guard from #pragma once conversion
- Enable C++0x support for nullptr support
@skidau
Copy link
Contributor

skidau commented Jan 8, 2015

@dolphin-emu-bot rebuild

skidau added a commit that referenced this pull request Jan 9, 2015
DSPSpy: Fix build failures
@skidau skidau merged commit feba284 into dolphin-emu:master Jan 9, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
1 participant