Attachment #398760 for bug #496654





# compiler, linker and utilities
ifneq ($(TARGETOS),emscripten)
AR ?= @ar
CC ?= @gcc
CXX ?= @g++
LD = $(CXX)
endif
MD = -mkdir$(BUILD_EXE)
RM = @rm -f
OBJDUMP = @objdump
PYTHON ?= @python
PKG_CONFIG ?= pkg-config

#-------------------------------------------------
# form the name of the executable


# CFLAGS is defined based on C or C++ targets
# (remember, expansion only happens when used, so doing it here is ok)
CFLAGS += $(CCOMFLAGS) $(CPPONLYFLAGS) $(INCPATH)

# we compile C-only to C89 standard with GNU extensions
# we compile C++ code to C++98 standard with GNU extensions

endif
COBJFLAGS += -x objective-c++

# this speeds it up a bit by piping between the preprocessor/compiler/assembler
CCOMFLAGS += -pipe

# add -g if we need symbols, and ensure we have frame pointers
ifdef SYMBOLS
CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer -fno-optimize-sibling-calls

CCOMFLAGS += -pg
endif

# add the optimization flag
CCOMFLAGS += -O$(OPTIMIZE)

# add the error warning flag
ifndef NOWERROR
CCOMFLAGS += -Werror
endif

# if we are optimizing, include optimization options
ifneq ($(OPTIMIZE),0)
CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
ifdef LTO
CCOMFLAGS += -flto
endif
endif

ifdef SSE2
CCOMFLAGS += -msse2
endif

# linking flags
#-------------------------------------------------

# LDFLAGS are used generally; LDFLAGSEMULATOR are additional
# flags only used when linking the core emulator
LDFLAGS =
ifneq ($(TARGETOS),macosx)
ifneq ($(TARGETOS),os2)
ifneq ($(TARGETOS),solaris)
LDFLAGS = -Wl,--warn-common
endif
endif
endif
LDFLAGSEMULATOR =

# add profiling information for the linker
ifdef PROFILE
LDFLAGS += -pg
endif

# strip symbols and other metadata in non-symbols and non profiling builds
ifndef SYMBOLS
ifneq ($(TARGETOS),macosx)
LDFLAGS += -s
endif
endif

ifneq ($(OPTIMIZE),0)
ifdef LTO
LDFLAGS += -flto

Lines 24-29 Link Here

(-)work.orig/src/osd/sdl/sdl.mak (-4 / +6 lines)
24	# uncomment and edit next line to specify a distribution	24	# uncomment and edit next line to specify a distribution
25	# supported debian-stable, ubuntu-intrepid	25	# supported debian-stable, ubuntu-intrepid
26		26
		27	PKG_CONFIG ?= pkg-config
		28
27	# DISTRO = debian-stable	29	# DISTRO = debian-stable
28	# DISTRO = ubuntu-intrepid	30	# DISTRO = ubuntu-intrepid
29	# DISTRO = gcc44-generic	31	# DISTRO = gcc44-generic
Lines 107-115 Link Here
107	endif	109	endif
108		110
109	ifdef SDL_INSTALL_ROOT	111	ifdef SDL_INSTALL_ROOT
110	SDL_CONFIG = $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config	112	SDL_CONFIG ?= $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config
111	else	113	else
112	SDL_CONFIG = $(SDL_LIBVER)-config	114	SDL_CONFIG ?= $(SDL_LIBVER)-config
113	endif	115	endif
114		116
115	ifeq ($(SDL_LIBVER),sdl2)	117	ifeq ($(SDL_LIBVER),sdl2)
Lines 761-768 Link Here
761	#-------------------------------------------------	763	#-------------------------------------------------
762		764
763	ifndef NO_USE_QTDEBUG	765	ifndef NO_USE_QTDEBUG
764	$(OSDOBJ)/%.moc.c: $(OSDSRC)/%.h	766	INCPATH += $(shell $(PKG_CONFIG) QtGui --cflags)
765	$(MOC) $(MOCINCPATH) $< -o $@	767	LIBS += $(shell $(PKG_CONFIG) QtGui --libs)
766		768
767	DEBUGOBJS = \	769	DEBUGOBJS = \
768	$(OSDOBJ)/modules/debugger/qt/debuggerview.o \	770	$(OSDOBJ)/modules/debugger/qt/debuggerview.o \

