remove OpenGL(U) dependency on unix test apps

svn path=/trunk/boinc/; revision=1561
This commit is contained in:
Karl Chen 2003-06-20 21:23:41 +00:00
parent 7630688578
commit 07ee145e14
3 changed files with 19 additions and 4 deletions

View File

@ -9,12 +9,16 @@ noinst_LIBRARIES = libapp.a
libapp_a_SOURCES = ../api/mfile.C ../lib/parse.C ../lib/filesys.C ../lib/shmem.C ../lib/util.C ../lib/app_ipc.C libapp_a_SOURCES = ../api/mfile.C ../lib/parse.C ../lib/filesys.C ../lib/shmem.C ../lib/util.C ../lib/app_ipc.C
LDADD = -lm -lGL -lGLU -lpthread -L. -lapp # when we are ready to build graphics apps on unix:
# LDADD = -lm -lGL -lGLU -lpthread -L. -lapp
LDADD = -lm -lpthread -L. -lapp
# upper_case_x11_SOURCES = upper_case_x11.C ../api/x_opengl.C ../api/boinc_api.C ../api/graphics_api.C # upper_case_x11_SOURCES = upper_case_x11.C ../api/x_opengl.C ../api/boinc_api.C ../api/graphics_api.C
# upper_case_x11_CPPFLAGS = -DBOINC_APP_GRAPHICS # upper_case_x11_CPPFLAGS = -DBOINC_APP_GRAPHICS
upper_case_SOURCES = upper_case.C ../api/boinc_api.C ../api/graphics_api.C upper_case_SOURCES = upper_case.C ../api/boinc_api.C
concat_SOURCES = concat.C ../api/boinc_api.C ../api/graphics_api.C concat_SOURCES = concat.C ../api/boinc_api.C
1sec_SOURCES = 1sec.C ../api/boinc_api.C ../api/graphics_api.C 1sec_SOURCES = 1sec.C ../api/boinc_api.C
# ../api/graphics_api.C

View File

@ -146,8 +146,10 @@ int main(int argc, char **argv) {
retval = boinc_init(); retval = boinc_init();
if (retval) exit(retval); if (retval) exit(retval);
#ifdef BOINC_APP_GRAPHICS
retval = boinc_init_opengl(); retval = boinc_init_opengl();
if (retval) exit(retval); if (retval) exit(retval);
#endif
boinc_get_init_data(uc_aid); boinc_get_init_data(uc_aid);
// fprintf(stderr, // fprintf(stderr,
@ -236,7 +238,9 @@ int main(int argc, char **argv) {
time_file.flush(); time_file.flush();
time_file.close(); time_file.close();
#ifdef BOINC_APP_GRAPHICS
boinc_finish_opengl(); boinc_finish_opengl();
#endif
boinc_finish(0); boinc_finish(0);
return 0; return 0;

View File

@ -4930,3 +4930,10 @@ Karl 2003/06/20
shmem.C shmem.C
test/ test/
boinc.py boinc.py
Karl 2003/06/20
- remove OpenGL(U) dependency on unix test apps
apps/
Makefile.am
upper_case.C