freemyipod r895 - Code Review

Jump to: navigation, search
Repository:freemyipod
Revision:r894‎ | r895 | r896 >
Date:18:18, 5 August 2013
Author:theseven
Status:new
Tags:
Comment:
emCORE: Fix build breakage
Modified paths:
  • /emcore/trunk/Makefile (modified) (history)
  • /emcore/trunk/global.h (modified) (history)

Diff [purge]

Index: emcore/trunk/global.h
@@ -52,7 +52,9 @@
5353
5454
5555 #ifndef IN_APPLICATION_CODE
 56+#ifndef _NO_VERSION_H_
5657 #include "build/version.h"
 58+#endif
5759 #include "configmagic.h"
5860 #endif
5961 #ifndef ASM_FILE
Index: emcore/trunk/Makefile
@@ -28,7 +28,7 @@
2929 define TARGET_template
3030 -include target/$(1)/target.mk
3131
32 -SRC_$(1) := $$(call preprocesspaths,SOURCES,-DTARGET_$(1) -DTARGET=\"$(1)\" -DCONFIG_H=\"target/$(1)/config.h\" -DTARGET_H=\"target/$(1)/target.h\" -Itarget/$(1) -I.)
 32+SRC_$(1) := $$(call preprocesspaths,SOURCES,-DTARGET_$(1) -DTARGET=\"$(1)\" -DCONFIG_H=\"target/$(1)/config.h\" -DTARGET_H=\"target/$(1)/target.h\" -D_NO_VERSION_H_ -Itarget/$(1) -I.)
3333 OBJ_$(1) := $$(SRC_$(1):%.c=build/$(1)/%.o)
3434 OBJ_$(1) := $$(OBJ_$(1):%.S=build/$(1)/%.o)
3535