Update cygwin makefile shenanigans.

This commit is contained in:
James Benton 2016-08-19 00:34:39 +01:00
parent eb4f5d6905
commit e6e886bdbd
10 changed files with 5 additions and 23 deletions

View File

@ -1,10 +1,10 @@
ifeq ($(shell uname -s),CYGWIN*)
ifeq ($(findstring CYGWIN,$(shell uname -s)),CYGWIN)
WUT_ROOT := $(shell cygpath -w ${CURDIR})
else
WUT_ROOT := $(CURDIR)
endif
TARGETS := crt rpl tools
TARGETS := tools crt rpl
export WUT_ROOT

View File

@ -1,6 +1,5 @@
include $(CURDIR)/../rules/ppc.mk
WUT_ROOT := $(CURDIR)/..
CFILES := $(wildcard *.c)
SFILES := $(wildcard *.S)
OFILES := $(CFILES:.c=.o) $(SFILES:.S=.o)

View File

@ -1,4 +1,3 @@
WUT_ROOT := $(CURDIR)/..
TARGETS := libcoreinit libgx2 libnsysnet libvpad libsysapp libproc_ui
all:

View File

@ -1,6 +1,6 @@
.SUFFIXES:
ifeq ($(shell uname -s),CYGWIN*)
ifeq ($(findstring CYGWIN,$(shell uname -s)),CYGWIN)
CUR_DIR := $(shell cygpath -w ${CURDIR})
else
CUR_DIR := $(CURDIR)
@ -13,11 +13,6 @@ INCLUDE := .
DATA := data
LIBS :=
ifneq ($(BUILD),$(notdir $(CURDIR)))
WUT_ROOT := $(CUR_DIR)/../..
else
WUT_ROOT := $(CUR_DIR)/../../..
endif
include $(WUT_ROOT)/rules/ppc.mk
LD := $(PREFIX)ld

View File

@ -1,9 +1,3 @@
ifeq ($(shell uname -s),CYGWIN*)
WUT_ROOT := $(shell cygpath -w ${WUT_ROOT})
else
WUT_ROOT := $(WUT_ROOT)
endif
LIBPATHS := -L$(WUT_ROOT)/lib
CFLAGS := -I$(WUT_ROOT)/include -fno-builtin -ffreestanding -fno-jump-tables
CXXFLAGS := $(CFLAGS)

View File

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

View File

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

View File

@ -1,6 +1,5 @@
.SUFFIXES:
WUT_ROOT := $(CURDIR)/..
TARGETS := elf2rpl readrpl
ifeq ($(OS),Windows_NT)

View File

@ -1,5 +1,3 @@
WUT_ROOT := $(CURDIR)/../..
TARGET := elf2rpl
SOURCE := .
INCLUDE := ../common

View File

@ -1,5 +1,3 @@
WUT_ROOT := $(CURDIR)/../..
TARGET := readrpl
SOURCE := .
INCLUDE := ../common ../ext/cppformat ../ext/excmd/src