Lua now uses our fake FatFS when running in simu
This commit is contained in:
@@ -80,11 +80,14 @@ IF( Subversion_FOUND )
|
|||||||
# Subversion_WC_INFO( ${PROJECT_SOURCE_DIR} C9X )
|
# Subversion_WC_INFO( ${PROJECT_SOURCE_DIR} C9X )
|
||||||
ENDIF( )
|
ENDIF( )
|
||||||
|
|
||||||
|
set(RADIO_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/../../radio/src)
|
||||||
|
|
||||||
include_directories(
|
include_directories(
|
||||||
${CMAKE_CURRENT_BINARY_DIR}
|
${CMAKE_CURRENT_BINARY_DIR}
|
||||||
${PROJECT_SOURCE_DIR}/../..
|
${RADIO_SRC_DIRECTORY}/../..
|
||||||
${PROJECT_SOURCE_DIR}/../../radio/src/fonts/std
|
${RADIO_SRC_DIRECTORY}
|
||||||
${PROJECT_SOURCE_DIR}/../../radio/src/lua/src
|
${RADIO_SRC_DIRECTORY}/fonts/std
|
||||||
|
${RADIO_SRC_DIRECTORY}/lua/src
|
||||||
)
|
)
|
||||||
|
|
||||||
set(TH9X_CHECKOUT_DIRECTORY ${PROJECT_BINARY_DIR}/firmwares/th9x)
|
set(TH9X_CHECKOUT_DIRECTORY ${PROJECT_BINARY_DIR}/firmwares/th9x)
|
||||||
@@ -114,8 +117,6 @@ add_custom_command(
|
|||||||
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/firmwares/ersky9x/ersky9xsimulator.cpp
|
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/firmwares/ersky9x/ersky9xsimulator.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
set(RADIO_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/../../radio/src)
|
|
||||||
|
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.lbm
|
OUTPUT ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.lbm
|
||||||
COMMAND make lbm
|
COMMAND make lbm
|
||||||
@@ -306,7 +307,6 @@ ENDIF( )
|
|||||||
INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} )
|
INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} )
|
||||||
INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} )
|
INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} )
|
||||||
|
|
||||||
|
|
||||||
SET( LANGUAGES he pl pt ru de fr it sv cs )
|
SET( LANGUAGES he pl pt ru de fr it sv cs )
|
||||||
FOREACH( language ${LANGUAGES} )
|
FOREACH( language ${LANGUAGES} )
|
||||||
SET( companion_TS ${companion_TS} translations/companion_${language}.ts )
|
SET( companion_TS ${companion_TS} translations/companion_${language}.ts )
|
||||||
|
|||||||
@@ -11,10 +11,7 @@
|
|||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
|
||||||
// #define LUA_LIB
|
#define USE_FATFS
|
||||||
#if !defined(SIMU)
|
|
||||||
#define USE_FATFS
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** ==================================================================
|
** ==================================================================
|
||||||
|
|||||||
@@ -534,7 +534,9 @@ FRESULT f_chdir (const TCHAR *name)
|
|||||||
|
|
||||||
FRESULT f_opendir (DIR * rep, const TCHAR * name)
|
FRESULT f_opendir (DIR * rep, const TCHAR * name)
|
||||||
{
|
{
|
||||||
rep->fs = (FATFS *)simu::opendir(convertSimuPath(name));
|
char *path = convertSimuPath(name);
|
||||||
|
TRACE("f_opendir(%s)", path);
|
||||||
|
rep->fs = (FATFS *)simu::opendir(path);
|
||||||
return FR_OK;
|
return FR_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user