Changeset 1187


Ignore:
Timestamp:
01/11/10 17:57:34 (11 years ago)
Author:
rorothetroll
Message:

resync with trunk .. part 2

Location:
branches/smartreader/csctapi
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/smartreader/csctapi/CMakeLists.txt

    r1132 r1187  
    44file (GLOB csctapi_hdrs "*.h")
    55
    6 check_include_file ("usb.h" HAVE_LIBUSB)
    7 if (HAVE_LIBUSB)
    8     add_definitions ("-DHAVE_LIBUSB")
    9 endif (HAVE_LIBUSB)
    10 
    11 if (HAVE_LIBUSB)
    12     target_link_libraries (${exe_name} usb)
    13 endif (HAVE_LIBUSB)
    14 
    156if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
    16     add_definitions ("-O2 -Winline -Werror -finline-functions -fomit-frame-pointer -s -m32")
    17     SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32" )
    18     FIND_PATH( USB_INCLUDE usb.h)
    19     if( ${USB_INCLUDE} MATCHES "USB_INCLUDE-NOTFOUND" )
    20         set (HAVE_LIBUSB "0")
    21     else ( ${USB_INCLUDE} MATCHES "USB_INCLUDE-NOTFOUND" )
    22         FIND_LIBRARY (USB_LIBRARY usb)
    23         target_link_libraries ( ${exe_name} ${USB_LIBRARY})
    24         include_directories( SYSTEM ${USB_INCLUDE} )
    25         set (HAVE_LIBUSB "1")
    26     endif ( ${USB_INCLUDE} MATCHES "USB_INCLUDE-NOTFOUND" )
     7add_definitions ("-O2 -Winline -Werror -finline-functions -fomit-frame-pointer -s -m32")
    278else (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
    28     add_definitions ("-O2 -Winline -Werror -finline-functions -fomit-frame-pointer -s")
     9add_definitions ("-O2 -Winline -Werror -finline-functions -fomit-frame-pointer -s")
    2910endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
    3011
    3112set (lib_name "csctapi")
     13
    3214add_library (${lib_name} STATIC ${csctapi_srcs} ${csctapi_hdrs})
    3315
  • branches/smartreader/csctapi/apdu.c

    r1144 r1187  
    2727#include <stdlib.h>
    2828#include <string.h>
     29#include "../globals.h"
    2930
    3031/*
Note: See TracChangeset for help on using the changeset viewer.