Compilation fixes

This commit is contained in:
bsongis
2015-03-14 14:56:59 +01:00
committed by Bertrand Songis
parent 2817866ad2
commit 821a198e92
10 changed files with 38 additions and 12 deletions
+1 -1
View File
@@ -38,7 +38,7 @@
#define audio_h
#include <stddef.h>
#include "FatFs/ff.h"
#include "ff.h"
#define AUDIO_FILENAME_MAXLEN (42) //max length example: /SOUNDS/fr/123456789012/1234567890-off.wav
#define AUDIO_QUEUE_LENGTH (20)
+1 -1
View File
@@ -35,7 +35,7 @@
*/
#include "opentx.h"
#include "FatFs/ff.h"
#include "ff.h"
FIL g_oLogFile = {0};
const pm_char * g_logError = NULL;
+2 -2
View File
@@ -35,8 +35,8 @@
*/
#include <stdint.h>
#include "FatFs/diskio.h"
#include "FatFs/ff.h"
#include "diskio.h"
#include "ff.h"
#define LIST_NONE_SD_FILE 1
+1 -1
View File
@@ -37,7 +37,7 @@
#ifndef _SDCARD_H_
#define _SDCARD_H_
#include "FatFs/ff.h"
#include "ff.h"
#define ROOT_PATH "/"
#define MODELS_PATH ROOT_PATH "MODELS" // no trailing slash = important
+1 -1
View File
@@ -644,7 +644,7 @@ namespace simu {
#include <libgen.h>
#endif
}
#include "FatFs/ff.h"
#include "ff.h"
#if defined WIN32 || !defined __GNUC__
#include <direct.h>
@@ -28,6 +28,7 @@ BINX = $(CP) -O binary
OBJDIR = .
THIRDPARTY = ../../../thirdparty
FATFSDIR = $(THIRDPARTY)/FatFs
ifeq ($(PCBREV), REV9E)
MCU = cortex-m4
@@ -81,7 +82,7 @@ endif
# PCB revision
PCBREV =
EXTRAINCDIRS = $(THIRDPARTY)
EXTRAINCDIRS = $(THIRDPARTY) $(FATFSDIR) $(FATFSDIR)/option
STM32USBPATH = ../../../thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries