aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt8
-rw-r--r--src/WifiAP.cpp3
-rw-r--r--src/libui_sdl/Platform.cpp1
3 files changed, 10 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 195f9d4..9d7a0e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,8 +90,12 @@ if (UNIX)
ADD_DEFINITIONS(${GTK3_CFLAGS_OTHER})
add_custom_command(OUTPUT melon_grc.c
- COMMAND glib-compile-resources --generate-source melon_grc.xml
- COMMAND glib-compile-resources --generate-header melon_grc.xml)
+ COMMAND glib-compile-resources --sourcedir="${CMAKE_CURRENT_SOURCE_DIR}"
+ --target="${CMAKE_CURRENT_BINARY_DIR}/melon_grc.c"
+ --generate-source "${CMAKE_CURRENT_SOURCE_DIR}/melon_grc.xml"
+ COMMAND glib-compile-resources --sourcedir="${CMAKE_CURRENT_SOURCE_DIR}"
+ --target="${CMAKE_CURRENT_BINARY_DIR}/melon_grc.h"
+ --generate-header "${CMAKE_CURRENT_SOURCE_DIR}/melon_grc.xml")
if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
LINK_LIBRARIES("dl")
diff --git a/src/WifiAP.cpp b/src/WifiAP.cpp
index f8c9f79..963b4d2 100644
--- a/src/WifiAP.cpp
+++ b/src/WifiAP.cpp
@@ -23,6 +23,9 @@
#include "WifiAP.h"
#include "Platform.h"
+#ifndef __WIN32__
+#include <stddef.h>
+#endif
namespace WifiAP
{
diff --git a/src/libui_sdl/Platform.cpp b/src/libui_sdl/Platform.cpp
index 507e0f3..80aa0e9 100644
--- a/src/libui_sdl/Platform.cpp
+++ b/src/libui_sdl/Platform.cpp
@@ -38,6 +38,7 @@
#define socket_t int
#define sockaddr_t struct sockaddr
#define closesocket close
+ #define PCAP_OPENFLAG_PROMISCUOUS 1
#endif
#ifndef INVALID_SOCKET