Changeset 269 for cpp/frams/Makefile-GDK

Timestamp:

12/16/14 01:51:06 (10 years ago)

Author:

Maciej Komosinski

Message:

• Model validation checks part/joint shapes for consistency (old/new)
• Model::getShape() returns new/old style
• Model shape conversion (old to new) and sample usage in shapeconvert.cpp

File:

• cpp/frams/Makefile-GDK (modified) (2 diffs)

cpp/frams/Makefile-GDK

@@ -5 +5 @@
 include frams/Makefile-GDK-files
 
-GDK_TESTS=genoconv_test gdk_test geno_test genooper_test genooper_test_fTest neuro_test loader_test serial_test multiline_f0_test f0_variants_test full_props part_shapes neuro_layout_test geometry_apices_test geometry_info_test geometry_surface_test geometry_volume_test
+GDK_TESTS=genoconv_test gdk_test geno_test genooper_test genooper_test_fTest neuro_test loader_test serial_test multiline_f0_test f0_variants_test full_props shapeconvert part_shapes neuro_layout_test geometry_apices_test geometry_info_test geometry_surface_test geometry_volume_test
 
 gdk_tests: $(GDK_TESTS)
 
 GDK_BUILD_CONFIG= -include frams/config/gdk_build_config.h
-CXXFLAGS= -I$(CURDIR) -DLINUX $(GDK_BUILD_CONFIG) -Wno-parentheses -Wno-overloaded-virtual -Wno-format -g
+CXXFLAGS= -I$(CURDIR) -std=gnu++11 -DLINUX $(GDK_BUILD_CONFIG) -Wno-parentheses -Wno-overloaded-virtual -Wno-format -g
 
 #############################################
@@ -47 +47 @@
         $(CXX) $(FULL_PROPS_OBJS) $(LDFLAGS) -o $@
 
+shapeconvert: $(SHAPECONVERT_OBJS)
+        $(CXX) $(SHAPECONVERT_OBJS) $(LDFLAGS) -o $@
+
 part_shapes: $(PART_SHAPES_OBJS)
         $(CXX) $(PART_SHAPES_OBJS) $(LDFLAGS) -o $@