Merge pull request #222 from dogtopus/master

Fix build on linux, enable build directory support
This commit is contained in:
StapleButter 2018-02-19 12:50:54 +01:00 committed by GitHub
commit 12e33ae872
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions

View File

@ -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")

View File

@ -23,6 +23,9 @@
#include "WifiAP.h"
#include "Platform.h"
#ifndef __WIN32__
#include <stddef.h>
#endif
namespace WifiAP
{

View File

@ -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