[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gfx Makefile rules.mk
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] gzz/gfx Makefile rules.mk |
Date: |
Wed, 02 Oct 2002 07:50:50 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 02/10/02 07:50:50
Modified files:
gfx : Makefile rules.mk
Log message:
3.1, use make var if changing
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/Makefile.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/rules.mk.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
Patches:
Index: gzz/gfx/Makefile
diff -c gzz/gfx/Makefile:1.14 gzz/gfx/Makefile:1.15
*** gzz/gfx/Makefile:1.14 Tue Oct 1 05:15:01 2002
--- gzz/gfx/Makefile Wed Oct 2 07:50:50 2002
***************
*** 10,15 ****
--- 10,16 ----
JNIOBJS=jni/GzzGL-jni.o jni/paper-jni.o libcallgl/callgl.o libcolor/spaces.o
libmosaic/Mosaic.o libos/Os-GLX.o libpaper/Paper.o librenderables/Renderables.o
libtext/Text.o libtexture/Texture.o libtexture/Texture_pipetexture.o
libutil/buildmipmaps.o libutil/perlin.o libglwrapper/GL_wrapper.o
libcoords/Coords.o libutil/Debug.o
+ include rules.mk
all: subdirs libGZZGL.so
***************
*** 25,31 ****
cd callgl && make
libGZZGL.so: $(JNIOBJS)
! gcc-3.0 -rdynamic -fpic -o libGZZGL.so $(SHARED) $(CXXFLAGS) $(JNIOBJS)
$(LIBS)
clean:
rm -f `find -iname *.o`
--- 26,32 ----
cd callgl && make
libGZZGL.so: $(JNIOBJS)
! $(CXXLINK) -rdynamic -fpic -o libGZZGL.so $(SHARED) $(CXXFLAGS)
$(JNIOBJS) $(LIBS)
clean:
rm -f `find -iname *.o`
Index: gzz/gfx/rules.mk
diff -c gzz/gfx/rules.mk:1.10 gzz/gfx/rules.mk:1.11
*** gzz/gfx/rules.mk:1.10 Wed Oct 2 06:54:21 2002
--- gzz/gfx/rules.mk Wed Oct 2 07:50:50 2002
***************
*** 3,12 ****
LIBS = -lfreetype -lGL -lGLU `gdk-pixbuf-config --libs` -lstdc++
# CXX=libtool --mode=compile g++-3.0
# CXXLINK=libtool --mode=link gcc-3.0
! CXX=g++-3.0
! CXXLINK=gcc-3.0
! #CXX=g++-3.1
! #CXXLINK=gcc-3.1
JNIINC=-I${JAVAHOME}/include -I${JAVAHOME}/include/linux -I../../../lava/gfx
--- 3,13 ----
LIBS = -lfreetype -lGL -lGLU `gdk-pixbuf-config --libs` -lstdc++
# CXX=libtool --mode=compile g++-3.0
# CXXLINK=libtool --mode=link gcc-3.0
!
! GCCVER=3.1
!
! CXX=g++-$(GCCVER)
! CXXLINK=gcc-$(GCCVER)
JNIINC=-I${JAVAHOME}/include -I${JAVAHOME}/include/linux -I../../../lava/gfx
***************
*** 16,23 ****
# Choose architecture
ARCH=-march=pentium4 -mfpmath=sse -msse2
! # OPTIMIZE = -O3 -ffast-math $(ARCH)
! OPTIMIZE = -O0
#NVIDIAH = /usr/lib/opengl/nvidia/include
NVIDIAH = /usr/share/doc/nvidia-glx-dev/include
--- 17,24 ----
# Choose architecture
ARCH=-march=pentium4 -mfpmath=sse -msse2
! OPTIMIZE = -O3 -ffast-math $(ARCH) -fomit-frame-pointer
! # OPTIMIZE = -O0
#NVIDIAH = /usr/lib/opengl/nvidia/include
NVIDIAH = /usr/share/doc/nvidia-glx-dev/include
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz/gfx Makefile rules.mk,
Tuomas J. Lukka <=