Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

- Unix build system: build samples/example_app/, 

and change the samples/ makefiles so that they automatically
    create the symbolic link to libstdc++.a
    Fixes #725

svn path=/trunk/boinc/; revision=16129
This commit is contained in:
David Anderson 2008-10-04 18:51:38 +00:00
parent 0cf82b2746
commit 5a1e97c349
7 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -9,7 +9,7 @@ ACLOCAL_AMFLAGS = -I m4
API_SUBDIRS = api lib zip
if ENABLE_SERVER
SERVER_SUBDIRS = db test py sched apps tools
SERVER_SUBDIRS = db test py sched apps tools samples/example_app
endif
if ENABLE_CLIENT

9
checkin_notes
View File

@ -8034,3 +8034,12 @@ David 4 Oct 2008
client/
client_state.cpp
cs_trickle.cpp
David 4 Oct 2008
- Unix build system: build samples/example_app/,
and change the samples/ makefiles so that they automatically
create the symbolic link to libstdc++.a
Fixes #725
Makefile.am
samples/*/Makefile

12
samples/example_app/Makefile
View File

@ -1,10 +1,5 @@
# This should work on Linux. Modify as needed for other platforms.
# Do this first:
# ln -s `g++ -print-file-name=libstdc++.a`
# This creates a symbolic link to the C++ library,
# which is linked statically
BOINC_DIR = ../..
BOINC_API_DIR = $(BOINC_DIR)/api
BOINC_LIB_DIR = $(BOINC_DIR)/lib
@ -29,13 +24,16 @@ PROGS = uc2 uc2_graphics
all: $(PROGS)
libstdc++.a:
ln -s `g++ -print-file-name=libstdc++.a`
clean:
/bin/rm -f $(PROGS)
uc2: uc2.o $(BOINC_API_DIR)/libboinc_api.a $(BOINC_LIB_DIR)/libboinc.a
uc2: uc2.o libstdc++.a $(BOINC_API_DIR)/libboinc_api.a $(BOINC_LIB_DIR)/libboinc.a
$(CXX) $(CXXFLAGS) -o uc2 uc2.o libstdc++.a -pthread -lboinc_api -lboinc
uc2_graphics: uc2_graphics.o $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_graphics2.a
uc2_graphics: libstdc++.a uc2_graphics.o $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_graphics2.a
$(CXX) $(CXXFLAGS) -o uc2_graphics uc2_graphics.o libstdc++.a -pthread \
-lboinc_graphics2 -lboinc_api -lboinc \
$(LIBGLUT) $(LIBGLU) $(LIBJPEG) \

12
samples/example_app/Makefile.debian
View File

@ -1,10 +1,5 @@
# This should work on Linux. Modify as needed for other platforms.
# Do this first:
# ln -s `g++ -print-file-name=libstdc++.a`
# This creates a symbolic link to the C++ library,
# which is linked statically
BOINC_DIR = ../..
BOINC_API_DIR = $(BOINC_DIR)/api
BOINC_LIB_DIR = $(BOINC_DIR)/lib
@ -29,13 +24,16 @@ PROGS = uc2 uc2_graphics
all: $(PROGS)
libstdc++.a:
ln -s `g++ -print-file-name=libstdc++.a`
clean:
/bin/rm -f $(PROGS)
uc2: uc2.o $(BOINC_API_DIR)/libboinc_api.a $(BOINC_LIB_DIR)/libboinc.a
uc2: uc2.o libstdc++.a $(BOINC_API_DIR)/libboinc_api.a $(BOINC_LIB_DIR)/libboinc.a
$(CXX) $(CXXFLAGS) -o uc2 uc2.o libstdc++.a -pthread -lboinc_api -lboinc
uc2_graphics: uc2_graphics.o $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_graphics2.a
uc2_graphics: uc2_graphics.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_graphics2.a
$(CXX) $(CXXFLAGS) -o uc2_graphics uc2_graphics.o libstdc++.a -pthread \
-lboinc_graphics2 -lboinc_api -lboinc \
$(LIBGLUT) $(LIBGLU) $(LIBJPEG) \

10
samples/multi_thread/Makefile
View File

@ -1,10 +1,5 @@
# This should work on Linux. Modify as needed for other platforms.
# Do this first:
# ln -s `g++ -print-file-name=libstdc++.a`
# This creates a symbolic link to the C++ library,
# which is linked statically
BOINC_DIR = ../..
BOINC_API_DIR = $(BOINC_DIR)/api
BOINC_LIB_DIR = $(BOINC_DIR)/lib
@ -21,8 +16,11 @@ PROGS = multi_thread
all: $(PROGS)
libstdc++.a:
ln -s `g++ -print-file-name=libstdc++.a`
clean:
/bin/rm -f $(PROGS)
multi_thread: multi_thread.o $(BOINC_API_DIR)/libboinc_api.a $(BOINC_LIB_DIR)/libboinc.a
multi_thread: multi_thread.o libstdc++.a $(BOINC_API_DIR)/libboinc_api.a $(BOINC_LIB_DIR)/libboinc.a
$(CXX) $(CXXFLAGS) -o multi_thread multi_thread.o libstdc++.a -pthread -lboinc_api -lboinc

10
samples/sleeper/Makefile
View File

@ -1,10 +1,5 @@
# This should work on Linux. Modify as needed for other platforms.
# Do this first:
# ln -s `g++ -print-file-name=libstdc++.a`
# This creates a symbolic link to the C++ library,
# which is linked statically
BOINC_DIR = ../..
BOINC_API_DIR = $(BOINC_DIR)/api
BOINC_LIB_DIR = $(BOINC_DIR)/lib
@ -21,8 +16,11 @@ PROGS = sleeper
all: $(PROGS)
libstdc++.a:
ln -s `g++ -print-file-name=libstdc++.a`
clean:
rm $(PROGS)
sleeper: sleeper.o $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
sleeper: sleeper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
g++ $(CXXFLAGS) -o sleeper sleeper.o libstdc++.a -pthread -lboinc_api -lboinc

10
samples/wrapper/Makefile
View File

@ -1,10 +1,5 @@
# This should work on Linux. Modify as needed for other platforms.
# Do this first:
# ln -s `g++ -print-file-name=libstdc++.a`
# This creates a symbolic link to the C++ library,
# which is linked statically
# Change the following to match your installation
BOINC_DIR = ../..
BOINC_API_DIR = $(BOINC_DIR)/api
@ -22,8 +17,11 @@ PROGS = wrapper
all: $(PROGS)
libstdc++.a:
ln -s `g++ -print-file-name=libstdc++.a`
clean:
rm $(PROGS) *.o
wrapper: wrapper.o $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
wrapper: wrapper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
g++ $(CXXFLAGS) -o wrapper wrapper.o libstdc++.a -pthread -lboinc_api -lboinc