Changeset 196 for cpp/frams/Makefile-GDK-files

Timestamp:

03/25/14 03:22:37 (11 years ago)

Author:

Maciej Komosinski

Message:

Updated f4 sources and made f4 available for GDK demo apps

File:

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

cpp/frams/Makefile-GDK-files

@@ -4 +4 @@
 ALL_DIRS={common,frams,frams/canvas,frams/config,frams/errmgr,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/fF,frams/genetics/fT,frams/model,frams/neuro,frams/neuro/impl,frams/param,frams/test,frams/util,frams/vm/classes,frams/virtfile,frams/_demos,frams/model/geometry,frams/_demos/geometry}
 
+GENMANF4=frams/genetics/f4/oper_f4.o
 GENMANF9=frams/genetics/f9/oper_f9.o
 GENMANFF=frams/genetics/fF/oper_fF.o
@@ -9 +10 @@
 
 CONVF1=frams/genetics/f1/conv_f1.o
+CONVF4=frams/genetics/f4/conv_f4.o frams/genetics/f4/f4_general.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
 
-GENOCONV_GDK_OBJS=frams/genetics/defgenoconv.o $(CONVF1) $(CONVF9) $(CONVFF)
-GENMAN_GDK_OBJS=$(GENMAN_COMMON_OBJS) $(GENMANF9) $(GENMANFF) $(GENMANFT)
+GENOCONV_GDK_OBJS=frams/genetics/defgenoconv.o $(CONVF1) $(CONVF4) $(CONVF9) $(CONVFF)
+GENMAN_GDK_OBJS=$(GENMAN_COMMON_OBJS) $(GENMANF4) $(GENMANF9) $(GENMANFF) $(GENMANFT)
 
 GENMAN_COMMON_OBJS=frams/genetics/genman.o frams/param/mutableparam.o frams/param/mutparamlist.o frams/neuro/geneticneuroparam.o frams/neuro/neurolibparam.o frams/vm/classes/genoobj.o frams/model/autoname.o