The-Homebrew-Cloud/wut
2
0
Fork 0
mirror of https://github.com/wiiu-env/wut.git synced 2025-02-02 07:52:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35 from dibas/master

Browse Source 
Allow wut to build on OS X, fix helloworld example makefile
This commit is contained in:
James 2016-08-14 23:56:23 +01:00 committed by GitHub
commit 7c3022863a
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,4 +1,4 @@
ifeq ($(shell uname -o),Cygwin) ifeq ($(shell uname -s),CYGWIN*)
WUT_ROOT := $(shell cygpath -w ${CURDIR}) WUT_ROOT := $(shell cygpath -w ${CURDIR})
else else
WUT_ROOT := $(CURDIR) WUT_ROOT := $(CURDIR)

2
README.md
View File

@ -7,7 +7,7 @@ Doxygen output can be found at https://decaf-emu.github.io/wut
## Requirements ## Requirements
- devkitPRO + devkitPPC - devkitPRO + devkitPPC
- Only tested on Linux so far - Only tested on Linux and OS X so far
## Usage ## Usage
- git clone --recursive https://github.com/decaf-emu/wut.git - git clone --recursive https://github.com/decaf-emu/wut.git

2
rpl/common/rules.mk
View File

@ -1,6 +1,6 @@
.SUFFIXES: .SUFFIXES:
ifeq ($(shell uname -o),Cygwin) ifeq ($(shell uname -s),CYGWIN*)
CUR_DIR := $(shell cygpath -w ${CURDIR}) CUR_DIR := $(shell cygpath -w ${CURDIR})
else else
CUR_DIR := $(CURDIR) CUR_DIR := $(CURDIR)

2
rules/ppc.mk
View File

@ -1,4 +1,4 @@
ifeq ($(shell uname -o),Cygwin) ifeq ($(shell uname -s),CYGWIN*)
WUT_ROOT := $(shell cygpath -w ${WUT_ROOT}) WUT_ROOT := $(shell cygpath -w ${WUT_ROOT})
else else
WUT_ROOT := $(WUT_ROOT) WUT_ROOT := $(WUT_ROOT)

4
samples/helloworld/Makefile
View File

@ -4,7 +4,7 @@ ifeq ($(strip $(WUT_ROOT)),)
$(error "Please ensure WUT_ROOT is in your environment.") $(error "Please ensure WUT_ROOT is in your environment.")
endif endif
ifeq ($(shell uname -o),Cygwin) ifeq ($(shell uname -s),CYGWIN*)
ROOT := $(shell cygpath -w ${CURDIR}) ROOT := $(shell cygpath -w ${CURDIR})
WUT_ROOT := $(shell cygpath -w ${WUT_ROOT}) WUT_ROOT := $(shell cygpath -w ${WUT_ROOT})
else else
@ -18,7 +18,7 @@ BUILD := build
SOURCE := src SOURCE := src
INCLUDE := include INCLUDE := include
DATA := data DATA := data
LIBS := -lcoreinit -lproc_ui -lsysapp LIBS := -lgcc -lcrt -lcoreinit -lproc_ui -lsysapp
CFLAGS += -O2 -Wall -std=c11 CFLAGS += -O2 -Wall -std=c11
CXXFLAGS += -O2 -Wall CXXFLAGS += -O2 -Wall

2
samples/pong/Makefile
View File

@ -4,7 +4,7 @@ ifeq ($(strip $(WUT_ROOT)),)
$(error "Please ensure WUT_ROOT is in your environment.") $(error "Please ensure WUT_ROOT is in your environment.")
endif endif
ifeq ($(shell uname -o),Cygwin) ifeq ($(shell uname -s),CYGWIN*)
ROOT := $(shell cygpath -w ${CURDIR}) ROOT := $(shell cygpath -w ${CURDIR})
WUT_ROOT := $(shell cygpath -w ${WUT_ROOT}) WUT_ROOT := $(shell cygpath -w ${WUT_ROOT})
else else