From 0598cc569db02ee93d7fc0470defecb64e995f5c Mon Sep 17 00:00:00 2001 From: blacksirius Date: Mon, 11 Jun 2012 23:31:19 +0000 Subject: Fixed bugreport:5990 OSX compiling error / warnings Bug in Detail: - Misplaced LDFLAGS uage in some Makefile templates (by passing them to the compiler not to the linker.) - Wrong usage of volatile (a functions return value couldnt be declared to return volatile :D ) - Unsupported Inline ASM using lock xchg operation on llvm-gcc .. (apple loves this ..) Fixed by: - Removed unnecessary LDFLAGS - Removed unnecessary volatile declarator - Replaced InterlockedExchange and InterlockedExchange64 with gcc intrinsics. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16270 54d463be-8e91-2dee-dedb-b68131a5f0ec --- 3rdparty/libconfig/Makefile.in | 2 +- 3rdparty/mt19937ar/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to '3rdparty') diff --git a/3rdparty/libconfig/Makefile.in b/3rdparty/libconfig/Makefile.in index ab03d4154..b0fa9a314 100644 --- a/3rdparty/libconfig/Makefile.in +++ b/3rdparty/libconfig/Makefile.in @@ -23,4 +23,4 @@ help: %.o: %.c $(LIBCONFIG_H) @echo " CC $<" - @@CC@ @CFLAGS@ @DEFS@ @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @@CC@ @CFLAGS@ @DEFS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< diff --git a/3rdparty/mt19937ar/Makefile.in b/3rdparty/mt19937ar/Makefile.in index 63f75fdad..8a7b64669 100644 --- a/3rdparty/mt19937ar/Makefile.in +++ b/3rdparty/mt19937ar/Makefile.in @@ -23,4 +23,4 @@ help: %.o: %.c $(MT19937AR_H) @echo " CC $<" - @@CC@ @CFLAGS@ @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @@CC@ @CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< -- cgit v1.2.3-60-g2f50