piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-23 14:19:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #222 from dogtopus/master

Browse Source 
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
parent 981661a36d 549bcf6d71
commit 12e33ae872
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -90,8 +90,12 @@ if (UNIX)
ADD_DEFINITIONS(${GTK3_CFLAGS_OTHER}) ADD_DEFINITIONS(${GTK3_CFLAGS_OTHER})
add_custom_command(OUTPUT melon_grc.c add_custom_command(OUTPUT melon_grc.c
COMMAND glib-compile-resources --generate-source melon_grc.xml COMMAND glib-compile-resources --sourcedir="${CMAKE_CURRENT_SOURCE_DIR}"
COMMAND glib-compile-resources --generate-header melon_grc.xml) --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") if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
LINK_LIBRARIES("dl") LINK_LIBRARIES("dl")

3
src/WifiAP.cpp
View File

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

1
src/libui_sdl/Platform.cpp
View File

@ -38,6 +38,7 @@
#define socket_t int #define socket_t int
#define sockaddr_t struct sockaddr #define sockaddr_t struct sockaddr
#define closesocket close #define closesocket close
#define PCAP_OPENFLAG_PROMISCUOUS 1
#endif #endif
#ifndef INVALID_SOCKET #ifndef INVALID_SOCKET