Ignore:
Timestamp:
Mar 16, 2016, 8:14:59 PM (6 years ago)
Author:
Matthias Waltenberger
Message:

Various build conf changes for GCC 4.9.2 (incl Steven's patch), #266 use shared library for poppler

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:ignore
      •  

        old new  
        22LocalConfig.kmk
        33LocalEnv.cmd
         4
         5.project
         6
         7.cproject
         8
         9.settings
  • trunk/Lucide/plugins/lupoppler/Makefile.kmk

    r496 r520  
    1616lupoppler_NAME           = lupplr
    1717lupoppler_INCS           = \
    18         ../ludoc $(lupoppler_0_OUTDIR)/../ludoc                                   \
    19         ../../../poppler/mypoppler                                                \
    20         ../../../poppler/mypoppler/poppler                                        \
    21         ../../../poppler/fc-emulate-os2
     18        ../ludoc $(lupoppler_0_OUTDIR)/../ludoc \
     19        $(UNIXROOT)/usr/include \
     20        $(UNIXROOT)/usr/include/poppler \
     21        $(UNIXROOT)/usr/include/os2tk45
    2222lupoppler_SOURCES        = \
    2323        lupoppler.idl                                                             \
     
    3535lupoppler_LIBS           = \
    3636        $(PATH_STAGE_LIB)/ludoc$(SUFF_LIB) \
    37         $(LIB_POPPLER_LIBS)
     37        $(LIB_POPPLER_LIBS) \
     38        poppler_dll
    3839
    3940include $(FILE_KBUILD_SUB_FOOTER)
    4041
     42
  • trunk/Lucide/plugins/lupoppler/lupibutton.cpp

    r492 r520  
    139139    LuPopplerInputButtonData *somThis = LuPopplerInputButtonGetData(somSelf);
    140140
    141     int count = somThis->widget->getNumSiblingsID();
     141    // int count = somThis->widget->getNumSiblingsID();
     142    int count = 0;
    142143
    143144    LuInputButton_SiblingSequence* siblings = (LuInputButton_SiblingSequence *)
     
    147148    siblings->_buffer = (unsigned long *)SOMMalloc( sizeof( unsigned long * ) * count );
    148149
    149     unsigned *ids = somThis->widget->getSiblingsID();
     150    // unsigned *ids = somThis->widget->getSiblingsID();
     151    unsigned *ids = 0;
    150152    for ( int i = 0; i < count; ++i )
    151153        siblings->_buffer[ i ] = ids[ i ];
  • trunk/Lucide/plugins/lupoppler/lupifield.cpp

    r492 r520  
    148148}
    149149
    150 SOM_Scope boolean  SOMLINK isModified(LuPopplerInputField *somSelf,
    151                                        Environment *ev)
    152 {
    153     LuPopplerInputFieldData *somThis = LuPopplerInputFieldGetData(somSelf);
    154 
    155     return somThis->widget->isModified();
    156 }
    157 
    158150SOM_Scope boolean  SOMLINK isReadOnly(LuPopplerInputField *somSelf,
    159151                                       Environment *ev)
  • trunk/Lucide/plugins/lupoppler/lupifield.idl

    r367 r520  
    3131        getRectangle: override;
    3232        getID: override;
    33         isModified: override;
     33//       isModified: override;
    3434        isReadOnly: override;
    3535
  • trunk/Lucide/plugins/lupoppler/lupoppler.cpp

    r515 r520  
    5959#include <Link.h>
    6060#include <Form.h>
    61 #include <config.h>
    6261
    6362#include "lupoppler.xih"
     
    107106{
    108107    strcpy(version, "PDF plugin, based on poppler library ");
    109     strcat(version, VERSION);
     108    strcat(version, POPPLER_VERSION);
    110109    return version;
    111110}
     
    803802
    804803    PSOutputDev *out = new PSOutputDev( filename, doc, NULL,
    805                                 (first_page <= last_page) ? (first_page + 1) : (last_page + 1),
    806                                 (first_page <= last_page) ? (last_page + 1) : (first_page + 1),
     804                                { (first_page <= last_page) ? (first_page + 1) : (last_page + 1),
     805                                (first_page <= last_page) ? (last_page + 1) : (first_page + 1) },
    807806                                        psModePS, (int)width, (int)height, gFalse );
    808807
Note: See TracChangeset for help on using the changeset viewer.