Permalink
Browse files

Makefile and library cleanup

  • Loading branch information...
MartyMacGyver committed Aug 19, 2015
1 parent 0258f2c commit 8d77c65f04fe7d7f6eea69839baca98a95d70729
Showing with 27 additions and 10 deletions.
  1. 0 software/{raspberrypi_video → raspberrypi_libs}/leptonSDKEmb32PUB/LEPTON_AGC.c
  2. 0 software/{raspberrypi_video → raspberrypi_libs}/leptonSDKEmb32PUB/LEPTON_AGC.h
  3. 0 software/{raspberrypi_video → raspberrypi_libs}/leptonSDKEmb32PUB/LEPTON_ErrorCodes.h
  4. 0 software/{raspberrypi_video → raspberrypi_libs}/leptonSDKEmb32PUB/LEPTON_I2C_Protocol.c
  5. 0 software/{raspberrypi_video → raspberrypi_libs}/leptonSDKEmb32PUB/LEPTON_I2C_Protocol.h
  6. 0 software/{raspberrypi_video → raspberrypi_libs}/leptonSDKEmb32PUB/LEPTON_I2C_Reg.h
  7. 0 software/{raspberrypi_video → raspberrypi_libs}/leptonSDKEmb32PUB/LEPTON_I2C_Service.c
  8. 0 software/{raspberrypi_video → raspberrypi_libs}/leptonSDKEmb32PUB/LEPTON_I2C_Service.h
  9. 0 software/{raspberrypi_video → raspberrypi_libs}/leptonSDKEmb32PUB/LEPTON_Macros.h
  10. 0 software/{raspberrypi_video → raspberrypi_libs}/leptonSDKEmb32PUB/LEPTON_SDK.c
  11. 0 software/{raspberrypi_video → raspberrypi_libs}/leptonSDKEmb32PUB/LEPTON_SDK.h
  12. 0 software/{raspberrypi_video → raspberrypi_libs}/leptonSDKEmb32PUB/LEPTON_SDKConfig.h
  13. 0 software/{raspberrypi_video → raspberrypi_libs}/leptonSDKEmb32PUB/LEPTON_SYS.c
  14. 0 software/{raspberrypi_video → raspberrypi_libs}/leptonSDKEmb32PUB/LEPTON_SYS.h
  15. 0 software/{raspberrypi_video → raspberrypi_libs}/leptonSDKEmb32PUB/LEPTON_Types.h
  16. 0 software/{raspberrypi_video → raspberrypi_libs}/leptonSDKEmb32PUB/LEPTON_VID.c
  17. 0 software/{raspberrypi_video → raspberrypi_libs}/leptonSDKEmb32PUB/LEPTON_VID.h
  18. 0 software/{raspberrypi_video → raspberrypi_libs}/leptonSDKEmb32PUB/Makefile
  19. 0 software/{raspberrypi_video → raspberrypi_libs}/leptonSDKEmb32PUB/crc16.h
  20. 0 software/{raspberrypi_video → raspberrypi_libs}/leptonSDKEmb32PUB/crc16fast.c
  21. 0 software/{raspberrypi_video → raspberrypi_libs}/leptonSDKEmb32PUB/raspi_I2C.c
  22. 0 software/{raspberrypi_video → raspberrypi_libs}/leptonSDKEmb32PUB/raspi_I2C.h
  23. +14 −6 software/raspberrypi_qt/raspberrypi_qt.pro
  24. +13 −4 software/raspberrypi_video/raspberrypi_video.pro
@@ -3,20 +3,28 @@ TEMPLATE = app
QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET =
TARGET =
RPI_LIBS = ../raspberrypi_libs
LEPTONSDK = leptonSDKEmb32PUB
PRE_TARGETDEPS += sdk
QMAKE_EXTRA_TARGETS += sdk sdkclean
sdk.commands = make -C $${RPI_LIBS}/$${LEPTONSDK}
sdkclean.commands = make -C $${RPI_LIBS}/$${LEPTONSDK} clean
DEPENDPATH += .
INCLUDEPATH += .
INCLUDEPATH += . $${RPI_LIBS}
DESTDIR=.
MOC_DIR=gen_mocs
OBJECTS_DIR=gen_objs
MOC_DIR=gen_mocs
HEADERS += *.h
SOURCES += *.cpp
unix:LIBS += -LleptonSDKEmb32PUB/Debug -lLEPTON_SDK
unix:QMAKE_CLEAN += -r $(OBJECTS_DIR)
unix:LIBS += -L$${RPI_LIBS}/$${LEPTONSDK}/Debug -lLEPTON_SDK
unix:QMAKE_CLEAN += -r $(OBJECTS_DIR) $${MOC_DIR}
@@ -4,18 +4,27 @@ QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET =
RPI_LIBS = ../raspberrypi_libs
LEPTONSDK = leptonSDKEmb32PUB
PRE_TARGETDEPS += sdk
QMAKE_EXTRA_TARGETS += sdk sdkclean
sdk.commands = make -C $${RPI_LIBS}/$${LEPTONSDK}
sdkclean.commands = make -C $${RPI_LIBS}/$${LEPTONSDK} clean
DEPENDPATH += .
INCLUDEPATH += .
INCLUDEPATH += . $${RPI_LIBS}
DESTDIR=.
MOC_DIR=gen_mocs
OBJECTS_DIR=gen_objs
MOC_DIR=gen_mocs
HEADERS += *.h
SOURCES += *.cpp
unix:LIBS += -LleptonSDKEmb32PUB/Debug -lLEPTON_SDK
unix:LIBS += -L$${RPI_LIBS}/$${LEPTONSDK}/Debug -lLEPTON_SDK
unix:QMAKE_CLEAN += -r $(OBJECTS_DIR)
unix:QMAKE_CLEAN += -r $(OBJECTS_DIR) $${MOC_DIR}

0 comments on commit 8d77c65

Please sign in to comment.