Return to bug 496654

Lines 363-376 Link Here

(-)work.orig/makefile (-43 / +7 lines)
363		363
364	# compiler, linker and utilities	364	# compiler, linker and utilities
365	ifneq ($(TARGETOS),emscripten)	365	ifneq ($(TARGETOS),emscripten)
366	AR = @ar	366	AR ?= @ar
367	CC = @gcc	367	CC ?= @gcc
368	LD = @g++	368	CXX ?= @g++
		369	LD = $(CXX)
369	endif	370	endif
370	MD = -mkdir$(BUILD_EXE)	371	MD = -mkdir$(BUILD_EXE)
371	RM = @rm -f	372	RM = @rm -f
372	OBJDUMP = @objdump	373	OBJDUMP = @objdump
373	PYTHON = @python	374	PYTHON ?= @python
		375	PKG_CONFIG ?= pkg-config
374		376
375	#-------------------------------------------------	377	#-------------------------------------------------
376	# form the name of the executable	378	# form the name of the executable
Lines 523-529 Link Here
523		525
524	# CFLAGS is defined based on C or C++ targets	526	# CFLAGS is defined based on C or C++ targets
525	# (remember, expansion only happens when used, so doing it here is ok)	527	# (remember, expansion only happens when used, so doing it here is ok)
526	CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS) $(INCPATH)	528	CFLAGS += $(CCOMFLAGS) $(CPPONLYFLAGS) $(INCPATH)
527		529
528	# we compile C-only to C89 standard with GNU extensions	530	# we compile C-only to C89 standard with GNU extensions
529	# we compile C++ code to C++98 standard with GNU extensions	531	# we compile C++ code to C++98 standard with GNU extensions
Lines 535-543 Link Here
535	endif	537	endif
536	COBJFLAGS += -x objective-c++	538	COBJFLAGS += -x objective-c++
537		539
538	# this speeds it up a bit by piping between the preprocessor/compiler/assembler
539	CCOMFLAGS += -pipe
540
541	# add -g if we need symbols, and ensure we have frame pointers	540	# add -g if we need symbols, and ensure we have frame pointers
542	ifdef SYMBOLS	541	ifdef SYMBOLS
543	CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer -fno-optimize-sibling-calls	542	CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer -fno-optimize-sibling-calls
Lines 564-585 Link Here
564	CCOMFLAGS += -pg	563	CCOMFLAGS += -pg
565	endif	564	endif
566		565
567	# add the optimization flag
568	CCOMFLAGS += -O$(OPTIMIZE)
569
570	# add the error warning flag
571	ifndef NOWERROR
572	CCOMFLAGS += -Werror
573	endif
574
575	# if we are optimizing, include optimization options
576	ifneq ($(OPTIMIZE),0)
577	CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
578	ifdef LTO
579	CCOMFLAGS += -flto
580	endif
581	endif
582
583	ifdef SSE2	566	ifdef SSE2
584	CCOMFLAGS += -msse2	567	CCOMFLAGS += -msse2
585	endif	568	endif
Lines 662-691 Link Here
662	# linking flags	645	# linking flags
663	#-------------------------------------------------	646	#-------------------------------------------------
664		647
665	# LDFLAGS are used generally; LDFLAGSEMULATOR are additional
666	# flags only used when linking the core emulator
667	LDFLAGS =
668	ifneq ($(TARGETOS),macosx)
669	ifneq ($(TARGETOS),os2)
670	ifneq ($(TARGETOS),solaris)
671	LDFLAGS = -Wl,--warn-common
672	endif
673	endif
674	endif
675	LDFLAGSEMULATOR =
676
677	# add profiling information for the linker	648	# add profiling information for the linker
678	ifdef PROFILE	649	ifdef PROFILE
679	LDFLAGS += -pg	650	LDFLAGS += -pg
680	endif	651	endif
681		652
682	# strip symbols and other metadata in non-symbols and non profiling builds
683	ifndef SYMBOLS
684	ifneq ($(TARGETOS),macosx)
685	LDFLAGS += -s
686	endif
687	endif
688
689	ifneq ($(OPTIMIZE),0)	653	ifneq ($(OPTIMIZE),0)
690	ifdef LTO	654	ifdef LTO
691	LDFLAGS += -flto	655	LDFLAGS += -flto