Merge pull request #52 from olerem/move_build_2

Move build

diff --combined target_firmware/CMakeLists.txt
index fc744343d09ece1aab2b955861e02ff7d2812143,894794a08ad77e050d4e8bb3bf0eb7e105707c70..12ffc8b66591e5c0fda0c4ec216bc88870021c0f
--- 1/target_firmware/CMakeLists.txt
--- 2/target_firmware/CMakeLists.txt
+++ b/target_firmware/CMakeLists.txt
@@@ -27,7 -27,6 +27,7 @@@ SET(SOURCE
        magpie_fw_dev/target/buf_pool/buf_pool_static.c
        magpie_fw_dev/target/cmnos/dbg_api.c
        magpie_fw_dev/target/cmnos/cmnos_sflash.c
 +      magpie_fw_dev/target/hif/usb_api_main_patch.c
        wlan/ah.c
        wlan/ah_osdep.c
        wlan/ar5416Phy.c
@@@ -46,7 -45,7 +46,7 @@@
  IF(TARGET_K2)
        SET(SOURCES ${SOURCES}
                magpie_fw_dev/target/hif/k2_HIF_usb_patch.c
 -              magpie_fw_dev/target/hif/k2_fw_usb_api.c
 +              magpie_fw_dev/target/hif/usb_api_k2_patch.c
        )
        SET(LIBS ${LIBS} hif)
        ADD_DEFINITIONS(-DPROJECT_K2)
@@@ -63,14 -62,12 +63,12 @@@ ELSEIF(TARGET_MAGPIE
                -DMAGPIE_MERLIN
        )
        SET(SOURCES ${SOURCES}
 +              magpie_fw_dev/target/hif/usb_api_magpie_patch.c
                magpie_fw_dev/target/rompatch/cmnos_clock_patch.c
 -              magpie_fw_dev/target/rompatch/usb_api_patch.c
                magpie_fw_dev/target/rompatch/HIF_usb_patch.c
        )
        INCLUDE_DIRECTORIES(
                ${CMAKE_SOURCE_DIR}/magpie_fw_dev/target/adf
-               magpie_fw_dev/build/magpie_1_1/inc
-               magpie_fw_dev/build/magpie_1_1/inc/magpie
        )
        SET(PLATFORM_NAME magpie)
        SET(FIRMWARE_NAME htc_7010.fw)
@@@ -79,9 -76,8 +77,8 @@@ ELSE(
  ENDIF()
  
  INCLUDE_DIRECTORIES(
-       ${CMAKE_SOURCE_DIR}/magpie_fw_dev/build/include
-       ${CMAKE_SOURCE_DIR}/magpie_fw_dev/build/include/xtensa-elf
        ${CMAKE_SOURCE_DIR}/magpie_fw_dev/target/inc
+       ${CMAKE_SOURCE_DIR}/magpie_fw_dev/target/inc/xtensa-elf
        ${CMAKE_SOURCE_DIR}/magpie_fw_dev/target/inc/${PLATFORM_NAME}
        ${CMAKE_SOURCE_DIR}/magpie_fw_dev/target/inc/${PLATFORM_NAME}/${PLATFORM_NAME}
        ${CMAKE_SOURCE_DIR}/wlan