[OpenGL# CVS] csdOpenGL/samples Makefile,1.9,1.10 Makefile.gtk,1.8,1.9

[Tim R. <ti...@us...>]

Update of /cvsroot/csdopenglnet/csdOpenGL/samples
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22618/samples

Modified Files:
	Makefile Makefile.gtk 
Log Message:
Gtk support is now optional


Index: Makefile.gtk
===================================================================
RCS file: /cvsroot/csdopenglnet/csdOpenGL/samples/Makefile.gtk,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile.gtk	11 Sep 2004 08:39:28 -0000	1.8
--- Makefile.gtk	11 Sep 2004 09:07:14 -0000	1.9
***************
*** 5,8 ****
--- 5,10 ----
  LIBS_CSD=csDragons.OpenGL.dll csDragons.Math.dll csDragons.OpenGL.Tools.dll csDragons.OpenGL.Mono.dll
  LIBS=glib-sharp.dll gdk-sharp.dll gtk-sharp.dll $(LIBS_CSD)
+ DEMOS=gtkTriangle.exe gtkGears.exe gtkTexture.exe gtkFrame.exe gtkAdvanced.exe
+ LIBCONFIGS=$(foreach lib,$(LIBS_CSD),$(lib).config)
  
  PACKAGE=csDragons
***************
*** 11,31 ****
  MCS=$(CC) $(OPTS) $(LIBOPTS) -r:System.Drawing -lib:/usr/lib/mono/gtk-sharp -lib:../GL -lib:../tools -lib:../math -lib:../platform/mono
  
! all: gtkTriangle.exe gtkGears.exe gtkTexture.exe gtkFrame.exe gtkAdvanced.exe $(LIBS_CSD)
  
  csDragons.OpenGL.dll: 
! 	ln -sf ../GL/csDragons.OpenGL.dll* .        
! 
! csDragons.OpenGL.Mono.dll: 
! 	ln -sf ../platform/mono/csDragons.OpenGL.Mono.dll* .        
                  
- csDragons.OpenGL.Windows.dll: 
- 	ln -sf ../platform/windows/csDragons.OpenGL.Mono.dll* .        
- 
  csDragons.Math.dll: 
! 	ln -sf ../math/csDragons.Math.dll* .        
  
  csDragons.OpenGL.Tools.dll: 
! 	ln -sf ../tools/csDragons.OpenGL.Tools.dll* .        
          
          
  %.exe:%.cs 
--- 13,37 ----
  MCS=$(CC) $(OPTS) $(LIBOPTS) -r:System.Drawing -lib:/usr/lib/mono/gtk-sharp -lib:../GL -lib:../tools -lib:../math -lib:../platform/mono
  
! all: $(DEMOS) $(LIBS_CSD)
  
  csDragons.OpenGL.dll: 
! 	ln -sf ../GL/csDragons.OpenGL.dll .
! 	ln -sf ../GL/csDragons.OpenGL.dll.config .
                  
  csDragons.Math.dll: 
! 	ln -sf ../math/csDragons.Math.dll .        
! 	ln -sf ../math/csDragons.Math.dll.config .        
  
  csDragons.OpenGL.Tools.dll: 
! 	ln -sf ../tools/csDragons.OpenGL.Tools.dll .        
! 	ln -sf ../tools/csDragons.OpenGL.Tools.dll.config .        
          
+ csDragons.OpenGL.Mono.dll: 
+ 	ln -sf ../tools/csDragons.OpenGL.Mono.dll .        
+ 	ln -sf ../tools/csDragons.OpenGL.Mono.dll.config .        
+ 
+ csDragons.OpenGL.Windows.dll: 
+ 	ln -sf ../tools/csDragons.OpenGL.Windows.dll .        
+ 	ln -sf ../tools/csDragons.OpenGL.Windows.dll.config .        
          
  %.exe:%.cs 
***************
*** 34,40 ****
  
  clean:
! 	rm -f *.exe
! 	rm -f *.dll
! 	rm -f *.so
  	
  .IGNORE:
--- 40,45 ----
  
  clean:
! 	rm -f $(DEMOS)
! 	rm -f $(LIBS_CSD) $(LIBCONFIGS)
  	
  .IGNORE:

Index: Makefile
===================================================================
RCS file: /cvsroot/csdopenglnet/csdOpenGL/samples/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile	11 Sep 2004 08:39:28 -0000	1.9
--- Makefile	11 Sep 2004 09:07:14 -0000	1.10
***************
*** 6,23 ****
  MCS=$(CC) $(OPTS) -lib:/usr/lib/mono/gtk-sharp -lib:../GL -lib:../math -lib:../tools
  PACKAGE=csDragons
  
  LIBOPTS=$(foreach lib,$(LIBS),-r $(lib))
  
! all: triangle.exe texture.exe  gears.exe $(LIBS)
  	$(MAKE) -f Makefile.gtk
  
  csDragons.OpenGL.dll: 
! 	ln -sf ../GL/csDragons.OpenGL.dll* .        
                  
  csDragons.Math.dll: 
! 	ln -sf ../math/csDragons.Math.dll* .        
  
  csDragons.OpenGL.Tools.dll: 
! 	ln -sf ../tools/csDragons.OpenGL.Tools.dll* .        
          
  %.exe:%.cs 
--- 6,30 ----
  MCS=$(CC) $(OPTS) -lib:/usr/lib/mono/gtk-sharp -lib:../GL -lib:../math -lib:../tools
  PACKAGE=csDragons
+ DEMOS=triangle.exe texture.exe  gears.exe
  
+ LIBCONFIGS=$(foreach lib,$(LIBS),$(lib).config)
  LIBOPTS=$(foreach lib,$(LIBS),-r $(lib))
  
! all:  $(LIBS) $(DEMOS)
! ifeq ($(GTK),1)
  	$(MAKE) -f Makefile.gtk
+ endif
  
  csDragons.OpenGL.dll: 
! 	ln -sf ../GL/csDragons.OpenGL.dll .
! 	ln -sf ../GL/csDragons.OpenGL.dll.config .
                  
  csDragons.Math.dll: 
! 	ln -sf ../math/csDragons.Math.dll .        
! 	ln -sf ../math/csDragons.Math.dll.config .        
  
  csDragons.OpenGL.Tools.dll: 
! 	ln -sf ../tools/csDragons.OpenGL.Tools.dll .        
! 	ln -sf ../tools/csDragons.OpenGL.Tools.dll.config .        
          
  %.exe:%.cs 
***************
*** 26,32 ****
  clean:
  	$(MAKE) -f Makefile.gtk clean
! 	rm -f *.exe
! 	rm -f *.dll
! 	rm -f *.so
  	
  .IGNORE:
--- 33,38 ----
  clean:
  	$(MAKE) -f Makefile.gtk clean
! 	rm -f $(DEMOS)
! 	rm -f $(LIBS) $(LIBCONFIGS)
  	
  .IGNORE: