Changeset 656


Ignore:
Timestamp:
Apr 3, 2007 12:17:59 PM (14 years ago)
Author:
dkearney
Message:

added progress function for c, c++ and fortran, so people dont have to generate the cryptic progress string themselves to get a progress bar in the gui.

Location:
trunk/src
Files:
8 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/Makefile.in

    r624 r656  
    6868
    6969RP_IO_DEPS      = RpLibrary.o RpLibraryCInterface.o RpLibraryFInterface.o \
    70                   scew_extras.o RpEntityRef.o
     70                  scew_extras.o RpEntityRef.o RpUtils.o
    7171RP_UNITS_DEPS   = RpUnitsStd.o RpUnits.o RpUnitsCInterface.o RpUnitsFInterface.o
     72RP_UTILS_DEPS   = RpUtils.o RpUtilsCInterface.o RpUtilsFInterface.o
    7273RP_OTHER_DEPS   = RpFortranCommon.o RpBindingsDict.o \
    7374                  RpBufferCInterface.o RpOutcomeCInterface.o
     
    8586#### librappture shared object ###########################################
    8687
    87 librappture: $(RP_IO_DEPS) $(RP_UNITS_DEPS) $(RP_OTHER_DEPS)
     88librappture: $(RP_IO_DEPS) $(RP_UTILS_DEPS) $(RP_UNITS_DEPS) $(RP_OTHER_DEPS)
    8889        (cd ../src2/core/; make Outcome.o Ptr.o RpBuffer.o)
    8990        if test "`uname`" == "Darwin"; then \
     
    155156        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) $(INCL_CORE2) -o $@ -c $?
    156157
     158RpUtils.o: $(CORE_SRC)/RpUtils.cc
     159        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) -o $@ -c $?
     160
    157161RpVariable.o: $(CORE_SRC)/RpVariable.cc
    158162        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) -o $@ -c $?
     
    196200
    197201# include cee binding definitions
     202
     203RpUtilsCInterface.o: $(CEE_SRC)/RpUtilsCInterface.cc
     204        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) $(INCL_CEE) -o $@ -c $?
    198205
    199206RpUnitsCInterface.o: $(CEE_SRC)/RpUnitsCInterface.cc
     
    212219
    213220# include fortran binding definitions
     221
     222RpUtilsFInterface.o: $(FORT_SRC)/RpUtilsFInterface.cc
     223        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) $(INCL_FORTRAN) -o $@ -c $?
    214224
    215225RpUnitsFInterface.o: $(FORT_SRC)/RpUnitsFInterface.cc
  • trunk/src/core/rappture.h

    r520 r656  
    1717#include "RpUnitsFInterface.h"
    1818
     19// include utility functions
     20#include "RpUtils.h"
     21#include "RpUtilsCInterface.h"
     22#include "RpUtilsFInterface.h"
     23
    1924// include base objects
    2025/*
  • trunk/src/fortran/RpLibraryFInterface.h

    r597 r656  
    1212 */
    1313
    14 #ifndef _RpLIBRARY_F_H
    15 #define _RpLIBRARY_F_H
     14#ifndef _RAPPTURE_LIBRARY_F_H
     15#define _RAPPTURE_LIBRARY_F_H
    1616
    1717#ifdef __cplusplus
     
    175175#endif // ifdef __cplusplus
    176176
    177 #endif // ifndef _RpLIBRARY_F_H
     177#endif // ifndef _RAPPTURE_LIBRARY_F_H
Note: See TracChangeset for help on using the changeset viewer.