Attachment #350518 for bug #254471




++ higan_v092-source/higan/Makefile

# compiler
c       := $(compiler) -std=gnu99
cpp     := $(subst cc,++,$(compiler)) -std=gnu++0x
flags   := -I.
link    := $(LDFLAGS)
objects := libco

# profile-guided optimization mode


# platform
ifeq ($(platform),x)
  flags += -march=native
  link += -Wl,-export-dynamic -ldl -lX11 -lXext
else ifeq ($(platform),win)
  ifeq ($(arch),win32)

compile = \
  $(strip \
    $(if $(filter %.c,$<), \
      $(c) $(flags) $(CFLAGS) $1 -c $< -o $@, \
      $(if $(filter %.cpp,$<), \
        $(cpp) $(flags) $(CXXFLAGS) $1 -c $< -o $@ \
      ) \
    ) \
  )
++ higan_v092-source/higan/target-ethos/Makefile

# targets
build: $(objects)
ifeq ($(platform),x)
	$(strip $(cpp) $(CXXFLAGS) -o out/$(name) $(objects) $(link))
else ifeq ($(platform),win)
	$(strip $(cpp) -shared -o out/phoenix.dll obj/phoenix.o $(phoenixlink))
	$(strip $(cpp) -o out/$(name) $(subst obj/phoenix.o,,$(objects)) $(link) -Lout -lphoenix)

Return to bug 254471

Line Link Here

(-)file_not_specified_in_diff (-8 / +7 lines)
0	-- higan_v092-source/higan/Makefile	0	++ higan_v092-source/higan/Makefile
Lines 16-23 Link Here
16	# compiler	16	# compiler
17	c := $(compiler) -std=gnu99	17	c := $(compiler) -std=gnu99
18	cpp := $(subst cc,++,$(compiler)) -std=gnu++0x	18	cpp := $(subst cc,++,$(compiler)) -std=gnu++0x
19	flags := -I. -O3 -fomit-frame-pointer	19	flags := -I.
20	link := -s	20	link := $(LDFLAGS)
21	objects := libco	21	objects := libco
22		22
23	# profile-guided optimization mode	23	# profile-guided optimization mode
Lines 33-39 Link Here
33		33
34	# platform	34	# platform
35	ifeq ($(platform),x)	35	ifeq ($(platform),x)
36	flags += -march=native
37	link += -Wl,-export-dynamic -ldl -lX11 -lXext	36	link += -Wl,-export-dynamic -ldl -lX11 -lXext
38	else ifeq ($(platform),win)	37	else ifeq ($(platform),win)
39	ifeq ($(arch),win32)	38	ifeq ($(arch),win32)
Lines 57-65 Link Here
57	compile = \	56	compile = \
58	$(strip \	57	$(strip \
59	$(if $(filter %.c,$<), \	58	$(if $(filter %.c,$<), \
60	$(c) $(flags) $1 -c $< -o $@, \	59	$(c) $(flags) $(CFLAGS) $1 -c $< -o $@, \
61	$(if $(filter %.cpp,$<), \	60	$(if $(filter %.cpp,$<), \
62	$(cpp) $(flags) $1 -c $< -o $@ \	61	$(cpp) $(flags) $(CXXFLAGS) $1 -c $< -o $@ \
63	) \	62	) \
64	) \	63	) \
65	)	64	)
66	-- higan_v092-source/higan/target-ethos/Makefile	65	++ higan_v092-source/higan/target-ethos/Makefile
Lines 67-73 Link Here
67	# targets	67	# targets
68	build: $(objects)	68	build: $(objects)
69	ifeq ($(platform),x)	69	ifeq ($(platform),x)
70	$(strip $(cpp) -o out/$(name) $(objects) $(link))	70	$(strip $(cpp) $(CXXFLAGS) -o out/$(name) $(objects) $(link))
71	else ifeq ($(platform),win)	71	else ifeq ($(platform),win)
72	$(strip $(cpp) -shared -o out/phoenix.dll obj/phoenix.o $(phoenixlink))	72	$(strip $(cpp) -shared -o out/phoenix.dll obj/phoenix.o $(phoenixlink))
73	$(strip $(cpp) -o out/$(name) $(subst obj/phoenix.o,,$(objects)) $(link) -Lout -lphoenix)	73	$(strip $(cpp) -o out/$(name) $(subst obj/phoenix.o,,$(objects)) $(link) -Lout -lphoenix)