Merge pull request #3 from mrordinaire/master

fix missing #include's and missing CMake linking directives

Common/CMakeLists.txt

@@ -22,6 +22,7 @@ set(SRCS
 	Timer.cpp
 	x64Analyzer.cpp
 	x64Emitter.cpp
+    x86Disasm.cpp
 )
 
 # TODO

Common/FixedSizeQueue.h

@@ -18,6 +18,8 @@
 #ifndef _FIXED_SIZE_QUEUE_H_
 #define _FIXED_SIZE_QUEUE_H_
 
+#include <cstring>
+
 // STL-look-a-like interface, but name is mixed case to distinguish it clearly from the
 // real STL classes.
 

Common/x86Disasm.cpp

@@ -5,8 +5,10 @@
 #error DO NOT COMPILE THIS INTO ANDROID BUILDS
 #endif
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
+#include <cstdarg>
 #include "x86Disasm.h"
 
 /*==============================unasmt.h==============================*/

Core/CMakeLists.txt

@@ -76,8 +76,11 @@ set(SRCS
 set(SRCS ${SRCS})
 
 add_library(core STATIC ${SRCS})
+target_link_libraries(core general common)
+target_link_libraries(core general base)
 
 if(UNIX)
   add_definitions(-fPIC)
+  add_definitions(-std=gnu++0x)
 endif(UNIX)
 

Core/CoreTiming.cpp

@@ -17,6 +17,7 @@
 
 
 #include <vector>
+#include <cstdio>
 
 #include "MsgHandler.h"
 #include "StdMutex.h"

Core/Debugger/Breakpoints.cpp

@@ -19,6 +19,7 @@
 #include "Breakpoints.h"
 #include "SymbolMap.h"
 #include "FixedSizeUnorderedSet.h"
+#include <cstdio>
 
 #define MAX_BREAKPOINTS 16
 

Core/Debugger/DebugInterface.h

@@ -16,6 +16,7 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #pragma once
+#include <cstdio>
 
 struct MemMap;
 

Core/FileSystems/BlockDevices.cpp

@@ -21,6 +21,8 @@ extern "C"
 };
 
 #include "BlockDevices.h"
+#include <cstdio>
+#include <cstring>
 
 FileBlockDevice::FileBlockDevice(std::string _filename)
 : filename(_filename)

Core/FileSystems/ISOFileSystem.cpp

@@ -18,6 +18,8 @@
 #include "Globals.h"
 #include "Log.h"
 #include "ISOFileSystem.h"
+#include <cstring>
+#include <cstdio>
 
 const int sectorSize = 2048;
 

Core/HLE/sceKernel.h

@@ -18,6 +18,7 @@
 #pragma once
 
 #include "../../Globals.h"
+#include <cstring>
 
 enum 
 {

Core/Host.h

@@ -17,6 +17,7 @@
 
 #pragma once
 
+#include <cstring>
 #include <string>
 #include "../Globals.h"
 

Core/MIPS/x86/Asm.cpp

@@ -18,7 +18,7 @@
 #include "ABI.h"
 #include "x64Emitter.h"
 
-#include "../../Memmap.h"
+#include "../../MemMap.h"
 
 #include "../MIPS.h"
 #include "../../CoreTiming.h"

Core/MemMap.cpp

@@ -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"

Core/Util/BlockAllocator.h

@@ -5,6 +5,7 @@
 
 #include <vector>
 #include <list>
+#include <cstring>
 
 
 // Generic allocator thingy

GPU/CMakeLists.txt

@@ -14,6 +14,8 @@ set(SRCS
 set(SRCS ${SRCS})
 
 add_library(gpu STATIC ${SRCS})
+target_link_libraries(gpu general gfx_es2)
+target_link_libraries(gpu general lin)
 
 if(UNIX)
   add_definitions(-fPIC)

GPU/GLES/FragmentShaderGenerator.cpp

@@ -25,6 +25,7 @@
 #include "FragmentShaderGenerator.h"
 #include "../ge_constants.h"
 #include "../GPUState.h"
+#include <cstdio>
 
 // TODO: remove
 static char buffer[16384];

GPU/GPUState.h

@@ -18,6 +18,7 @@
 #pragma once
 
 #include "../Globals.h"
+#include <cstring>
 
 // TODO: this doesn't belong here
 struct Color4

SDL/CMakeLists.txt

@@ -25,7 +25,9 @@ add_definitions(-fno-strict-aliasing)
 add_definitions(-DUSE_PROFILER)
 
 #Damn MacOSX
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
+if (UNIX)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
+endif()
 
 include_directories(..)
 include_directories(../Common)