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

Timestamp:

03/15/18 22:53:35 (7 years ago)

Author:

Maciej Komosinski

Message:

f1 and f4 stick properties unified and moved to a separate structure and file (geneprops.cpp/h)

File:

• cpp/frams/Makefile-SDK-files (modified) (1 diff)

cpp/frams/Makefile-SDK-files

@@ -10 +10 @@
 GENMANFN=frams/genetics/fn/oper_fn.o
 
-CONVF1=frams/genetics/f1/conv_f1.o
-CONVF4=frams/genetics/f4/conv_f4.o frams/genetics/f4/f4_general.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
 
-GENOCONV_SDK_OBJS=frams/genetics/defgenoconv.o frams/vm/classes/genoobj.o frams/model/autoname.o $(CONVF1) $(CONVF4) $(CONVF9) $(CONVFF) $(CONVFN)
+# $(sort - remove duplicates
+GENOCONV_SDK_OBJS=$(sort frams/genetics/defgenoconv.o frams/vm/classes/genoobj.o frams/model/autoname.o $(CONVF1) $(CONVF4) $(CONVF9) $(CONVFF) $(CONVFN))
 GENMAN_SDK_OBJS=$(GENMAN_COMMON_OBJS) $(GENMANF4) $(GENMANF9) $(GENMANFF) $(GENMANFT) $(GENMANFN)