From 45ac9b351e0076c371de4c7453f59567b27b1cb6 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 10 Jan 2015 21:45:26 +0100 Subject: [PATCH] Moved softfloat to 3rdparty (nw) --- {src/lib => 3rdparty}/softfloat/README.txt | 0 {src/lib => 3rdparty}/softfloat/fpu_constant.h | 0 {src/lib => 3rdparty}/softfloat/fsincos.c | 0 {src/lib => 3rdparty}/softfloat/fyl2x.c | 0 {src/lib => 3rdparty}/softfloat/mamesf.h | 0 {src/lib => 3rdparty}/softfloat/milieu.h | 0 {src/lib => 3rdparty}/softfloat/softfloat-macros | 0 {src/lib => 3rdparty}/softfloat/softfloat-specialize | 0 {src/lib => 3rdparty}/softfloat/softfloat.c | 0 {src/lib => 3rdparty}/softfloat/softfloat.h | 0 src/emu/cpu/i386/i386.h | 4 ++-- src/emu/cpu/m68000/m68000.h | 4 ++-- src/lib/lib.mak | 12 +++++++----- 13 files changed, 11 insertions(+), 9 deletions(-) rename {src/lib => 3rdparty}/softfloat/README.txt (100%) rename {src/lib => 3rdparty}/softfloat/fpu_constant.h (100%) rename {src/lib => 3rdparty}/softfloat/fsincos.c (100%) rename {src/lib => 3rdparty}/softfloat/fyl2x.c (100%) rename {src/lib => 3rdparty}/softfloat/mamesf.h (100%) rename {src/lib => 3rdparty}/softfloat/milieu.h (100%) rename {src/lib => 3rdparty}/softfloat/softfloat-macros (100%) rename {src/lib => 3rdparty}/softfloat/softfloat-specialize (100%) rename {src/lib => 3rdparty}/softfloat/softfloat.c (100%) rename {src/lib => 3rdparty}/softfloat/softfloat.h (100%) diff --git a/src/lib/softfloat/README.txt b/3rdparty/softfloat/README.txt similarity index 100% rename from src/lib/softfloat/README.txt rename to 3rdparty/softfloat/README.txt diff --git a/src/lib/softfloat/fpu_constant.h b/3rdparty/softfloat/fpu_constant.h similarity index 100% rename from src/lib/softfloat/fpu_constant.h rename to 3rdparty/softfloat/fpu_constant.h diff --git a/src/lib/softfloat/fsincos.c b/3rdparty/softfloat/fsincos.c similarity index 100% rename from src/lib/softfloat/fsincos.c rename to 3rdparty/softfloat/fsincos.c diff --git a/src/lib/softfloat/fyl2x.c b/3rdparty/softfloat/fyl2x.c similarity index 100% rename from src/lib/softfloat/fyl2x.c rename to 3rdparty/softfloat/fyl2x.c diff --git a/src/lib/softfloat/mamesf.h b/3rdparty/softfloat/mamesf.h similarity index 100% rename from src/lib/softfloat/mamesf.h rename to 3rdparty/softfloat/mamesf.h diff --git a/src/lib/softfloat/milieu.h b/3rdparty/softfloat/milieu.h similarity index 100% rename from src/lib/softfloat/milieu.h rename to 3rdparty/softfloat/milieu.h diff --git a/src/lib/softfloat/softfloat-macros b/3rdparty/softfloat/softfloat-macros similarity index 100% rename from src/lib/softfloat/softfloat-macros rename to 3rdparty/softfloat/softfloat-macros diff --git a/src/lib/softfloat/softfloat-specialize b/3rdparty/softfloat/softfloat-specialize similarity index 100% rename from src/lib/softfloat/softfloat-specialize rename to 3rdparty/softfloat/softfloat-specialize diff --git a/src/lib/softfloat/softfloat.c b/3rdparty/softfloat/softfloat.c similarity index 100% rename from src/lib/softfloat/softfloat.c rename to 3rdparty/softfloat/softfloat.c diff --git a/src/lib/softfloat/softfloat.h b/3rdparty/softfloat/softfloat.h similarity index 100% rename from src/lib/softfloat/softfloat.h rename to 3rdparty/softfloat/softfloat.h diff --git a/src/emu/cpu/i386/i386.h b/src/emu/cpu/i386/i386.h index 8fe66f8bc5c..feb64e42778 100644 --- a/src/emu/cpu/i386/i386.h +++ b/src/emu/cpu/i386/i386.h @@ -5,8 +5,8 @@ #ifndef __I386INTF_H__ #define __I386INTF_H__ -#include "../../../lib/softfloat/milieu.h" -#include "../../../lib/softfloat/softfloat.h" +#include "../../../../3rdparty/softfloat/milieu.h" +#include "../../../../3rdparty/softfloat/softfloat.h" #include "debug/debugcpu.h" #include "cpu/vtlb.h" diff --git a/src/emu/cpu/m68000/m68000.h b/src/emu/cpu/m68000/m68000.h index 6890c484307..75463aea183 100644 --- a/src/emu/cpu/m68000/m68000.h +++ b/src/emu/cpu/m68000/m68000.h @@ -6,8 +6,8 @@ -#include "../../../lib/softfloat/milieu.h" -#include "../../../lib/softfloat/softfloat.h" +#include "../../../../3rdparty/softfloat/milieu.h" +#include "../../../../3rdparty/softfloat/softfloat.h" /* MMU constants */ diff --git a/src/lib/lib.mak b/src/lib/lib.mak index 497c027ab47..613940e8a78 100644 --- a/src/lib/lib.mak +++ b/src/lib/lib.mak @@ -281,8 +281,8 @@ $(LIBOBJ)/zlib/%.o: $(3RDPARTY)/zlib/%.c | $(OSPREBUILD) # SoftFloat library objects #------------------------------------------------- -PROCESSOR_H = $(LIBSRC)/softfloat/processors/mamesf.h -SOFTFLOAT_MACROS = $(LIBSRC)/softfloat/softfloat/bits64/softfloat-macros +PROCESSOR_H = $(3RDPARTY)/softfloat/processors/mamesf.h +SOFTFLOAT_MACROS = $(3RDPARTY)/softfloat/softfloat/bits64/softfloat-macros SOFTFLOATOBJS = \ $(LIBOBJ)/softfloat/softfloat.o \ @@ -291,10 +291,12 @@ SOFTFLOATOBJS = \ $(OBJ)/libsoftfloat.a: $(SOFTFLOATOBJS) -$(LIBOBJ)/softfloat/softfloat.o: $(LIBSRC)/softfloat/softfloat.c $(LIBSRC)/softfloat/softfloat.h $(LIBSRC)/softfloat/softfloat-macros $(LIBSRC)/softfloat/softfloat-specialize -$(LIBOBJ)/softfloat/fsincos.o: $(LIBSRC)/softfloat/fsincos.c $(LIBSRC)/softfloat/fpu_constant.h $(LIBSRC)/softfloat/softfloat.h $(LIBSRC)/softfloat/softfloat-macros $(LIBSRC)/softfloat/softfloat-specialize - +$(LIBOBJ)/softfloat/softfloat.o: $(3RDPARTY)/softfloat/softfloat.c $(3RDPARTY)/softfloat/softfloat.h $(3RDPARTY)/softfloat/softfloat-macros $(3RDPARTY)/softfloat/softfloat-specialize +$(LIBOBJ)/softfloat/fsincos.o: $(3RDPARTY)/softfloat/fsincos.c $(3RDPARTY)/softfloat/fpu_constant.h $(3RDPARTY)/softfloat/softfloat.h $(3RDPARTY)/softfloat/softfloat-macros $(3RDPARTY)/softfloat/softfloat-specialize +$(LIBOBJ)/softfloat/%.o: $(3RDPARTY)/softfloat/%.c | $(OSPREBUILD) + @echo Compiling $<... + $(CC) $(CDEFS) $(CFLAGS) -c $< -o $@ #------------------------------------------------- # libJPEG library objects