From 4512c5a6e00c2e9dc7bc1b12d145f5630f4b59c1 Mon Sep 17 00:00:00 2001 From: CTurt Date: Sun, 6 Sep 2015 18:39:59 +0100 Subject: [PATCH] Take out the trash --- PC/Makefile | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/PC/Makefile b/PC/Makefile index 4581eca..3084134 100644 --- a/PC/Makefile +++ b/PC/Makefile @@ -1,6 +1,5 @@ CC := gcc -CP := g++ -LN := g++ +LN := gcc ODIR := build SDIR := source IDIR := include @@ -8,9 +7,7 @@ LDIR := lib CFLAGS := -I$(IDIR) -fms-extensions -O2 -Wall LFLAGS := $(LDIR)/vJoyInterface.lib -lws2_32 -lGdi32 -lgdiplus -static-libgcc CFILES := $(wildcard $(SDIR)/*.c) -CPPFILES := $(wildcard $(SDIR)/*.cpp) -OBJS := $(patsubst $(SDIR)/%.c, build/%.o, $(wildcard $(SDIR)/*.c)) -OBJS += $(patsubst $(SDIR)/%.cpp, build/%.o, $(wildcard $(SDIR)/*.cpp)) +OBJS := $(patsubst $(SDIR)/%.c, $(ODIR)/%.o, $(wildcard $(SDIR)/*.c)) PLATFORM = $(shell uname) @@ -32,9 +29,6 @@ $(TARGET): $(ODIR) $(OBJS) $(ODIR)/%.o: $(SDIR)/%.c $(CC) -c -o $@ $< $(CFLAGS) -$(ODIR)/%.o: $(SDIR)/%.cpp - $(CP) -c -o $@ $< $(CFLAGS) - $(ODIR): @mkdir $@