Skip to content
Snippets Groups Projects
Commit 3d578b0e authored by Oliver Bock's avatar Oliver Bock
Browse files

Optimized makefiles (e.g. make sure LDFLAGS isn't emptied by concatenation)

parent 5a4a7dc9
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
src/framework/Makefile
+ 6
− 7
View file @ 3d578b0e
...@@ -26,7 +26,7 @@ FRAMEWORK_INSTALL?=$(PWD) ...@@ -26,7 +26,7 @@ FRAMEWORK_INSTALL?=$(PWD)
CXX?=g++ CXX?=g++
# variables # variables
CPPFLAGS = $(shell $(FRAMEWORK_INSTALL)/bin/sdl-config --cflags) CPPFLAGS += $(shell $(FRAMEWORK_INSTALL)/bin/sdl-config --cflags)
CPPFLAGS += $(shell $(FRAMEWORK_INSTALL)/bin/freetype-config --cflags) CPPFLAGS += $(shell $(FRAMEWORK_INSTALL)/bin/freetype-config --cflags)
CPPFLAGS += $(shell $(FRAMEWORK_INSTALL)/bin/xml2-config --cflags) CPPFLAGS += $(shell $(FRAMEWORK_INSTALL)/bin/xml2-config --cflags)
CPPFLAGS += -I$(FRAMEWORK_INSTALL)/include/BOINC -I/usr/include CPPFLAGS += -I$(FRAMEWORK_INSTALL)/include/BOINC -I/usr/include
...@@ -47,7 +47,6 @@ release: clean libframework.a ...@@ -47,7 +47,6 @@ release: clean libframework.a
# target specific options # target specific options
debug: CPPFLAGS += -pg -ggdb3 -O0 -Wall -Wno-switch-enum debug: CPPFLAGS += -pg -ggdb3 -O0 -Wall -Wno-switch-enum
release: CPPFLAGS += -DNDEBUG -ggdb3 -O3 -Wall -Wno-switch-enum release: CPPFLAGS += -DNDEBUG -ggdb3 -O3 -Wall -Wno-switch-enum
release: LDFLAGS +=
# file based targets # file based targets
libframework.a: $(OBJS) libframework.a: $(OBJS)
......
src/framework/Makefile.mingw
+ 6
− 7
View file @ 3d578b0e
...@@ -26,7 +26,7 @@ FRAMEWORK_INSTALL?=$(PWD) ...@@ -26,7 +26,7 @@ FRAMEWORK_INSTALL?=$(PWD)
CXX?=g++ CXX?=g++
# variables # variables
CPPFLAGS = $(shell $(FRAMEWORK_INSTALL)/bin/sdl-config --cflags) CPPFLAGS += $(shell $(FRAMEWORK_INSTALL)/bin/sdl-config --cflags)
CPPFLAGS += $(shell $(FRAMEWORK_INSTALL)/bin/freetype-config --cflags) CPPFLAGS += $(shell $(FRAMEWORK_INSTALL)/bin/freetype-config --cflags)
CPPFLAGS += $(shell $(FRAMEWORK_INSTALL)/bin/xml2-config --cflags) CPPFLAGS += $(shell $(FRAMEWORK_INSTALL)/bin/xml2-config --cflags)
CPPFLAGS += -I$(FRAMEWORK_INSTALL)/include/BOINC -I$(FRAMEWORK_INSTALL)/include CPPFLAGS += -I$(FRAMEWORK_INSTALL)/include/BOINC -I$(FRAMEWORK_INSTALL)/include
...@@ -47,7 +47,6 @@ release: clean libframework.a ...@@ -47,7 +47,6 @@ release: clean libframework.a
# target specific options # target specific options
debug: CPPFLAGS += -pg -gstabs3 -O0 -Wall -Wno-switch-enum debug: CPPFLAGS += -pg -gstabs3 -O0 -Wall -Wno-switch-enum
release: CPPFLAGS += -DNDEBUG -gstabs3 -O3 -Wall -Wno-switch-enum release: CPPFLAGS += -DNDEBUG -gstabs3 -O3 -Wall -Wno-switch-enum
release: LDFLAGS +=
# file based targets # file based targets
libframework.a: $(OBJS) libframework.a: $(OBJS)
......
src/starsphere/Makefile
+ 10
− 7
View file @ 3d578b0e
...@@ -26,15 +26,19 @@ STARSPHERE_INSTALL?=$(PWD) ...@@ -26,15 +26,19 @@ STARSPHERE_INSTALL?=$(PWD)
CXX ?= g++ CXX ?= g++
# variables # variables
LIBS = -Wl,-Bstatic -lframework -loglft -L$(STARSPHERE_INSTALL)/lib LIBS += -Wl,-Bstatic -lframework -loglft -L$(STARSPHERE_INSTALL)/lib
LIBS += $(shell $(STARSPHERE_INSTALL)/bin/freetype-config --libs) LIBS += $(shell $(STARSPHERE_INSTALL)/bin/freetype-config --libs)
LIBS += $(shell $(STARSPHERE_INSTALL)/bin/xml2-config --libs) LIBS += $(shell $(STARSPHERE_INSTALL)/bin/xml2-config --libs)
LIBS += -lboinc_api -lboinc -L/usr/lib LIBS += -lboinc_api -lboinc
LIBS += -Wl,-Bdynamic $(shell $(STARSPHERE_INSTALL)/bin/sdl-config --static-libs) -lGL -lGLU LIBS += -lstdc++
LIBS += -L/usr/lib
LIBS += -Wl,-Bdynamic $(shell $(STARSPHERE_INSTALL)/bin/sdl-config --static-libs)
LIBS += -lGL -lGLU
LIBS += -lpthread -lm -lc
LDFLAGS = -static-libgcc LDFLAGS += -static-libgcc
CPPFLAGS = -I$(STARSPHERE_INSTALL)/include CPPFLAGS += -I$(STARSPHERE_INSTALL)/include
CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/sdl-config --cflags) CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/sdl-config --cflags)
CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/freetype-config --cflags) CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/freetype-config --cflags)
CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/xml2-config --cflags) CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/xml2-config --cflags)
...@@ -58,7 +62,6 @@ callgrind: clean debug starsphere ...@@ -58,7 +62,6 @@ callgrind: clean debug starsphere
# target specific options # target specific options
debug: CPPFLAGS += -pg -ggdb3 -O0 -Wall -Wno-switch-enum debug: CPPFLAGS += -pg -ggdb3 -O0 -Wall -Wno-switch-enum
release: CPPFLAGS += -DNDEBUG -ggdb3 -O3 -Wall -Wno-switch-enum release: CPPFLAGS += -DNDEBUG -ggdb3 -O3 -Wall -Wno-switch-enum
release: LDFLAGS +=
starsphere_EinsteinS5R3: CPPFLAGS += -D SCIENCE_APP=EinsteinS5R3 starsphere_EinsteinS5R3: CPPFLAGS += -D SCIENCE_APP=EinsteinS5R3
starsphere_EinsteinRadio: CPPFLAGS += -D SCIENCE_APP=EinsteinRadio starsphere_EinsteinRadio: CPPFLAGS += -D SCIENCE_APP=EinsteinRadio
memcheck: CPPFLAGS += $(DEBUGFLAGSCPP) -D DEBUG_VALGRIND memcheck: CPPFLAGS += $(DEBUGFLAGSCPP) -D DEBUG_VALGRIND
......
src/starsphere/Makefile.macos
+ 5
− 4
View file @ 3d578b0e
...@@ -26,15 +26,17 @@ STARSPHERE_INSTALL?=$(PWD) ...@@ -26,15 +26,17 @@ STARSPHERE_INSTALL?=$(PWD)
CXX ?= g++ CXX ?= g++
# variables # variables
LIBS = -lframework -loglft -L$(STARSPHERE_INSTALL)/lib LIBS += -lframework -loglft -L$(STARSPHERE_INSTALL)/lib
LIBS += $(shell $(STARSPHERE_INSTALL)/bin/freetype-config --libs) LIBS += $(shell $(STARSPHERE_INSTALL)/bin/freetype-config --libs)
LIBS += $(shell $(STARSPHERE_INSTALL)/bin/xml2-config --libs) LIBS += $(shell $(STARSPHERE_INSTALL)/bin/xml2-config --libs)
LIBS += -lboinc_graphics2 -lboinc_api -lboinc -L$(STARSPHERE_INSTALL)/lib LIBS += -lboinc_graphics2 -lboinc_api -lboinc -L$(STARSPHERE_INSTALL)/lib
LIBS += $(shell $(STARSPHERE_INSTALL)/bin/sdl-config --static-libs) LIBS += $(shell $(STARSPHERE_INSTALL)/bin/sdl-config --static-libs)
LIBS += -lstdc++
LIBS += -lpthread -lm -lc
LDFLAGS = -static-libgcc LDFLAGS += -static-libgcc
CPPFLAGS = -I$(STARSPHERE_INSTALL)/include CPPFLAGS += -I$(STARSPHERE_INSTALL)/include
CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/sdl-config --cflags) CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/sdl-config --cflags)
CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/freetype-config --cflags) CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/freetype-config --cflags)
CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/xml2-config --cflags) CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/xml2-config --cflags)
...@@ -59,7 +61,6 @@ callgrind: clean debug starsphere ...@@ -59,7 +61,6 @@ callgrind: clean debug starsphere
# target specific options # target specific options
debug: CPPFLAGS += -pg -ggdb3 -O0 -Wall -Wno-switch-enum debug: CPPFLAGS += -pg -ggdb3 -O0 -Wall -Wno-switch-enum
release: CPPFLAGS += -DNDEBUG -ggdb3 -O3 -Wall -Wno-switch-enum release: CPPFLAGS += -DNDEBUG -ggdb3 -O3 -Wall -Wno-switch-enum
release: LDFLAGS +=
starsphere_EinsteinS5R3: CPPFLAGS += -D SCIENCE_APP=EinsteinS5R3 starsphere_EinsteinS5R3: CPPFLAGS += -D SCIENCE_APP=EinsteinS5R3
starsphere_EinsteinRadio: CPPFLAGS += -D SCIENCE_APP=EinsteinRadio starsphere_EinsteinRadio: CPPFLAGS += -D SCIENCE_APP=EinsteinRadio
memcheck: CPPFLAGS += $(DEBUGFLAGSCPP) -D DEBUG_VALGRIND memcheck: CPPFLAGS += $(DEBUGFLAGSCPP) -D DEBUG_VALGRIND
......
src/starsphere/Makefile.mingw
+ 3
− 4
View file @ 3d578b0e
...@@ -26,7 +26,7 @@ STARSPHERE_INSTALL?=$(PWD) ...@@ -26,7 +26,7 @@ STARSPHERE_INSTALL?=$(PWD)
CXX ?= g++ CXX ?= g++
# variables # variables
LIBS = -Wl,-Bstatic LIBS += -Wl,-Bstatic
LIBS += -lframework -loglft -L$(STARSPHERE_INSTALL)/lib LIBS += -lframework -loglft -L$(STARSPHERE_INSTALL)/lib
LIBS += $(shell $(STARSPHERE_INSTALL)/bin/freetype-config --libs) LIBS += $(shell $(STARSPHERE_INSTALL)/bin/freetype-config --libs)
LIBS += $(shell $(STARSPHERE_INSTALL)/bin/xml2-config --libs) LIBS += $(shell $(STARSPHERE_INSTALL)/bin/xml2-config --libs)
...@@ -36,9 +36,9 @@ LIBS += -Wl,-Bdynamic ...@@ -36,9 +36,9 @@ LIBS += -Wl,-Bdynamic
LIBS += $(shell $(STARSPHERE_INSTALL)/bin/sdl-config --static-libs) LIBS += $(shell $(STARSPHERE_INSTALL)/bin/sdl-config --static-libs)
LIBS += -lopengl32 -lglu32 LIBS += -lopengl32 -lglu32
LDFLAGS = -static-libgcc LDFLAGS += -static-libgcc
CPPFLAGS = -I$(STARSPHERE_INSTALL)/include CPPFLAGS += -I$(STARSPHERE_INSTALL)/include
CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/sdl-config --cflags) CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/sdl-config --cflags)
CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/freetype-config --cflags) CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/freetype-config --cflags)
CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/xml2-config --cflags) CPPFLAGS += $(shell $(STARSPHERE_INSTALL)/bin/xml2-config --cflags)
...@@ -62,7 +62,6 @@ callgrind: clean debug starsphere ...@@ -62,7 +62,6 @@ callgrind: clean debug starsphere
# target specific options # target specific options
debug: CPPFLAGS += -pg -gstabs3 -O0 -Wall -Wno-switch-enum debug: CPPFLAGS += -pg -gstabs3 -O0 -Wall -Wno-switch-enum
release: CPPFLAGS += -DNDEBUG -gstabs3 -O3 -Wall -Wno-switch-enum release: CPPFLAGS += -DNDEBUG -gstabs3 -O3 -Wall -Wno-switch-enum
release: LDFLAGS +=
starsphere_EinsteinS5R3: CPPFLAGS += -D SCIENCE_APP=EinsteinS5R3 starsphere_EinsteinS5R3: CPPFLAGS += -D SCIENCE_APP=EinsteinS5R3
starsphere_EinsteinRadio: CPPFLAGS += -D SCIENCE_APP=EinsteinRadio starsphere_EinsteinRadio: CPPFLAGS += -D SCIENCE_APP=EinsteinRadio
memcheck: CPPFLAGS += $(DEBUGFLAGSCPP) -D DEBUG_VALGRIND memcheck: CPPFLAGS += $(DEBUGFLAGSCPP) -D DEBUG_VALGRIND
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

AEI Privacy Policy Imprint