Revision 1117

trunk/src/GNUmakefile (revision 1117)
81 81
endif
82 82

  
83 83
include nh99/objects.lst
84
ifeq ($(TERMINAL),dos)
85
OPTLP_NH99_OBJS=$(sort $(addprefix ..\build\objects\dist\optlp-nh99-,$(OBJ6))) ..\build\objects\dist\optlp-sparse-hs_sparse.obj
86
SAFLP_NH99_OBJS=$(sort $(addprefix ..\build\objects\dist\saflp-nh99-,$(OBJ6))) ..\build\objects\dist\saflp-sparse-hs_sparse.obj
84
ifneq ($(CXX),CC)
85
 ifeq ($(TERMINAL),dos)
86
 OPTLP_NH99_OBJS=$(sort $(addprefix ..\build\objects\dist\optlp-nh99-,$(filter-out dfqromb.obj,$(OBJ6)))) ..\build\objects\dist\optlp-sparse-hs_sparse.obj
87
 SAFLP_NH99_OBJS=$(sort $(addprefix ..\build\objects\dist\saflp-nh99-,$(filter-out dfqromb.obj,$(OBJ6)))) ..\build\objects\dist\saflp-sparse-hs_sparse.obj
88
 else
89
 OPTLP_NH99_OBJS=$(sort $(addprefix ../build/objects/dist/optlp-nh99-,$(filter-out dfqromb.obj,$(OBJ6)))) ../build/objects/dist/optlp-sparse-hs_sparse.obj
90
 SAFLP_NH99_OBJS=$(sort $(addprefix ../build/objects/dist/saflp-nh99-,$(filter-out dfqromb.obj,$(OBJ6)))) ../build/objects/dist/saflp-sparse-hs_sparse.obj
91
 endif
87 92
else
88
OPTLP_NH99_OBJS=$(sort $(addprefix ../build/objects/dist/optlp-nh99-,$(OBJ6))) ../build/objects/dist/optlp-sparse-hs_sparse.obj
89
SAFLP_NH99_OBJS=$(sort $(addprefix ../build/objects/dist/saflp-nh99-,$(OBJ6))) ../build/objects/dist/saflp-sparse-hs_sparse.obj
93
 ifeq ($(TERMINAL),dos)
94
 OPTLP_NH99_OBJS=$(sort $(addprefix ..\build\objects\dist\optlp-nh99-,$(OBJ6))) ..\build\objects\dist\optlp-sparse-hs_sparse.obj
95
 SAFLP_NH99_OBJS=$(sort $(addprefix ..\build\objects\dist\saflp-nh99-,$(OBJ6))) ..\build\objects\dist\saflp-sparse-hs_sparse.obj
96
 else
97
 OPTLP_NH99_OBJS=$(sort $(addprefix ../build/objects/dist/optlp-nh99-,$(OBJ6))) ../build/objects/dist/optlp-sparse-hs_sparse.obj
98
 SAFLP_NH99_OBJS=$(sort $(addprefix ../build/objects/dist/saflp-nh99-,$(OBJ6))) ../build/objects/dist/saflp-sparse-hs_sparse.obj
99
 endif
90 100
endif
101

  
91 102
include tools99/objects.lst
92 103
ifeq ($(TERMINAL),dos)
93 104
OPTLP_TOOLS99_OBJS=$(sort $(addprefix ..\build\objects\dist\optlp-tools99-,$(OBJ7)))

Also available in: Unified diff