Changeset 75


Ignore:
Timestamp:
May 25, 2001, 6:51:46 PM (24 years ago)
Author:
umoeller
Message:

Misc changes.

Location:
trunk/src/helpers
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/helpers/helpers_post.in

    r68 r75  
    3131!endif
    3232
    33 # Now define dependencies for all our .OBJ files by telling NMAKE
    34 # which .OBJ file depends on what. For each .OBJ we define what files
    35 # will enforce a recompilation when they've been changed.
    36 # This uses the inference rules defined above.
     33# The .OBJ-from-sources dependencies are now automatically
     34# created by "nmake dep" into the .depend include file.
     35# V0.9.12 (2001-05-22) [umoeller]
    3736
    38 # Note that ..\helpers\dosh.h is specified with _all_ files, so
    39 # you can enforce a complete recompile of XWorkplace if you update
    40 # that file (just save it once).
    41 
    42 # Helper .OBJ files from /HELPERS. The object files are created
    43 # from this makefile too.
    44 
    45 $(OUTPUTDIR)\animate.obj:   $(@B).c $(HLPINC)\$(@B).h \
    46                $(PROJECTINC)\setup.h \
    47                $(HLPINC)\winh.h $(HLPINC)\gpih.h \
    48 
    49 $(OUTPUTDIR)\cnrh.obj:     $(@B).c $(HLPINC)\$(@B).h \
    50                $(PROJECTINC)\setup.h \
    51                $(HLPINC)\winh.h
    52 
    53 $(OUTPUTDIR)\cctl_chart.obj:     $(@B).c $(HLPINC)\comctl.h \
    54                $(PROJECTINC)\setup.h \
    55                $(HLPINC)\cnrh.h $(HLPINC)\except.h $(HLPINC)\gpih.h \
    56                     $(HLPINC)\linklist.h $(HLPINC)\winh.h
    57 
    58 $(OUTPUTDIR)\cctl_checkcnr.obj:     $(@B).c $(HLPINC)\comctl.h \
    59                $(PROJECTINC)\setup.h \
    60                $(HLPINC)\cnrh.h $(HLPINC)\except.h $(HLPINC)\gpih.h \
    61                     $(HLPINC)\linklist.h $(HLPINC)\winh.h
    62 
    63 $(OUTPUTDIR)\cctl_progbar.obj:     $(@B).c $(HLPINC)\comctl.h \
    64                $(PROJECTINC)\setup.h \
    65                $(HLPINC)\cnrh.h $(HLPINC)\except.h $(HLPINC)\gpih.h \
    66                     $(HLPINC)\linklist.h $(HLPINC)\winh.h
    67 
    68 $(OUTPUTDIR)\cctl_splitwin.obj:     $(@B).c $(HLPINC)\comctl.h \
    69                $(PROJECTINC)\setup.h \
    70                $(HLPINC)\cnrh.h $(HLPINC)\except.h $(HLPINC)\gpih.h \
    71                     $(HLPINC)\linklist.h $(HLPINC)\winh.h
    72 
    73 $(OUTPUTDIR)\cctl_tooltip.obj:      $(@B).c $(HLPINC)\comctl.h \
    74                $(PROJECTINC)\setup.h \
    75                $(HLPINC)\cnrh.h $(HLPINC)\except.h $(HLPINC)\gpih.h \
    76                     $(HLPINC)\linklist.h $(HLPINC)\winh.h
    77 
    78 $(OUTPUTDIR)\comctl.obj:            $(@B).c $(HLPINC)\$(@B).h \
    79                $(PROJECTINC)\setup.h \
    80                $(HLPINC)\cnrh.h $(HLPINC)\except.h $(HLPINC)\gpih.h \
    81                     $(HLPINC)\linklist.h $(HLPINC)\winh.h
    82 
    83 $(OUTPUTDIR)\configsys.obj:         $(@B).c $(HLPINC)\$(@B).h \
    84                $(PROJECTINC)\setup.h \
    85                $(HLPINC)\dosh.h $(HLPINC)\stringh.h $(HLPINC)\xstring.h
    86 
    87 $(OUTPUTDIR)\datetime.obj:          $(@B).c $(HLPINC)\$(@B).h \
    88                $(PROJECTINC)\setup.h
    89 
    90 $(OUTPUTDIR)\debug.obj:     $(@B).c $(HLPINC)\$(@B).h \
    91                $(PROJECTINC)\setup.h \
    92                $(HLPINC)\dosh.h
    93 
    94 $(OUTPUTDIR)\dialog.obj:     $(@B).c $(HLPINC)\$(@B).h \
    95                $(PROJECTINC)\setup.h \
    96                $(HLPINC)\comctl.h $(HLPINC)\gpih.h $(HLPINC)\linklist.h \
    97                 $(HLPINC)\standards.h $(HLPINC)\stringh.h \
    98                $(HLPINC)\winh.h
    99 
    100 $(OUTPUTDIR)\dosh.obj:      $(@B).c $(HLPINC)\$(@B).h \
    101                $(PROJECTINC)\setup.h
    102 
    103 $(OUTPUTDIR)\dosh2.obj:      $(@B).c $(HLPINC)\dosh.h \
    104                $(PROJECTINC)\setup.h \
    105                $(HLPINC)\ensure.h $(HLPINC)\standards.h $(HLPINC)\stringh.h
    106 
    107 $(OUTPUTDIR)\eah.obj:       $(@B).c $(HLPINC)\$(@B).h \
    108                $(PROJECTINC)\setup.h
    109 
    110 $(OUTPUTDIR)\encodings.obj:         $(@B).c $(INC)\encodings\*.h \
    111                $(PROJECTINC)\setup.h
    112 
    113 $(OUTPUTDIR)\except.obj:    $(@B).c $(HLPINC)\$(@B).h \
    114                $(PROJECTINC)\setup.h \
    115                $(HLPINC)\dosh.h $(HLPINC)\debug.h
    116 
    117 $(OUTPUTDIR)\gpih.obj:      $(@B).c $(HLPINC)\$(@B).h \
    118                $(PROJECTINC)\setup.h \
    119                $(HLPINC)\winh.h
    120 
    121 $(OUTPUTDIR)\level.obj:  $(@B).c $(HLPINC)\$(@B).h \
    122                $(PROJECTINC)\setup.h
    123 
    124 $(OUTPUTDIR)\linklist.obj:  $(@B).c $(HLPINC)\$(@B).h \
    125                $(PROJECTINC)\setup.h
    126 
    127 $(OUTPUTDIR)\memdebug.obj:  $(@B).c $(HLPINC)\$(@B).h \
    128                $(PROJECTINC)\setup.h \
    129                $(HLPINC)\except.h $(HLPINC)\stringh.h
    130 
    131 $(OUTPUTDIR)\memdebug_win.obj:  $(@B).c $(HLPINC)\memdebug.h \
    132                $(PROJECTINC)\setup.h \
    133                $(HLPINC)\cnrh.h $(HLPINC)\except.h $(HLPINC)\stringh.h $(HLPINC)\winh.h
    134 
    135 $(OUTPUTDIR)\prfh.obj:      $(@B).c $(HLPINC)\$(@B).h \
    136                $(PROJECTINC)\setup.h
    137 
    138 $(OUTPUTDIR)\prfh2.obj:      $(@B).c $(HLPINC)\prfh.h \
    139                $(PROJECTINC)\setup.h \
    140                $(HLPINC)\dosh.h $(HLPINC)\stringh.h
    141 
    142 $(OUTPUTDIR)\resh.obj:      $(@B).c $(HLPINC)\$(@B).h \
    143                $(PROJECTINC)\setup.h
    144 
    145 $(OUTPUTDIR)\procstat.obj:  $(@B).c $(HLPINC)\$(@B).h \
    146                $(PROJECTINC)\setup.h
    147 
    148 $(OUTPUTDIR)\shapewin.obj:  $(@B).c $(HLPINC)\$(@B).h \
    149                $(PROJECTINC)\setup.h \
    150                $(HLPINC)\gpih.h
    151 
    152 $(OUTPUTDIR)\stringh.obj:   $(@B).c $(HLPINC)\$(@B).h \
    153                $(PROJECTINC)\setup.h \
    154                $(HLPINC)\xstring.h
    155 
    156 $(OUTPUTDIR)\syssound.obj:   $(@B).c $(HLPINC)\$(@B).h \
    157                $(PROJECTINC)\setup.h \
    158                $(HLPINC)\dosh.h $(HLPINC)\prfh.h
    159 
    160 $(OUTPUTDIR)\textview.obj:   $(@B).c $(HLPINC)\$(@B).h \
    161                $(PROJECTINC)\setup.h \
    162                $(HLPINC)\comctl.h $(HLPINC)\gpih.h $(HLPINC)\linklist.h $(HLPINC)\stringh.h \
    163                     $(HLPINC)\winh.h $(HLPINC)\xstring.h
    164 
    165 $(OUTPUTDIR)\threads.obj:   $(@B).c $(HLPINC)\$(@B).h \
    166                $(PROJECTINC)\setup.h
    167 
    168 $(OUTPUTDIR)\timer.obj:   $(@B).c $(HLPINC)\$(@B).h \
    169                $(HLPINC)\datetime.h $(HLPINC)\except.h $(HLPINC)\linklist.h $(HLPINC)\threads.h \
    170                $(PROJECTINC)\setup.h
    171 
    172 $(OUTPUTDIR)\tmsgfile.obj:  $(@B).c $(HLPINC)\$(@B).h \
    173                $(PROJECTINC)\setup.h \
    174                $(HLPINC)\eah.h
    175 
    176 $(OUTPUTDIR)\textv_html.obj:   $(@B).c $(HLPINC)\$(@B).h \
    177                $(PROJECTINC)\setup.h \
    178                $(HLPINC)\linklist.h $(HLPINC)\stringh.h $(HLPINC)\xstring.h
    179 
    180 $(OUTPUTDIR)\tree.obj:   $(@B).c $(HLPINC)\$(@B).h \
    181                $(PROJECTINC)\setup.h \
    182                $(HLPINC)\tree.h
    183 
    184 $(OUTPUTDIR)\winh.obj:      $(@B).c $(HLPINC)\$(@B).h \
    185                $(PROJECTINC)\setup.h \
    186                $(HLPINC)\dosh.h $(HLPINC)\prfh.h $(HLPINC)\gpih.h $(HLPINC)\stringh.h \
    187                  $(HLPINC)\undoc.h $(HLPINC)\xstring.h \
    188 
    189 $(OUTPUTDIR)\wphandle.obj:  $(@B).c $(HLPINC)\$(@B).h \
    190                $(PROJECTINC)\setup.h
    191 
    192 $(OUTPUTDIR)\xml.obj:      $(@B).c $(HLPINC)\$(@B).h \
    193                $(PROJECTINC)\setup.h \
    194                $(HLPINC)\linklist.h $(HLPINC)\stringh.h $(HLPINC)\tree.h $(HLPINC)\xstring.h
    195 
    196 $(OUTPUTDIR)\xprf.obj:  $(@B).c $(HLPINC)\$(@B).h \
    197                $(PROJECTINC)\setup.h \
    198                $(HLPINC)\linklist.h $(HLPINC)\prfh.h
    199 
    200 $(OUTPUTDIR)\xprf2.obj:  $(@B).c $(HLPINC)\xprf.h \
    201                $(PROJECTINC)\setup.h \
    202                $(HLPINC)\dosh.h $(HLPINC)\prfh.h $(HLPINC)\stringh.h
    203 
    204 $(OUTPUTDIR)\xstring.obj:  $(@B).c $(HLPINC)\$(@B).h \
    205                $(PROJECTINC)\setup.h \
    206                $(HLPINC)\stringh.h
    207 
    208 XMLHEADERS = $(PROJECTINC)\setup.h \
    209 $(INC)\expat\ascii.h \
    210 $(INC)\expat\asciitab.h \
    211 $(INC)\expat\expat.h \
    212 $(INC)\expat\expat_setup.h \
    213 $(INC)\expat\iasciitab.h \
    214 $(INC)\expat\latin1tab.h \
    215 $(INC)\expat\nametab.h \
    216 $(INC)\expat\utf8tab.h \
    217 $(INC)\expat\xmlrole.h \
    218 $(INC)\expat\xmltok.h \
    219 $(INC)\expat\xmltok_impl.h
    220 
    221 $(OUTPUTDIR)\xml_charset.obj: $(@B).c $(XMLHEADERS)
    222 
    223 $(OUTPUTDIR)\xmlparse.obj: $(@B).c $(XMLHEADERS)
    224 
    225 $(OUTPUTDIR)\xmlrole.obj: $(@B).c $(XMLHEADERS)
    226 
    227 $(OUTPUTDIR)\xmltok.obj: $(@B).c xmltok_impl.c xmltok_ns.c $(XMLHEADERS)
     37!ifndef NOINCLUDEDEPEND
     38!include .depend
     39!endif
    22840
    22941
     42

  • trunk/src/helpers/helpers_pre.in

    r53 r75  
    6262$(OUTPUTDIR)\prfh2.obj \
    6363$(OUTPUTDIR)\resh.obj \
     64$(OUTPUTDIR)\semaphores.obj \
    6465$(OUTPUTDIR)\stringh.obj \
    6566$(OUTPUTDIR)\syssound.obj \

  • trunk/src/helpers/makefile

    r13 r75  
    2424#
    2525#       Required environment variables:
     26#
    2627#               -- PROJECT_BASE_DIR: where to find setup.in; this should
    2728#                   be the root directory of the project, e.g. "C:\cvs\warpin"
    2829#                   or "C:\cvs\xworkplace"
     30#
    2931#               -- HELPERS_OUTPUT_DIR: where to create output files (*.obj, helpers.lib)
    3032#                   this should be a "bin" directory (e.g. "C:\cvs\warpin\bin"
     33#
    3134#               -- CC_HELPERS: compiler command line for compiling C files.
    3235#                   With VAC++, this should include the /Ge+ (compile to EXE)
    … …  
    3437#                   files.
    3538#                   If you're using the "dll" target, specify /Ge- instead.
     39#
    3640#               -- MAINMAKERUNNING: if this is NOT defined, this makefile
    3741#                   will recurse to the makefile in $(PROJECT_BASE_DIR).
    3842#                   So to have this makefile run successfully, define this
    3943#                   variable to something.
     44#
    4045#                   This variable was introduced to be able to start a build
    4146#                   process from src\helpers as well. However, when your own
    … …  
    130135    @echo $(MAKEDIR)\makefile: Returned from main makefile. Done.
    131136
     137# The "dep" target: run fastdep on the sources.
     138# "nmake dep" gets called from src\makefile if nmake dep
     139# is running on the main makefile.
     140dep:
     141    $(RUN_FASTDEP) *.c
     142    @echo ----- Leaving $(MAKEDIR)
     143
    132144# Define the main dependency between the output HELPERS.LIB and
    133145# all the object files.

  • trunk/src/helpers/xmlparse.c

    r71 r75  
    7070        // this code generates those options HEAVILY
    7171
    72 #ifdef COMPILED_FROM_DSP
    73     #include "winconfig.h"
    74     #define XMLPARSEAPI __declspec(dllexport)
    75     #include "expat.h"
     72// #include <config.h>
     73
     74#ifdef __declspec
     75#define XMLPARSEAPI __declspec(dllexport)
     76#endif
     77
     78#include "expat\expat.h"
     79
     80#ifdef __declspec
    7681    #undef XMLPARSEAPI
    77 #else
    78     // #include <config.h>
    79 
    80     #ifdef __declspec
    81     #define XMLPARSEAPI __declspec(dllexport)
    82     #endif
    83 
    84     #include "expat\expat.h"
    85 
    86     #ifdef __declspec
    87         #undef XMLPARSEAPI
    88     #endif
    89 #endif /* ndef COMPILED_FROM_DSP */
     82#endif
    9083
    9184#include <stddef.h>

  • trunk/src/helpers/xmlrole.c

    r38 r75  
    3838        // disable "statement unreachable" and "missing break statement"
    3939        // this code generates those options HEAVILY
    40 
    41 #ifdef COMPILED_FROM_DSP
    42 #include "winconfig.h"
    43 #else
    44 // #include <config.h>
    45 #endif /* ndef COMPILED_FROM_DSP */
    4640
    4741#include "expat\xmlrole.h"

  • trunk/src/helpers/xmltok.c

    r38 r75  
    3939        // this code generates those options HEAVILY
    4040
    41 #ifdef COMPILED_FROM_DSP
    42 #include "winconfig.h"
    43 #else
    44 // #include <config.h>
    45 #endif /* ndef COMPILED_FROM_DSP */
    46 
    4741#include "expat\xmltok.h"
    4842#include "expat\nametab.h"
    … …  
    361355    {VTABLE1, utf8_toUtf8, utf8_toUtf16, 1, 1, 0},
    362356    {
    363 #include "asciitab.h"
    364 #include "utf8tab.h"
     357#include "expat\asciitab.h"
     358#include "expat\utf8tab.h"
    365359    },
    366360    STANDARD_VTABLE(sb_) NORMAL_VTABLE(utf8_)
    … …  
    387381    {VTABLE1, utf8_toUtf8, utf8_toUtf16, 1, 1, 0},
    388382    {
    389 #include "iasciitab.h"
    390 #include "utf8tab.h"
     383#include "expat\iasciitab.h"
     384#include "expat\utf8tab.h"
    391385    },
    392386    STANDARD_VTABLE(sb_) NORMAL_VTABLE(utf8_)
    … …  
    449443    {VTABLE1, latin1_toUtf8, latin1_toUtf16, 1, 0, 0},
    450444    {
    451 #include "asciitab.h"
    452 #include "latin1tab.h"
     445#include "expat\asciitab.h"
     446#include "expat\latin1tab.h"
    453447    },
    454448    STANDARD_VTABLE(sb_)
    … …  
    483477    {VTABLE1, ascii_toUtf8, latin1_toUtf16, 1, 1, 0},
    484478    {
    485 #include "asciitab.h"
     479#include "expat\asciitab.h"
    486480/* BT_NONXML == 0 */
    487481    },
    … …  
    709703             },
    710704             {
    711     #include "asciitab.h"
    712     #include "latin1tab.h"
     705    #include "expat\asciitab.h"
     706    #include "expat\latin1tab.h"
    713707             },
    714708             STANDARD_VTABLE(little2_)
    … …  
    743737         {VTABLE, 2, 0, 1},
    744738         {
    745 #include "iasciitab.h"
    746 #include "latin1tab.h"
     739#include "expat\iasciitab.h"
     740#include "expat\latin1tab.h"
    747741         },
    748742         STANDARD_VTABLE(little2_)
    … …  
    847841         },
    848842         {
    849 #include "asciitab.h"
    850 #include "latin1tab.h"
     843#include "expat\asciitab.h"
     844#include "expat\latin1tab.h"
    851845         },
    852846         STANDARD_VTABLE(big2_)
    … …  
    881875         {VTABLE, 2, 0, 1},
    882876         {
    883 #include "iasciitab.h"
    884 #include "latin1tab.h"
     877#include "expat\iasciitab.h"
     878#include "expat\latin1tab.h"
    885879         },
    886880         STANDARD_VTABLE(big2_)
Note: See TracChangeset for help on using the changeset viewer.