jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #451 from anbox/f/fixes

Browse source 
A few small fixes to make things building again inside Android
This commit is contained in:
Simon Fels 2017-09-08 09:11:45 +02:00 • committed by GitHub
commit df774db4a8
5 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -107,7 +107,7 @@ if (ANBOX_VERSION_SUFFIX)
endif()
set(ANBOX_RESOURCE_DIR "${CMAKE_INSTALL_DATADIR}/anbox")
set(ANBOX_RESOURCE_DIR_FULL "${CMAKE_INSTALL_FULL_DATADIR}/anbox")
set(ANBOX_STATEDIR_FULL "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/anbox")
set(ANBOX_STATEDIR_FULL "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/anbox")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/anbox/build/config.h.in
${CMAKE_CURRENT_SOURCE_DIR}/src/anbox/build/config.h)

2
android/opengl/system/GLESv1_enc/gl_client_proc.h
View file

@ -6,8 +6,6 @@
#include "gl_types.h"
#include "emugl/common/logging.h"
#ifndef gl_APIENTRY
#define gl_APIENTRY
#endif

2
android/opengl/system/GLESv2_enc/gl2_client_proc.h
View file

@ -6,8 +6,6 @@
#include "gl2_types.h"
#include "emugl/common/logging.h"
#ifndef gl2_APIENTRY
#define gl2_APIENTRY
#endif

2
android/opengl/system/renderControl_enc/renderControl_client_proc.h
View file

@ -6,8 +6,6 @@
#include "renderControl_types.h"
#include "emugl/common/logging.h"
#ifndef renderControl_APIENTRY
#define renderControl_APIENTRY
#endif

2
external/android-emugl/host/tools/emugen/ApiGen.cpp vendored
View file

@ -69,7 +69,6 @@ int ApiGen::genProcTypes(const std::string &filename, SideType side)
fprintf(fp, "#define __%s_%s_proc_t_h\n", basename, sideString(side));
fprintf(fp, "\n\n");
fprintf(fp, "\n#include \"%s_types.h\"\n",basename);
fprintf(fp, "\n#include \"emugl/common/logging.h\"\n");
fprintf(fp, "#ifndef %s_APIENTRY\n",basename);
fprintf(fp, "#define %s_APIENTRY \n",basename);
fprintf(fp, "#endif\n");
@ -754,6 +753,7 @@ int ApiGen::genDecoderHeader(const std::string &filename)
fprintf(fp, "#include \"IOStream.h\" \n");
fprintf(fp, "#include \"%s_%s_context.h\"\n\n\n", m_basename.c_str(), sideString(SERVER_SIDE));
fprintf(fp, "\n#include \"emugl/common/logging.h\"\n");
for (size_t i = 0; i < m_decoderHeaders.size(); i++) {
fprintf(fp, "#include %s\n", m_decoderHeaders[i].c_str());