From 20e2097e286bc41a36671cb78c2ad7039f505a66 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Sun, 14 Jul 2013 07:36:37 +0200 Subject: Cleaning up cruft. --- Balau | 2 +- Makefile | 53 ----------------------------------------------------- 2 files changed, 1 insertion(+), 54 deletions(-) diff --git a/Balau b/Balau index 2ff5eca..79ed0f9 160000 --- a/Balau +++ b/Balau @@ -1 +1 @@ -Subproject commit 2ff5eca44aefd7e6233b5f8fa628af7fc81ec3d1 +Subproject commit 79ed0f94c0c682e2902d8787885a007189a010b2 diff --git a/Makefile b/Makefile index bf331cd..b4282cf 100644 --- a/Makefile +++ b/Makefile @@ -37,59 +37,6 @@ ifeq ($(SYSTEM),Darwin) ARCH_FLAGS = -arch i386 LD = clang++ -arch i386 STRIP = strip -x - ifeq ($(TRUESYSTEM),Linux) - CROSSCOMPILE = true - ARCH_FLAGS = - CC = i686-apple-darwin9-gcc - CXX = i686-apple-darwin9-g++ - LD = i686-apple-darwin9-g++ -arch i386 -mmacosx-version-min=10.5 - STRIP = i686-apple-darwin9-strip -x - AS = i686-apple-darwin9-as -arch i386 - AR = i686-apple-darwin9-ar rcs - endif -endif - -ifeq ($(SYSTEM),MINGW32) - BINEXT = exe - COMPILE_PTHREADS = true - CONFIG_H = Balau/mingw32-config.h - INCLUDES += Balau/win32/iconv Balau/win32/pthreads-win32 Balau/win32/regex Balau/win32/dbghelp - LIBS += ws2_32 ntdll - ifeq ($(TRUESYSTEM),Linux) - ifeq ($(DISTRIB),CentOS) - CROSSCOMPILE = true - CC = i686-pc-mingw32-gcc - CXX = i686-pc-mingw32-g++ - LD = i686-pc-mingw32-g++ - AS = i686-pc-mingw32-gcc -c - STRIP = i686-pc-mingw32-strip --strip-unneeded - WINDRES = i686-pc-mingw32-windres - AR = i686-pc-mingw32-ar rcs - LUAJIT_CROSS = i686-pc-mingw32- - else - CROSSCOMPILE = true - CC = i586-mingw32msvc-gcc - CXX = i586-mingw32msvc-g++ - LD = i586-mingw32msvc-g++ - AS = i586-mingw32msvc-gcc -c - STRIP = i586-mingw32msvc-strip --strip-unneeded - WINDRES = i586-mingw32msvc-windres - AR = i586-mingw32msvc-ar rcs - LUAJIT_CROSS = i586-mingw32msvc- - endif - LUAJIT_TARGET = Windows - endif - - ifeq ($(TRUESYSTEM),Darwin) - CROSSCOMPILE = true - CC = i386-mingw32-gcc - CXX = i386-mingw32-g++ - LD = i386-mingw32-g++ - AS = i386-mingw32-gcc -c - STRIP = i386-mingw32-strip --strip-unneeded - WINDRES = i386-mingw32-windres - AR = i386-mingw32-ar rcs - endif endif ifeq ($(SYSTEM),Linux) -- cgit v1.2.3