diff options
| author | blacksirius <blacksirius@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-11 23:31:19 +0000 |
|---|---|---|
| committer | blacksirius <blacksirius@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-11 23:31:19 +0000 |
| commit | 0598cc569db02ee93d7fc0470defecb64e995f5c (patch) | |
| tree | 6b011ade431b1186329e5c2a468abd6c77fe5e65 /src/common/Makefile.in | |
| parent | b43920212e20b2169254b567266037f15485a02a (diff) | |
| download | hercules-0598cc569db02ee93d7fc0470defecb64e995f5c.tar.gz hercules-0598cc569db02ee93d7fc0470defecb64e995f5c.tar.bz2 hercules-0598cc569db02ee93d7fc0470defecb64e995f5c.tar.xz hercules-0598cc569db02ee93d7fc0470defecb64e995f5c.zip | |
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
Diffstat (limited to 'src/common/Makefile.in')
| -rw-r--r-- | src/common/Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/Makefile.in b/src/common/Makefile.in index b6713b6a1..379f80231 100644 --- a/src/common/Makefile.in +++ b/src/common/Makefile.in @@ -83,11 +83,11 @@ common_sql: obj_sql $(COMMON_SQL_OBJ) obj_sql/common_sql.a obj_all/%.o: %.c $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H) @echo " CC $<" - @@CC@ @CFLAGS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @@CC@ @CFLAGS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) @CPPFLAGS@ -c $(OUTPUT_OPTION) $< obj_all/mini%.o: %.c $(COMMON_H) $(MT19937AR_H) $(LIBCONFIG_H) @echo " CC $<" - @@CC@ @CFLAGS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) -DMINICORE @LDFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @@CC@ @CFLAGS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) -DMINICORE @CPPFLAGS@ -c $(OUTPUT_OPTION) $< obj_sql/%.o: %.c $(COMMON_H) $(COMMON_SQL_H) $(LIBCONFIG_H) @echo " CC $<" |