[Plib-cvs] plib/examples/src/ssg/majik Makefile.am,1.3,1.4 majik_demo.cxx,1.5,1.6

[Steve B. <sj...@us...>]

Update of /cvsroot/plib/plib/examples/src/ssg/majik
In directory usw-pr-cvs1:/tmp/cvs-serv17568/plib/examples/src/ssg/majik

Modified Files:
	Makefile.am majik_demo.cxx 
Log Message:
Added libjs and jsInit where required.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/ssg/majik/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	7 Jul 2002 18:07:13 -0000	1.3
+++ Makefile.am	1 Sep 2002 01:11:00 -0000	1.4
@@ -4,7 +4,7 @@
                      image_map.h     \
                      majik_demo.cxx
 
-majik_demo_LDADD = -lplibssg -lplibsg -lplibul $(GLUT_LIBS) $(OGL_LIBS)
+majik_demo_LDADD = -lplibjs -lplibssg -lplibsg -lplibul $(GLUT_LIBS) $(OGL_LIBS)
 
 EXTRA_DIST = majik_demo.dsp
 

Index: majik_demo.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/ssg/majik/majik_demo.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- majik_demo.cxx	30 Aug 2002 13:07:32 -0000	1.5
+++ majik_demo.cxx	1 Sep 2002 01:11:00 -0000	1.6
@@ -158,6 +158,8 @@
   fake_argv[1] = "Majik Terrain Demo - by Steve Baker" ;
   fake_argv[2] = NULL ;
 
+  jsInit () ;
+
   js = new jsJoystick ( 0 ) ;
 
   if ( js -> notWorking () || js -> getNumAxes () < 2 )