Linux compile fixes

This commit is contained in:
baldurk
2015-08-23 20:38:13 +02:00
parent 6c9120ff61
commit 357735d1d2
5 changed files with 7 additions and 3 deletions
+1 -1
View File
@@ -67,7 +67,7 @@ void library_loaded()
CaptureOptions optstruct;
readCapOpts(optstr.c_str(), &optstruct);
RenderDoc::Inst().SetCaptureOptions(&optstruct);
RenderDoc::Inst().SetCaptureOptions(optstruct);
}
if(logfile)
+1
View File
@@ -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>
+3 -1
View File
@@ -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;
}
}
+2
View File
@@ -22,6 +22,8 @@
* THE SOFTWARE.
******************************************************************************/
#include <float.h>
#include "common/common.h"
#include "core/core.h"
#include "api/replay/capture_options.h"
-1
View File
@@ -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