From 032e3a4fbb890c4af23bdebbb93d5adb3239f0d9 Mon Sep 17 00:00:00 2001 From: bernd Date: Wed, 20 Jul 2011 07:59:35 +0200 Subject: [PATCH] Find all the firmware in libraries greatly simplifies CMakeLists.txt --- simulat0r/gui/CMakeLists.txt | 38 ++++++++++++++---------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/simulat0r/gui/CMakeLists.txt b/simulat0r/gui/CMakeLists.txt index 0bb9087..f209214 100644 --- a/simulat0r/gui/CMakeLists.txt +++ b/simulat0r/gui/CMakeLists.txt @@ -7,6 +7,10 @@ link_directories(${CMAKE_CURRENT_BINARY_DIR} ../../firmware/applications ../../firmware/filesystem ../../firmware/lcd +../../firmware/funk +../../firmware/basic +../../firmware/core +../../firmware/usbcdc ../../firmware/usb) include(${QT_USE_FILE}) @@ -27,28 +31,6 @@ QT_WRAP_CPP(qsimulat0r MocSources ${qsimulat0r_SRCS}) set(FIRMWARE_OBJS ../simcore/simcore.o ../simcore/misc.o - -../firmware/basic/basic.o -../firmware/basic/reinvoke_isp.o -../firmware/basic/delayms.o -../firmware/basic/uuid.o -../firmware/basic/keyin.o -../firmware/basic/voltage.o -../firmware/core/sysinit.o -../firmware/core/adc/adc.o -../firmware/core/cpu/cpu.o -../firmware/core/gpio/gpio.o -../firmware/core/i2c/i2c.o -../firmware/core/iap/iap.o -../firmware/core/libc/ctype.o -../firmware/core/libc/stdio.o -../firmware/core/libc/string.o -../firmware/core/pmu/pmu.o -../firmware/core/ssp/ssp.o -../firmware/core/systick/systick.o -../firmware/core/timer16/timer16.o -../firmware/core/timer32/timer32.o -../firmware/core/wdt/wdt.o ) @@ -62,7 +44,17 @@ add_executable(qsimulat0r ${qsimulat0r_SRCS} ${MocSources} ${FIRMWARE_OBJS} ) -target_link_libraries(qsimulat0r ${QT_LIBRARIES} libapp.a liblcd.a libusb.a libfat.a) +target_link_libraries(qsimulat0r +${QT_LIBRARIES} +libapp.a +liblcd.a +libusb.a +libfat.a +libfunk.a +libusbcdc.a +libbasic.a +libcore.a +)