Changeset 779 for cpp/frams/Makefile-SDK-files

Timestamp:

05/11/18 23:42:04 (6 years ago)

Author:

Maciej Komosinski

Message:

Unified file names of all files involved in genetic conversions and operations so that they start with "f<format>_"

File:

• cpp/frams/Makefile-SDK-files (modified) (2 diffs)

cpp/frams/Makefile-SDK-files

@@ -4 +4 @@
 ALL_DIRS={common,frams,frams/canvas,frams/config,common/loggers,frams/genetics,frams/genetics/f0,frams/genetics/f1,frams/genetics/f2,frams/genetics/f3,frams/genetics/f4,frams/genetics/f5,frams/genetics/f6,frams/genetics/f7,frams/genetics/f8,frams/genetics/f9,frams/genetics/fn,frams/genetics/fF,frams/genetics/fT,frams/model,frams/neuro,frams/neuro/impl,frams/param,frams/test,frams/util,frams/vm/classes,common/virtfile,frams/_demos,frams/model/geometry,frams/_demos/geometry,frams/model/similarity,frams/model/similarity/SVD}
 
-GENMANF4=frams/genetics/f4/oper_f4.o
-GENMANF9=frams/genetics/f9/oper_f9.o
-GENMANFF=frams/genetics/fF/oper_fF.o
-GENMANFT=frams/genetics/fT/oper_fTest.o
-GENMANFN=frams/genetics/fn/oper_fn.o
+GENMANF4=frams/genetics/f4/f4_oper.o
+GENMANF9=frams/genetics/f9/f9_oper.o
+GENMANFF=frams/genetics/fF/fF_oper.o
+GENMANFT=frams/genetics/fT/fTest_oper.o
+GENMANFN=frams/genetics/fn/fn_oper.o
 
-CONVF1=frams/genetics/f1/conv_f1.o frams/genetics/geneprops.o
-CONVF4=frams/genetics/f4/conv_f4.o frams/genetics/f4/f4_general.o frams/genetics/geneprops.o
-CONVF9=frams/genetics/f9/conv_f9.o
-CONVFF=frams/genetics/fF/conv_fF.o frams/genetics/fF/fF_genotype.o frams/genetics/fF/fF_chamber3d.o
-CONVFN=frams/genetics/fn/conv_fn.o
+CONVF1=frams/genetics/f1/f1_conv.o frams/genetics/geneprops.o
+CONVF4=frams/genetics/f4/f4_conv.o frams/genetics/f4/f4_general.o frams/genetics/geneprops.o
+CONVF9=frams/genetics/f9/f9_conv.o
+CONVFF=frams/genetics/fF/fF_conv.o frams/genetics/fF/fF_genotype.o frams/genetics/fF/fF_chamber3d.o
+CONVFN=frams/genetics/fn/fn_conv.o
 
 # $(sort - remove duplicates
@@ -22 +22 @@
 GENMAN_COMMON_OBJS=frams/genetics/genman.o frams/param/mutableparam.o frams/param/mutparamlist.o frams/neuro/geneticneuroparam.o frams/neuro/neurolibparam.o
 
-SDK_OBJS=frams/util/list.o frams/util/advlist.o frams/param/param.o frams/util/sstring.o frams/util/sstringutils.o frams/util/3d.o frams/vm/classes/3dobject.o frams/model/model.o frams/model/modelparts.o frams/neuro/neurolibrary.o frams/genetics/geno.o frams/genetics/genoconv.o frams/util/extvalue.o frams/vm/classes/collectionobj.o frams/util/hashtable.o common/log.o common/stl-util.o common/nonstd_stdio.o frams/util/callbacks.o frams/param/syntparam.o frams/util/multirange.o frams/util/multimap.o frams/param/paramtabobj.o common/loggers/loggers.o frams/param/paramobj.o frams/genetics/oper_fx.o common/nonstd_math.o frams/util/validitychecks.o common/Convert.o frams/util/rndutil.o common/virtfile/stringfile.o
+SDK_OBJS=frams/util/list.o frams/util/advlist.o frams/param/param.o frams/util/sstring.o frams/util/sstringutils.o frams/util/3d.o frams/vm/classes/3dobject.o frams/model/model.o frams/model/modelparts.o frams/neuro/neurolibrary.o frams/genetics/geno.o frams/genetics/genoconv.o frams/util/extvalue.o frams/vm/classes/collectionobj.o frams/util/hashtable.o common/log.o common/stl-util.o common/nonstd_stdio.o frams/util/callbacks.o frams/param/syntparam.o frams/util/multirange.o frams/util/multimap.o frams/param/paramtabobj.o common/loggers/loggers.o frams/param/paramobj.o frams/genetics/genooperators.o common/nonstd_math.o frams/util/validitychecks.o common/Convert.o frams/util/rndutil.o common/virtfile/stringfile.o
 
 GEOMETRY_OBJS=frams/model/geometry/meshbuilder.o frams/model/geometry/modelgeometryinfo.o frams/model/geometry/geometryutils.o