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.

Sign up for GitHub

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

Fixes for Linux #4

Closed
wants to merge 1 commit into from
Closed

Fixes for Linux #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ set(SRCS
Timer.cpp
x64Analyzer.cpp
x64Emitter.cpp
x86Disasm.cpp
)

# TODO
Expand Down
4 changes: 3 additions & 1 deletion Common/FixedSizeQueue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
#ifndef _FIXED_SIZE_QUEUE_H_
#define _FIXED_SIZE_QUEUE_H_

#include "../Globals.h"

// STL-look-a-like interface, but name is mixed case to distinguish it clearly from the
// real STL classes.

Expand All @@ -36,7 +38,7 @@ class FixedSizeQueue
// Make copy constructor private for now.
FixedSizeQueue(FixedSizeQueue &other) { }

public:
public:
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This indentation needed? :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, fonts work now!
No idea for that line of the diff, I didn't even realize it was here.
Either I added it by inattention or my text editor added it by itself. But
it's probably not needed.

2012/11/3 Henrik Rydgård [email protected]

In Common/FixedSizeQueue.h:

@@ -36,7 +38,7 @@ class FixedSizeQueue
// Make copy constructor private for now.
FixedSizeQueue(FixedSizeQueue &other) { }

-public:

  • public:

This indentation needed? :)

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/4/files#r2024079.

FixedSizeQueue()
{
storage = new T[N];
Expand Down
2 changes: 1 addition & 1 deletion Common/x64Emitter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "MemoryUtil.h"

#if !defined(_M_IX86) && !defined(_M_X64)
#error Don't build this on arm.
#error Do not build this on arm.
#endif

namespace Gen
Expand Down
2 changes: 2 additions & 0 deletions Common/x86Disasm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#error DO NOT COMPILE THIS INTO ANDROID BUILDS
#endif

#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "x86Disasm.h"
Expand Down
2 changes: 1 addition & 1 deletion Core/MIPS/x86/Asm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "ABI.h"
#include "x64Emitter.h"

#include "../../Memmap.h"
#include "../../MemMap.h"

#include "../MIPS.h"
#include "../../CoreTiming.h"
Expand Down
2 changes: 1 addition & 1 deletion Core/MemMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "MemArena.h"
#include "ChunkFile.h"

#include "Memmap.h"
#include "MemMap.h"
#include "Core.h"
#include "MIPS/MIPS.h"
#include "MIPS/JitCommon/JitCommon.h"
Expand Down
3 changes: 3 additions & 0 deletions Globals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@

#include <vector>
#include <string>
#include <cstdio>
#include <cstdlib>
#include <cstring>

#include "Log.h"

Expand Down
4 changes: 3 additions & 1 deletion SDL/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ add_definitions(-DSDL)
add_definitions(-Wno-multichar)
add_definitions(-fno-strict-aliasing)
add_definitions(-DUSE_PROFILER)
add_definitions(-std=c++0x)

#Damn MacOSX
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
Expand Down Expand Up @@ -61,7 +62,8 @@ add_subdirectory(../Common Common)
add_subdirectory(../GPU GPU)
add_subdirectory(../Core Core)

set(LIBS ${LIBS} ${SDL_LIBRARY} ${OPENGL_LIBRARIES} GLEW file lin ${PNG_LIBRARY} z gfx gfx_es2 etcdec image stb_image mixer net ui profiler timeutil file zip base lin vjson stb_vorbis sha1 jsonwriter common core gpu)
set(LIBS ${LIBS} ${SDL_LIBRARY} ${OPENGL_LIBRARIES} GLEW file lin
${PNG_LIBRARY} z gfx etcdec image stb_image mixer net ui profiler zip base vjson stb_vorbis sha1 jsonwriter core common gpu timeutil file gfx_es2 lin)
set(FILES
../android/jni/NativeApp.cpp
../android/jni/EmuScreen.cpp
Expand Down