From 07ee145e145f0e376fe0ae4e0fc04c465edbf4a2 Mon Sep 17 00:00:00 2001
From: Karl Chen <quarl@quarl.org>
Date: Fri, 20 Jun 2003 21:23:41 +0000
Subject: [PATCH]  remove OpenGL(U) dependency on unix test apps

svn path=/trunk/boinc/; revision=1561
---
 apps/Makefile.am  | 12 ++++++++----
 apps/upper_case.C |  4 ++++
 checkin_notes     |  7 +++++++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/apps/Makefile.am b/apps/Makefile.am
index c534ee1fb8..441328f0b4 100644
--- a/apps/Makefile.am
+++ b/apps/Makefile.am
@@ -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
 
-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_CPPFLAGS = -DBOINC_APP_GRAPHICS
 
-upper_case_SOURCES       = upper_case.C ../api/boinc_api.C ../api/graphics_api.C
-concat_SOURCES           = concat.C ../api/boinc_api.C ../api/graphics_api.C
-1sec_SOURCES             = 1sec.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
+1sec_SOURCES             = 1sec.C ../api/boinc_api.C
 
+#  ../api/graphics_api.C
diff --git a/apps/upper_case.C b/apps/upper_case.C
index a8378c0b10..8bca738cc4 100755
--- a/apps/upper_case.C
+++ b/apps/upper_case.C
@@ -146,8 +146,10 @@ int main(int argc, char **argv) {
     retval = boinc_init();
     if (retval) exit(retval);
 
+#ifdef BOINC_APP_GRAPHICS
     retval = boinc_init_opengl();
     if (retval) exit(retval);
+#endif
 
     boinc_get_init_data(uc_aid);
     // fprintf(stderr,
@@ -236,7 +238,9 @@ int main(int argc, char **argv) {
     time_file.flush();
     time_file.close();
 
+#ifdef BOINC_APP_GRAPHICS
     boinc_finish_opengl();
+#endif
     boinc_finish(0);
 
     return 0;
diff --git a/checkin_notes b/checkin_notes
index 44942b41ed..e46995b6fa 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -4930,3 +4930,10 @@ Karl    2003/06/20
         shmem.C
     test/
         boinc.py
+
+Karl    2003/06/20
+    - remove OpenGL(U) dependency on unix test apps
+
+    apps/
+        Makefile.am
+        upper_case.C