Changeset 1180


Ignore:
Timestamp:
01/11/10 07:39:42 (12 years ago)
Author:
alno
Message:

WebIf:

  • Merging revisions 1177-1179 of trunk
Location:
branches/monitor-improvement
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/monitor-improvement/CMakeLists.txt

    r1177 r1180  
    180180set (exe_name "oscam")
    181181add_executable (${exe_name} ${exe_srcs} ${exe_hdrs})
    182 target_link_libraries (${exe_name} ${csoscam} ${csmodules} ${csreaders} csctapi cscrypt pthread rt nxp)
     182target_link_libraries (${exe_name} ${csoscam} ${csmodules} ${csreaders} csctapi cscrypt pthread)
    183183if (HAVE_AES)
    184184    target_link_libraries (${exe_name} crypto)
     
    208208elseif (OSCamOperatingSystem MATCHES "Amino")
    209209elseif (OSCamOperatingSystem MATCHES "Windows/cygwin")
     210elseif (OSCamOperatingSystem MATCHES "NeutrinoHD")
     211    target_link_libraries ( ${exe_name} rt nxp )
    210212endif (OSCamOperatingSystem MATCHES "Linux")
    211213
  • branches/monitor-improvement/csctapi/apdu.c

    r1140 r1180  
    2727#include <stdlib.h>
    2828#include <string.h>
     29#include "../globals.h"
    2930
    3031/*
  • branches/monitor-improvement/csctapi/ct_slot.h

    r1163 r1180  
    2727
    2828#include "defines.h"
     29#include "../globals.h"
    2930#include "apdu.h"
    3031#include "ctapi.h"
    3132#include "ctbcs.h"
    3233#include "ifd_towitoko.h"
     34
    3335
    3436/*
  • branches/monitor-improvement/csctapi/icc_async.c

    r1177 r1180  
    2424
    2525#include "defines.h"
     26#include "../globals.h"
    2627#include "icc_async.h"
    2728#include <stdlib.h>
  • branches/monitor-improvement/csctapi/io_serial.c

    r1177 r1180  
    2424
    2525#include "defines.h"
     26#include "../globals.h"
    2627#include <stdio.h>
    2728#include <string.h>
  • branches/monitor-improvement/csctapi/protocol_t0.c

    r1170 r1180  
    2929#include <time.h>
    3030
     31#include "../globals.h"
    3132
    3233#include "protocol_t0.h"
  • branches/monitor-improvement/oscam-config.c

    r1176 r1180  
    19021902#endif
    19031903
    1904 
     1904/*
     1905 * makes a char ready to write a token into config or webIf
     1906 */
    19051907char *mk_t_caidtab(CAIDTAB *ctab){
    19061908    int i = 0, needed = 1, pos = 0;
     
    19351937}
    19361938
     1939/*
     1940 * makes a char ready to write a token into config or webIf
     1941 */
    19371942char *mk_t_tuntab(TUNTAB *ttab){
    19381943    int i = 0, needed = 1, pos = 0;
     
    19671972}
    19681973
     1974/*
     1975 * makes a char ready to write a token into config or webIf
     1976 */
    19691977char *mk_t_group(ulong *grp){
    19701978    int i = 0, needed = 1, pos = 0, dot = 0;
     
    19982006}
    19992007
     2008/*
     2009 * makes a char ready to write a token into config or webIf
     2010 */
    20002011char *mk_t_ftab(FTAB *ftab){
    20012012    int i = 0, j = 0, needed = 1, pos = 0;
Note: See TracChangeset for help on using the changeset viewer.