locate library files in standard way

Makefile.common

@@ -7,7 +7,7 @@ INCFLAGS := \
 	-I$(CORE_DIR)/cpu/m68000 \
 	-I$(CORE_DIR)/mame2003 \
 	-I$(LIBRETRO_COMM_DIR)/include \
- 	-I$(CORE_DIR)/lib/libFLAC/include \
+ 	-I$(CORE_DIR)/libretro-deps/libFLAC/include \
  	-I$(CORE_DIR)/lib/mame-chd \
 	-I$(CORE_DIR)/lib/zlib
 
@@ -2651,24 +2651,24 @@ endif
 
 SOURCES_C += \
 	$(CORE_DIR)/lib/mame-chd/chd.c \
-	$(CORE_DIR)/lib/mame-chd/libchdr_sha1.c
+	$(CORE_DIR)/lib/mame-chd/mame_sha1.c
 
 SOURCES_C += \
-	$(CORE_DIR)/lib/libFLAC/bitmath.c \
-	$(CORE_DIR)/lib/libFLAC/bitreader.c \
-	$(CORE_DIR)/lib/libFLAC/bitwriter.c \
-	$(CORE_DIR)/lib/libFLAC/cpu.c \
-	$(CORE_DIR)/lib/libFLAC/crc.c \
-	$(CORE_DIR)/lib/libFLAC/fixed.c \
-	$(CORE_DIR)/lib/libFLAC/float.c \
-	$(CORE_DIR)/lib/libFLAC/format.c \
-	$(CORE_DIR)/lib/libFLAC/lpc.c \
-	$(CORE_DIR)/lib/libFLAC/md5.c \
-	$(CORE_DIR)/lib/libFLAC/memory.c \
-	$(CORE_DIR)/lib/libFLAC/stream_decoder.c \
-	$(CORE_DIR)/lib/libFLAC/stream_encoder.c \
-	$(CORE_DIR)/lib/libFLAC/stream_encoder_framing.c \
-	$(CORE_DIR)/lib/libFLAC/window.c
+	$(CORE_DIR)/libretro-deps/libFLAC/bitmath.c \
+	$(CORE_DIR)/libretro-deps/libFLAC/bitreader.c \
+	$(CORE_DIR)/libretro-deps/libFLAC/bitwriter.c \
+	$(CORE_DIR)/libretro-deps/libFLAC/cpu.c \
+	$(CORE_DIR)/libretro-deps/libFLAC/crc.c \
+	$(CORE_DIR)/libretro-deps/libFLAC/fixed.c \
+	$(CORE_DIR)/libretro-deps/libFLAC/float.c \
+	$(CORE_DIR)/libretro-deps/libFLAC/format.c \
+	$(CORE_DIR)/libretro-deps/libFLAC/lpc.c \
+	$(CORE_DIR)/libretro-deps/libFLAC/md5.c \
+	$(CORE_DIR)/libretro-deps/libFLAC/memory.c \
+	$(CORE_DIR)/libretro-deps/libFLAC/stream_decoder.c \
+	$(CORE_DIR)/libretro-deps/libFLAC/stream_encoder.c \
+	$(CORE_DIR)/libretro-deps/libFLAC/stream_encoder_framing.c \
+	$(CORE_DIR)/libretro-deps/libFLAC/window.c
 
 ifeq ($(STATIC_LINKING),1)
 else
@@ -2683,7 +2683,6 @@ SOURCES_C += \
 	$(LIBRETRO_COMM_DIR)/streams/file_stream.c \
 	$(LIBRETRO_COMM_DIR)/string/stdstring.c \
 	$(LIBRETRO_COMM_DIR)/utils/md5.c \
-	$(LIBRETRO_COMM_DIR)/utils/sha1.c \
 	$(LIBRETRO_COMM_DIR)/vfs/vfs_implementation.c \
 	$(CORE_DIR)/lib/zlib/adler32.c \
 	$(CORE_DIR)/lib/zlib/compress.c \

src/common.c

@@ -11,7 +11,7 @@
 #include <stdarg.h>
 #include <ctype.h>
 #include <string/stdstring.h>
