mika/nx-hbmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use iquote for libnx headers on pc (#29)

Browse Source
This commit is contained in:
Dave Murphy 2018-03-19 22:57:47 +00:00 committed by yellows8
parent 5731858272
commit 03a4de8c25
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.pc
View File

@ -27,7 +27,7 @@ test : pc_main/main.cpp pc_main/pc_launch.c \
build_pc/interuiregular14.o build_pc/interuiregular18.o \ build_pc/interuiregular14.o build_pc/interuiregular18.o \
build_pc/invalid_icon.bin.o build_pc/folder_icon.bin.o \ build_pc/invalid_icon.bin.o build_pc/folder_icon.bin.o \
build_pc/button_a_light.bin.o build_pc/button_a_dark.bin.o build_pc/button_b_light.bin.o build_pc/button_b_dark.bin.o build_pc/hbmenu_logo_light.bin.o build_pc/hbmenu_logo_dark.bin.o build_pc/button_a_light.bin.o build_pc/button_a_dark.bin.o build_pc/button_b_light.bin.o build_pc/button_b_dark.bin.o build_pc/hbmenu_logo_light.bin.o build_pc/hbmenu_logo_dark.bin.o
gcc -Wall -O2 -g -DVERSION=\"v$(APP_VERSION)\" $(EXTRA_CFLAGS) $^ -lsfml-graphics -lsfml-window -lsfml-system -lstdc++ -lm -lz $(EXTRA_LDFLAGS) -I. -I$(DEVKITPRO)/libnx/include -Ibuild_pc -g -o $@ gcc -Wall -O2 -g -DVERSION=\"v$(APP_VERSION)\" $(EXTRA_CFLAGS) $^ -lsfml-graphics -lsfml-window -lsfml-system -lstdc++ -lm -lz $(EXTRA_LDFLAGS) -I. -iquote $(DEVKITPRO)/libnx/include -Ibuild_pc -g -o $@
build_pc/tahoma12.o : data/tahoma12.nxfnt build_pc/tahoma12.o : data/tahoma12.nxfnt
mkdir -p $(dir $@) mkdir -p $(dir $@)

2
common/common.h
View File

@ -54,7 +54,7 @@ typedef union {
// when building for pc we need to include nro.h separately // when building for pc we need to include nro.h separately
#ifndef __SWITCH__ #ifndef __SWITCH__
#include <switch/nro.h> #include "switch/nro.h"
#endif #endif
void menuStartup(); void menuStartup();

1
common/netloader.c
View File

@ -32,6 +32,7 @@ typedef uint32_t in_addr_t;
// having trouble with non blocking sockets & udp on switch currently // having trouble with non blocking sockets & udp on switch currently
#ifndef __SWITCH__ #ifndef __SWITCH__
#include "switch/runtime/nxlink.h"
#define PING_ENABLED 1 #define PING_ENABLED 1
#else #else
#define PING_ENABLED 0 #define PING_ENABLED 0