Update the LPC1768 project to only copy across one heap_x.c file as the addition of heap_4.c without it being excluded from the project was breaking the build.

pull/1/head
Richard Barry 12 years ago
parent a7eae6bed3
commit b85c071a79

File diff suppressed because it is too large Load Diff

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project>
<configuration id="com.crt.advproject.config.exe.debug.358435974" name="Debug">
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
</extension>
</configuration>
<configuration id="com.crt.advproject.config.exe.release.429003282" name="Release">
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
</extension>
</configuration>
</project>

@ -31,7 +31,7 @@ IF EXIST src\FreeRTOS Goto END
copy ..\..\Source\portable\GCC\ARM_CM3\*.* src\FreeRTOS\portable\GCC\ARM_CM3
REM Copy the basic memory allocation files
copy ..\..\Source\portable\MemMang\*.* src\FreeRTOS\portable\MemMang
copy ..\..\Source\portable\MemMang\heap_4.c src\FreeRTOS\portable\MemMang
REM Copy the files that define the common demo tasks.
copy ..\Common\minimal\BlockQ.c "src\Common Demo Tasks"

@ -75,7 +75,7 @@
* executed from within the IDE! Once it has been executed, re-open or refresh
* the Eclipse project and remove the #error line below.
*/
#error Ensure CreateProjectDirectoryStructure.bat has been executed before building. See comment immediately above.
//#error Ensure CreateProjectDirectoryStructure.bat has been executed before building. See comment immediately above.
#include "LPC17xx.h"

@ -46,6 +46,7 @@
*/
#include "FreeRTOS.h"
#include "task.h"
#include "queue.h"
#include <stdio.h>

@ -67,10 +67,6 @@
*/
#error The batch file Demo\CORTEX_LPC1768_GCC_RedSuite\CreateProjectDirectoryStructure.bat must be executed before the first build. After executing the batch file hit F5 to refrech the Eclipse project, then delete this line.
/*
* Creates all the demo application tasks, then starts the scheduler. The WEB
* documentation provides more details of the standard demo application tasks

Loading…
Cancel
Save