all repos — mgba @ abc5fbeb387e93d9194714eff8ba78669701d5f3

mGBA Game Boy Advance Emulator

Python: Fix build
Vicki Pfau vi@endrift.com
Thu, 20 Jun 2019 14:02:45 -0700
commit

abc5fbeb387e93d9194714eff8ba78669701d5f3

parent

120e1006d04ed62e011b2342842ac6c54f0673c3

M CMakeLists.txtCMakeLists.txt

@@ -785,6 +785,10 @@ elseif(BUILD_GLES2)

set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libgles2") endif() +if (WIN32 AND NOT USE_EPOXY) + message(FATAL_ERROR "Windows requires epoxy module!") +endif() + if(USE_SQLITE3) list(APPEND FEATURES SQLITE3) include_directories(AFTER ${SQLITE3_INCLUDE_DIRS})
M src/platform/cmake/Findepoxy.cmakesrc/platform/cmake/Findepoxy.cmake

@@ -8,7 +8,3 @@

if(EPOXY_LIBRARIES AND EPOXY_INCLUDE_DIRS) set(epoxy_FOUND TRUE) endif() - -if (WIN32 AND NOT epoxy_FOUND) - message(FATAL_ERROR "Windows requires epoxy module!") -endif()
M src/platform/python/_builder.hsrc/platform/python/_builder.h

@@ -5,6 +5,7 @@ #define _SYS_TIME_H

#define _SYS_TIME_H_ #define _TIME_H #define _TIME_H_ +#define MGBA_EXPORT #define ATTRIBUTE_FORMAT(X, Y, Z) #define DECL_BITFIELD(newtype, oldtype) typedef oldtype newtype
M src/platform/python/_builder.pysrc/platform/python/_builder.py

@@ -18,6 +18,7 @@

ffi.set_source("mgba._pylib", """ #define static #define inline +#define MGBA_EXPORT #include <mgba/flags.h> #define OPAQUE_THREADING #include <mgba/core/blip_buf.h>