Changeset 2347 for trunk

Timestamp:

Aug 12, 2011, 6:32:52 AM (13 years ago)

Author:

gah

Message:

new nanoscale

Location:

trunk/packages/vizservers/nanoscale

Files:

• Makefile.in (modified) (3 diffs)
• renderservers.tcl (deleted)
• server2.c (modified) (2 diffs)

trunk/packages/vizservers/nanoscale/Makefile.in

@@ -3 +3 @@
 CFLAGS          = @CFLAGS@
 EXTRA_CFLAGS    = -Wall 
-DEFINES         = @DEFINES@
-CC_SWITCHES     = $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDES)
+CC_SWITCHES     = $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDES) $(DEFINES)
 LDFLAGS         = @LDFLAGS@
 
@@ -31 +30 @@
 LD_RUN_PATH     = $(libdir)
 
+DEFINES         = -DSERVERSFILE=\"$(libdir)/renderservers.tcl\"
 INCLUDES        = $(TCL_INC_SPEC)
 LIBS            = $(TCL_LIB_SPEC) \
@@ -44 +44 @@
         $(CC) $(CC_SWITCHES) -o $@ $^ $(LIBS)
 
-install: nanoscale
+install: nanoscale renderservers.tcl
         $(INSTALL_PROGRAM) -D nanoscale $(bindir)/nanoscale
+        $(INSTALL) -m 0444 renderservers.tcl $(libdir)
 
 client: $(CLIENT_OBJS)

trunk/packages/vizservers/nanoscale/server2.c

@@ -15 +15 @@
 #define TRUE    1
 #define FALSE   0
-#define DEF_SERVERS  "/opt/hubzero/rappture/render/lib/renderservers.tcl"
+
+#ifndef SERVERSFILE
+#define SERVERSFILE  "/opt/hubzero/rappture/render/lib/renderservers.tcl"
+#endif
 
 #define ERROR(...)      LogMessage(LOG_ERR, __FILE__, __LINE__, __VA_ARGS__)
@@ -260 +263 @@
     dispNum = 0;
     maxCards = 1;
-    fileName = DEF_SERVERS;
+    fileName = SERVERSFILE;
     debug = FALSE;
     strcpy(display, "DISPLAY=:0.0");