Changeset 288 for trunk/src/mesh

Timestamp:

Mar 7, 2006 1:57:05 PM (18 years ago)

Author:

cxsong

Message:

changed include files

Location:

trunk/src/mesh

Files:

• Makefile (modified) (5 diffs)
• grid1d.h (modified) (1 diff)
• serializable.h (modified) (1 diff)

trunk/src/mesh/Makefile

@@ -76 +76 @@
 
 CFLAGS = -fPIC
+CCFLAGS = -fPIC -g
 
 # default:
 
-all: ${PROGS} test
+all: ${PROGS} 
 
 test: ${TEST_PROGS}
@@ -92 +93 @@
                   RpChoice.o RpOption.o RpUnitsStd.o RpUnits.o #RpValue.o\
                   # RpValueDouble.o RpValueString.o
-RP_MESH_DEPS = util.o grid1d.o grid1d_reg.o grid2d.o node3d.o node2d.o element.o \
-                mesh.o #field.o 
+RP_MESH_DEPS =  grid1d.o grid1d_reg.o grid2d.o node3d.o node2d.o \
+                element.o mesh.o serializable.o serializer.o util.o \
+                #field.o 
 
 LDLIB_MACOSX = -dynamiclib -o $(LIB_DIR)/$@.dylib
@@ -177 +179 @@
 # include mesh objects
 #
+grid1d.cc: grid1d.h util.h rp_types.h byte_order.h serializable.h
 grid2d.o: grid2d.cc
         $(CXX) $(CFLAGS) $(DEBUG) -c $?
-grid1d.o: grid1d.cc grid1d.h byte_order.h
+grid1d.o: grid1d.cc 
         $(CXX) $(CFLAGS) $(DEBUG) -c $?
 grid1d_reg.o: grid1d_reg.cc
@@ -192 +195 @@
         $(CXX) $(CFLAGS) $(DEBUG) -c $?
 mesh.o: mesh.cc
+        $(CXX) $(CFLAGS) $(DEBUG) -c $?
+serializable.o: serializable.cc
+        $(CXX) $(CFLAGS) $(DEBUG) -c $?
+serializer.o: serializer.cc
         $(CXX) $(CFLAGS) $(DEBUG) -c $?
 
@@ -381 +388 @@
 endian: endian.o ../librpmesh.so
         $(CXX) $(DEBUG) -o $@ $< $(LIB_RPMESH)
+trystr: trystr.o 
+        $(CXX) $(DEBUG) -o $@ $< 

trunk/src/mesh/grid1d.h

@@ -11 +11 @@
 #include "byte_order.h"
 #include "util.h"
-#include "obj_types.h"
+#include "rp_types.h"
 
 typedef double DataValType;

trunk/src/mesh/serializable.h

@@ -3 +3 @@
 
 #include "util.h"
+#include "rp_types.h"
 
 #define HEADER_SIZE 16