From 357735d1d2f9f32387aedc17180d14839f55929d Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Sun, 23 Aug 2015 20:38:13 +0200
Subject: [PATCH] Linux compile fixes

---
 renderdoc/os/linux/linux_libentry.cpp | 2 +-
 renderdoc/os/linux/linux_process.cpp  | 1 +
 renderdoc/replay/app_api.cpp          | 4 +++-
 renderdoc/replay/capture_options.cpp  | 2 ++
 renderdoccmd/Makefile                 | 1 -
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/renderdoc/os/linux/linux_libentry.cpp b/renderdoc/os/linux/linux_libentry.cpp
index 151c847be..c88c29533 100644
--- a/renderdoc/os/linux/linux_libentry.cpp
+++ b/renderdoc/os/linux/linux_libentry.cpp
@@ -67,7 +67,7 @@ void library_loaded()
 			CaptureOptions optstruct;
 			readCapOpts(optstr.c_str(), &optstruct);
 
-			RenderDoc::Inst().SetCaptureOptions(&optstruct);
+			RenderDoc::Inst().SetCaptureOptions(optstruct);
 		}
 
 		if(logfile)
diff --git a/renderdoc/os/linux/linux_process.cpp b/renderdoc/os/linux/linux_process.cpp
index 7295fadb7..5e31606ee 100644
--- a/renderdoc/os/linux/linux_process.cpp
+++ b/renderdoc/os/linux/linux_process.cpp
@@ -25,6 +25,7 @@
 
 #include "os/os_specific.h"
 #include "api/app/renderdoc_app.h"
+#include "api/replay/capture_options.h"
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
diff --git a/renderdoc/replay/app_api.cpp b/renderdoc/replay/app_api.cpp
index 5b6408e54..e193c05b3 100644
--- a/renderdoc/replay/app_api.cpp
+++ b/renderdoc/replay/app_api.cpp
@@ -22,6 +22,8 @@
  * THE SOFTWARE.
  ******************************************************************************/
 
+#include <string.h>
+
 #include "common/common.h"
 #include "core/core.h"
 #include "hooks/hooks.h"
@@ -225,4 +227,4 @@ extern "C" RENDERDOC_API int RENDERDOC_CC RENDERDOC_GetAPI(RENDERDOC_Version ver
 
 	RDCERR("Unrecognised API version '%d'", version);
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/renderdoc/replay/capture_options.cpp b/renderdoc/replay/capture_options.cpp
index 68c58368f..a2d53ac1f 100644
--- a/renderdoc/replay/capture_options.cpp
+++ b/renderdoc/replay/capture_options.cpp
@@ -22,6 +22,8 @@
  * THE SOFTWARE.
  ******************************************************************************/
 
+#include <float.h>
+
 #include "common/common.h"
 #include "core/core.h"
 #include "api/replay/capture_options.h"
diff --git a/renderdoccmd/Makefile b/renderdoccmd/Makefile
index 0f7ceff8c..e8d0db556 100644
--- a/renderdoccmd/Makefile
+++ b/renderdoccmd/Makefile
@@ -3,7 +3,6 @@ CPP=g++
 COMMIT=`git rev-parse HEAD`
 MACROS=-DLINUX \
 			 -DRENDERDOC_PLATFORM=linux \
-			 -DRENDERDOC_EXPORTS \
 			 -DGIT_COMMIT_HASH="\"$(COMMIT)\""
 CFLAGS=-c -Wall -Werror -fPIC $(MACROS) -I../renderdoc/api/
 CPPFLAGS=-std=c++11 -g -Wno-unused -Wno-unknown-pragmas -Wno-reorder