Skip to content

Commit 89b6d21

Browse files
committed
Fix windows build regression
1 parent 8de0a9b commit 89b6d21

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

configure.ac

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ case "${host_os}" in
6464
GTK_SERVER_CPPFLAGS="-DGTK_SERVER_WIN32"
6565
IOIO_CPPFLAGS=""
6666
IOIO_LDFLAGS=""
67+
NUKLEAR_CPPFLAGS=""
6768
;;
6869

6970
*)
@@ -76,6 +77,7 @@ case "${host_os}" in
7677
RAYLIB_LDFLAGS="-lGL -lm -lpthread -ldl -lrt -lX11"
7778
JVM_CPPFLAGS="-I/usr/lib/jvm/java-1.8.0-openjdk-amd64/include -I/usr/lib/jvm/java-1.8.0-openjdk-amd64/include/linux"
7879
JVM_LDFLAGS="-L/usr/lib/jvm/java-1.8.0-openjdk-amd64/jre/lib/amd64/server -ljvm"
80+
NUKLEAR_CPPFLAGS="-D_GLFW_X11=1"
7981
esac
8082

8183
AC_SUBST(DEBUG_LDFLAGS)
@@ -88,6 +90,7 @@ AC_SUBST(GTK_SERVER_LDFLAGS)
8890
AC_SUBST(GTK_SERVER_CPPFLAGS)
8991
AC_SUBST(JVM_LDFLAGS)
9092
AC_SUBST(JVM_CPPFLAGS)
93+
AC_SUBST(NUKLEAR_CPPFLAGS)
9194

9295
dnl change default aru setting to avoid warning
9396
ARFLAGS=cr

nuklear/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77

88
AM_CXXFLAGS=-fno-rtti -std=c++14
9-
AM_CPPFLAGS = -D_GLFW_BUILD_DLL=1 -D_GLFW_X11=1 \
9+
AM_CPPFLAGS = -D_GLFW_BUILD_DLL=1 @NUKLEAR_CPPFLAGS@ \
1010
-I../raylib/raylib/src/external/glfw/include \
1111
-I../raylib/raylib/src/external/glfw/deps
1212
lib_LTLIBRARIES = libnuklear.la

0 commit comments

Comments
 (0)