-#include "lib/libFLAC/include/FLAC/all.h"
+#include "libretro-deps/libFLAC/include/FLAC/all.h"
 #include "log.h"
 //#define LOG_LOAD
 

src/hash.c

@@ -131,7 +131,7 @@
 #include <zlib.h>
 #include "hash.h"
 #include <utils/md5.h>
-#include <utils/sha1.h>
+#include "mame_sha1.h"
 #include "osd_cpu.h"
 #include "mame.h"
 #include "common.h"

src/lib/mame-chd/chd.c

@@ -7,7 +7,7 @@
 #include <chd.h>
 #include <retro_inline.h>
 #include <utils/md5.h>
-#include <utils/sha1.h>
+#include "mame_sha1.h"
 #include <zlib.h>
 #include <time.h>
 #include <string.h>

src/lib/mame-chd/mame_sha1.c

@@ -23,7 +23,7 @@
  * MA 02111-1307, USA.
  */
 
-#include <utils/sha1.h>
+#include <mame_sha1.h>
 
 #include <assert.h>
 #include <stdlib.h>

src/lib/mame-chd/mame_sha1.h

@@ -1,61 +1,61 @@
-/* sha1.h
- *
- * The sha1 hash function.
- */
-
-/* nettle, low-level cryptographics library
- *
- * Copyright (C) 2001 Niels Möller
- *  
- * The nettle library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at your
- * option) any later version.
- * 
- * The nettle library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with the nettle library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA 02111-1307, USA.
- */
- 
-#ifndef NETTLE_SHA1_H_INCLUDED
-#define NETTLE_SHA1_H_INCLUDED
-
-#include <stdint.h>
-
-#define SHA1_DIGEST_SIZE 20
-#define SHA1_DATA_SIZE 64
-
-/* Digest is kept internally as 4 32-bit words. */
-#define _SHA1_DIGEST_LENGTH 5
-
-struct sha1_ctx
-{
-  uint32_t digest[_SHA1_DIGEST_LENGTH];   /* Message digest */
-  uint32_t count_low, count_high;         /* 64-bit block count */
-  uint8_t block[SHA1_DATA_SIZE];          /* SHA1 data buffer */
-  unsigned int index;                     /* index into buffer */
-};
-
-void
-sha1_init(struct sha1_ctx *ctx);
-
-void
-sha1_update(struct sha1_ctx *ctx,
-	    unsigned length,
-	    const uint8_t *data);
-
-void
-sha1_final(struct sha1_ctx *ctx);
-
-void
-sha1_digest(const struct sha1_ctx *ctx,
-	    unsigned length,
-	    uint8_t *digest);
-
-#endif /* NETTLE_SHA1_H_INCLUDED */
+/* sha1.h
+ *
+ * The sha1 hash function.
+ */
+
+/* nettle, low-level cryptographics library
+ *
+ * Copyright (C) 2001 Niels M�ller
+ *  
+ * The nettle library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ * 
+ * The nettle library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+ * License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with the nettle library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA 02111-1307, USA.
+ */
+ 
+#ifndef NETTLE_SHA1_H_INCLUDED
+#define NETTLE_SHA1_H_INCLUDED
+
+#include <stdint.h>
+
+#define SHA1_DIGEST_SIZE 20
+#define SHA1_DATA_SIZE 64
+
+/* Digest is kept internally as 4 32-bit words. */
+#define _SHA1_DIGEST_LENGTH 5
+
+struct sha1_ctx
+{
+  uint32_t digest[_SHA1_DIGEST_LENGTH];   /* Message digest */
+  uint32_t count_low, count_high;         /* 64-bit block count */
+  uint8_t block[SHA1_DATA_SIZE];          /* SHA1 data buffer */
+  unsigned int index;                     /* index into buffer */
+};
+
+void
+sha1_init(struct sha1_ctx *ctx);
+
+void
+sha1_update(struct sha1_ctx *ctx,
+	    unsigned length,
+	    const uint8_t *data);
+
+void
+sha1_final(struct sha1_ctx *ctx);
+
+void
+sha1_digest(const struct sha1_ctx *ctx,
+	    unsigned length,
+	    uint8_t *digest);
+
+#endif /* NETTLE_SHA1_H_INCLUDED */