Skip to content

Commit 3887792

Browse files
SpliFFSpliFF
committed
fixed hundreds of compiler warners (mostly signed - unsigned comparisons)
updated TODO list
1 parent ebbdc4c commit 3887792

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+329
-351
lines changed

‎data/buttons/camera.gif

-1.05 KB
Binary file not shown.

‎data/buttons/color.gif

-1.57 KB
Binary file not shown.

‎data/buttons/curved_polygon.ico

-2.19 KB
Binary file not shown.

‎data/buttons/curvedpoly.png

-924 Bytes
Binary file not shown.

‎data/buttons/flip_polygon1.ico

-2.19 KB
Binary file not shown.

‎data/buttons/flip_polygon2.ico

-2.19 KB
Binary file not shown.

‎data/buttons/flip_polygon3.ico

-2.19 KB
Binary file not shown.

‎data/buttons/move.gif

-1.1 KB
Binary file not shown.

‎data/buttons/move_origin.ico

-2.19 KB
Binary file not shown.

‎data/buttons/originmove.png

-1.39 KB
Binary file not shown.

‎data/buttons/polyflip.gif

-1017 Bytes
Binary file not shown.

‎data/buttons/polyflip.png

-916 Bytes
Binary file not shown.

‎data/buttons/rotate.gif

-1.1 KB
Binary file not shown.

‎data/buttons/rotate_3do.ico

-2.19 KB
Binary file not shown.

‎data/buttons/rotatetex.png

-1.52 KB
Binary file not shown.

‎data/buttons/scale.gif

-1.35 KB
Binary file not shown.

‎data/buttons/test.gif

-1.05 KB
Binary file not shown.

‎data/buttons/texture.gif

-1.17 KB
Binary file not shown.

‎data/data.ups

-14.2 KB
Binary file not shown.

‎data/palette.pal

100644100755
File mode changed.

‎data/skybox.dds

100644100755
File mode changed.

‎data/texgroups.cfg

Whitespace-only changes.

‎data/views.cfg

100644100755
File mode changed.

‎readme.txt

100644100755
+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
January 31, 2010 [SpliFF]
2+
Replaced LuaJIT with Lua as its platform support (esp 64-bit) is limited
3+
Upgraded lib3ds and fltk2 to fix build issues on x86_64
4+
Resource loading from ZIP (data.ups) seems broken. Changed to flat files.
5+
16
March 28, 2009 [Kloot]
27
quick compilation guide:
38
src/fltk2 configure && make && make install

‎src/fltk2/config.log

+4-3
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ configure:7197: $? = 0
444444
configure:7214: result: yes
445445
configure:7235: checking for strlcat
446446
configure:7291: gcc -o conftest conftest.c >&5
447-
/tmp/ccePS1sH.o: In function `main':
447+
/tmp/ccm4Wen3.o: In function `main':
448448
conftest.c:(.text+0xa): undefined reference to `strlcat'
449449
collect2: ld returned 1 exit status
450450
configure:7297: $? = 1
@@ -524,7 +524,7 @@ configure: failed program was:
524524
configure:7314: result: no
525525
configure:7323: checking for strlcpy
526526
configure:7379: gcc -o conftest conftest.c >&5
527-
/tmp/ccCi5xeT.o: In function `main':
527+
/tmp/ccUjBuyf.o: In function `main':
528528
conftest.c:(.text+0xa): undefined reference to `strlcpy'
529529
collect2: ld returned 1 exit status
530530
configure:7385: $? = 1
@@ -605,7 +605,7 @@ configure:7402: result: no
605605
configure:7412: checking for library containing pow
606606
configure:7453: gcc -o conftest conftest.c >&5
607607
conftest.c:42: warning: conflicting types for built-in function 'pow'
608-
/tmp/ccSZyTO6.o: In function `main':
608+
/tmp/ccodewdr.o: In function `main':
609609
conftest.c:(.text+0xa): undefined reference to `pow'
610610
collect2: ld returned 1 exit status
611611
configure:7459: $? = 1
@@ -1087,6 +1087,7 @@ config.status:647: creating fltk.list
10871087
config.status:778: WARNING: fltk.list.in seems to ignore the --datarootdir setting
10881088
config.status:647: creating fltk2-config
10891089
config.status:647: creating config.h
1090+
config.status:905: config.h is unchanged
10901091

10911092
## ---------------- ##
10921093
## Cache variables. ##

‎src/fltk2/config.status

+1-1
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ Copyright (C) 2006 Free Software Foundation, Inc.
337337
This config.status script is free software; the Free Software Foundation
338338
gives unlimited permission to copy, distribute and modify it."
339339

340-
ac_pwd='/mnt/work/workspace/upspring/build/src/fltk2'
340+
ac_pwd='/mnt/work/workspace/upspring/testing/src/fltk2'
341341
srcdir='.'
342342
# If no file are specified by the user, then we need to provide default
343343
# value. By we need to know if files were specified by the user.

‎src/fltk2/fltk/ScrollGroup.h

100644100755
+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class FL_API ScrollGroup : public Group {
5959
Scrollbar scrollbar;
6060
Scrollbar hscrollbar;
6161

62-
void enable_drag_scroll( bool enable ) { enable_drag_scroll_ = true; }
62+
void enable_drag_scroll( bool /*enable*/ ) { enable_drag_scroll_ = true; }
6363

6464
virtual int handle(int);
6565
virtual void layout();

‎src/fltk2/fltk/TabGroup.h

100644100755
+3-3
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ class FL_API TabGroupPager {
4848
/* Pager template methods definition */
4949

5050
/*! this method must update the tab positions and width array, returns the selected tab */
51-
virtual int update_positions(TabGroup* g, int numchildren, int& selected,
52-
int& cumulated_width, int& available_width , int* tab_pos, int* tab_width) { return selected;}
51+
virtual int update_positions(TabGroup* /*g*/, int /*numchildren*/, int& selected,
52+
int& /*cumulated_width*/, int& /*available_width*/, int* /*tab_pos*/, int* /*tab_width*/) { return selected;}
5353
/*! draw the tabs for this custom pager, return false means no custom draw is made */
54-
virtual bool draw_tabs(TabGroup* g, int selected, int* tab_pos, int* tab_width) { return false;}
54+
virtual bool draw_tabs(TabGroup* /*g*/, int /*selected*/, int* /*tab_pos*/, int* /*tab_width*/) { return false;}
5555
/*! determine and return the index of the child group at the corresponding pos */
5656
virtual int which(TabGroup* g, int m_x,int m_y)=0;
5757
/*! virtual copy from a prototype */

‎src/lib3ds/Makefile

+11-11
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ DIST_ARCHIVES = $(distdir).tar.gz
8484
GZIP_ENV = --best
8585
distuninstallcheck_listfiles = find . -type f -print
8686
distcleancheck_listfiles = find . -type f -print
87-
ACLOCAL = ${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run aclocal-1.10
88-
AMTAR = ${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run tar
87+
ACLOCAL = ${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run aclocal-1.10
88+
AMTAR = ${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run tar
8989
AR = ar
90-
AUTOCONF = ${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run autoconf
91-
AUTOHEADER = ${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run autoheader
92-
AUTOMAKE = ${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run automake-1.10
90+
AUTOCONF = ${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run autoconf
91+
AUTOHEADER = ${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run autoheader
92+
AUTOMAKE = ${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run automake-1.10
9393
AWK = gawk
9494
CC = gcc
9595
CCDEPMODE = depmode=gcc3
@@ -128,7 +128,7 @@ LIBS =
128128
LIBTOOL = $(SHELL) $(top_builddir)/libtool
129129
LN_S = ln -s
130130
LTLIBOBJS =
131-
MAKEINFO = ${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run makeinfo
131+
MAKEINFO = ${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run makeinfo
132132
MKDIR_P = /bin/mkdir -p
133133
NMEDIT =
134134
OBJEXT = o
@@ -145,10 +145,10 @@ SET_MAKE =
145145
SHELL = /bin/sh
146146
STRIP = strip
147147
VERSION = 2.0.0
148-
abs_builddir = /mnt/work/workspace/upspring/build/src/lib3ds-20080909
149-
abs_srcdir = /mnt/work/workspace/upspring/build/src/lib3ds-20080909
150-
abs_top_builddir = /mnt/work/workspace/upspring/build/src/lib3ds-20080909
151-
abs_top_srcdir = /mnt/work/workspace/upspring/build/src/lib3ds-20080909
148+
abs_builddir = /mnt/work/workspace/upspring/testing/src/lib3ds
149+
abs_srcdir = /mnt/work/workspace/upspring/testing/src/lib3ds
150+
abs_top_builddir = /mnt/work/workspace/upspring/testing/src/lib3ds
151+
abs_top_srcdir = /mnt/work/workspace/upspring/testing/src/lib3ds
152152
ac_ct_CC = gcc
153153
ac_ct_CXX = g++
154154
ac_ct_F77 = gfortran
@@ -177,7 +177,7 @@ host_vendor = unknown
177177
htmldir = ${docdir}
178178
includedir = ${prefix}/include
179179
infodir = ${datarootdir}/info
180-
install_sh = $(SHELL) /mnt/work/workspace/upspring/build/src/lib3ds-20080909/install-sh
180+
install_sh = $(SHELL) /mnt/work/workspace/upspring/testing/src/lib3ds/install-sh
181181
libdir = ${exec_prefix}/lib
182182
libexecdir = ${exec_prefix}/libexec
183183
localedir = ${datarootdir}/locale

‎src/lib3ds/config.log

+8-7
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,7 @@ config.status:675: creating examples/3ds2obj/Makefile
502502
config.status:675: creating examples/3dsdump/Makefile
503503
config.status:675: creating examples/cube/Makefile
504504
config.status:675: creating config.h
505+
config.status:902: config.h is unchanged
505506
config.status:949: executing depfiles commands
506507
config.status:949: executing default commands
507508

@@ -614,15 +615,15 @@ lt_lt_cv_sys_global_symbol_to_cdecl='"sed -n -e '\''s/^. .* \\(.*\\)\$/extern in
614615
## Output variables. ##
615616
## ----------------- ##
616617

617-
ACLOCAL='${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run aclocal-1.10'
618+
ACLOCAL='${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run aclocal-1.10'
618619
AMDEPBACKSLASH='\'
619620
AMDEP_FALSE='#'
620621
AMDEP_TRUE=''
621-
AMTAR='${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run tar'
622+
AMTAR='${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run tar'
622623
AR='ar'
623-
AUTOCONF='${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run autoconf'
624-
AUTOHEADER='${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run autoheader'
625-
AUTOMAKE='${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run automake-1.10'
624+
AUTOCONF='${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run autoconf'
625+
AUTOHEADER='${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run autoheader'
626+
AUTOMAKE='${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run automake-1.10'
626627
AWK='gawk'
627628
CC='gcc'
628629
CCDEPMODE='depmode=gcc3'
@@ -660,7 +661,7 @@ LIBS=''
660661
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
661662
LN_S='ln -s'
662663
LTLIBOBJS=''
663-
MAKEINFO='${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run makeinfo'
664+
MAKEINFO='${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run makeinfo'
664665
NMEDIT=''
665666
OBJEXT='o'
666667
PACKAGE='lib3ds'
@@ -708,7 +709,7 @@ host_vendor='unknown'
708709
htmldir='${docdir}'
709710
includedir='${prefix}/include'
710711
infodir='${datarootdir}/info'
711-
install_sh='$(SHELL) /mnt/work/workspace/upspring/build/src/lib3ds-20080909/install-sh'
712+
install_sh='$(SHELL) /mnt/work/workspace/upspring/testing/src/lib3ds/install-sh'
712713
libdir='${exec_prefix}/lib'
713714
libexecdir='${exec_prefix}/libexec'
714715
localedir='${datarootdir}/locale'

‎src/lib3ds/config.status

+8-8
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ Copyright (C) 2006 Free Software Foundation, Inc.
341341
This config.status script is free software; the Free Software Foundation
342342
gives unlimited permission to copy, distribute and modify it."
343343

344-
ac_pwd='/mnt/work/workspace/upspring/build/src/lib3ds-20080909'
344+
ac_pwd='/mnt/work/workspace/upspring/testing/src/lib3ds'
345345
srcdir='.'
346346
INSTALL='/usr/bin/install -c'
347347
MKDIR_P='/bin/mkdir -p'
@@ -550,19 +550,19 @@ s,@am__isrc@,|#_!!_#|,g
550550
s,@CYGPATH_W@,|#_!!_#|echo,g
551551
s,@PACKAGE@,|#_!!_#|lib3ds,g
552552
s,@VERSION@,|#_!!_#|2.0.0,g
553-
s,@ACLOCAL@,|#_!!_#|${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run aclocal-1.10,g
554-
s,@AUTOCONF@,|#_!!_#|${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run autoconf,g
555-
s,@AUTOMAKE@,|#_!!_#|${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run automake-1.10,g
556-
s,@AUTOHEADER@,|#_!!_#|${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run autoheader,g
557-
s,@MAKEINFO@,|#_!!_#|${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run makeinfo,g
558-
s,@install_sh@,|#_!!_#|$(SHELL) /mnt/work/workspace/upspring/build/src/lib3ds-20080909/install-sh,g
553+
s,@ACLOCAL@,|#_!!_#|${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run aclocal-1.10,g
554+
s,@AUTOCONF@,|#_!!_#|${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run autoconf,g
555+
s,@AUTOMAKE@,|#_!!_#|${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run automake-1.10,g
556+
s,@AUTOHEADER@,|#_!!_#|${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run autoheader,g
557+
s,@MAKEINFO@,|#_!!_#|${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run makeinfo,g
558+
s,@install_sh@,|#_!!_#|$(SHELL) /mnt/work/workspace/upspring/testing/src/lib3ds/install-sh,g
559559
s,@STRIP@,|#_!!_#|strip,g
560560
s,@INSTALL_STRIP_PROGRAM@,|#_!!_#|$(install_sh) -c -s,g
561561
s,@mkdir_p@,|#_!!_#|/bin/mkdir -p,g
562562
s,@AWK@,|#_!!_#|gawk,g
563563
s,@SET_MAKE@,|#_!!_#|,g
564564
s,@am__leading_dot@,|#_!!_#|.,g
565-
s,@AMTAR@,|#_!!_#|${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run tar,g
565+
s,@AMTAR@,|#_!!_#|${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run tar,g
566566
s,@am__tar@,|#_!!_#|${AMTAR} chof - "$$tardir",g
567567
s,@am__untar@,|#_!!_#|${AMTAR} xf -,g
568568
s,@CC@,|#_!!_#|gcc,g

‎src/lib3ds/examples/3ds2obj/Makefile

+11-11
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ DIST_SOURCES = $(3ds2obj_SOURCES)
6666
ETAGS = etags
6767
CTAGS = ctags
6868
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
69-
ACLOCAL = ${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run aclocal-1.10
70-
AMTAR = ${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run tar
69+
ACLOCAL = ${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run aclocal-1.10
70+
AMTAR = ${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run tar
7171
AR = ar
72-
AUTOCONF = ${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run autoconf
73-
AUTOHEADER = ${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run autoheader
74-
AUTOMAKE = ${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run automake-1.10
72+
AUTOCONF = ${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run autoconf
73+
AUTOHEADER = ${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run autoheader
74+
AUTOMAKE = ${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run automake-1.10
7575
AWK = gawk
7676
CC = gcc
7777
CCDEPMODE = depmode=gcc3
@@ -110,7 +110,7 @@ LIBS =
110110
LIBTOOL = $(SHELL) $(top_builddir)/libtool
111111
LN_S = ln -s
112112
LTLIBOBJS =
113-
MAKEINFO = ${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run makeinfo
113+
MAKEINFO = ${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run makeinfo
114114
MKDIR_P = /bin/mkdir -p
115115
NMEDIT =
116116
OBJEXT = o
@@ -127,10 +127,10 @@ SET_MAKE =
127127
SHELL = /bin/sh
128128
STRIP = strip
129129
VERSION = 2.0.0
130-
abs_builddir = /mnt/work/workspace/upspring/build/src/lib3ds-20080909/examples/3ds2obj
131-
abs_srcdir = /mnt/work/workspace/upspring/build/src/lib3ds-20080909/examples/3ds2obj
132-
abs_top_builddir = /mnt/work/workspace/upspring/build/src/lib3ds-20080909
133-
abs_top_srcdir = /mnt/work/workspace/upspring/build/src/lib3ds-20080909
130+
abs_builddir = /mnt/work/workspace/upspring/testing/src/lib3ds/examples/3ds2obj
131+
abs_srcdir = /mnt/work/workspace/upspring/testing/src/lib3ds/examples/3ds2obj
132+
abs_top_builddir = /mnt/work/workspace/upspring/testing/src/lib3ds
133+
abs_top_srcdir = /mnt/work/workspace/upspring/testing/src/lib3ds
134134
ac_ct_CC = gcc
135135
ac_ct_CXX = g++
136136
ac_ct_F77 = gfortran
@@ -159,7 +159,7 @@ host_vendor = unknown
159159
htmldir = ${docdir}
160160
includedir = ${prefix}/include
161161
infodir = ${datarootdir}/info
162-
install_sh = $(SHELL) /mnt/work/workspace/upspring/build/src/lib3ds-20080909/install-sh
162+
install_sh = $(SHELL) /mnt/work/workspace/upspring/testing/src/lib3ds/install-sh
163163
libdir = ${exec_prefix}/lib
164164
libexecdir = ${exec_prefix}/libexec
165165
localedir = ${datarootdir}/locale

‎src/lib3ds/examples/3dsdump/Makefile

+11-11
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ DIST_SOURCES = $(3dsdump_SOURCES)
6666
ETAGS = etags
6767
CTAGS = ctags
6868
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
69-
ACLOCAL = ${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run aclocal-1.10
70-
AMTAR = ${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run tar
69+
ACLOCAL = ${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run aclocal-1.10
70+
AMTAR = ${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run tar
7171
AR = ar
72-
AUTOCONF = ${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run autoconf
73-
AUTOHEADER = ${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run autoheader
74-
AUTOMAKE = ${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run automake-1.10
72+
AUTOCONF = ${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run autoconf
73+
AUTOHEADER = ${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run autoheader
74+
AUTOMAKE = ${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run automake-1.10
7575
AWK = gawk
7676
CC = gcc
7777
CCDEPMODE = depmode=gcc3
@@ -110,7 +110,7 @@ LIBS =
110110
LIBTOOL = $(SHELL) $(top_builddir)/libtool
111111
LN_S = ln -s
112112
LTLIBOBJS =
113-
MAKEINFO = ${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run makeinfo
113+
MAKEINFO = ${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run makeinfo
114114
MKDIR_P = /bin/mkdir -p
115115
NMEDIT =
116116
OBJEXT = o
@@ -127,10 +127,10 @@ SET_MAKE =
127127
SHELL = /bin/sh
128128
STRIP = strip
129129
VERSION = 2.0.0
130-
abs_builddir = /mnt/work/workspace/upspring/build/src/lib3ds-20080909/examples/3dsdump
131-
abs_srcdir = /mnt/work/workspace/upspring/build/src/lib3ds-20080909/examples/3dsdump
132-
abs_top_builddir = /mnt/work/workspace/upspring/build/src/lib3ds-20080909
133-
abs_top_srcdir = /mnt/work/workspace/upspring/build/src/lib3ds-20080909
130+
abs_builddir = /mnt/work/workspace/upspring/testing/src/lib3ds/examples/3dsdump
131+
abs_srcdir = /mnt/work/workspace/upspring/testing/src/lib3ds/examples/3dsdump
132+
abs_top_builddir = /mnt/work/workspace/upspring/testing/src/lib3ds
133+
abs_top_srcdir = /mnt/work/workspace/upspring/testing/src/lib3ds
134134
ac_ct_CC = gcc
135135
ac_ct_CXX = g++
136136
ac_ct_F77 = gfortran
@@ -159,7 +159,7 @@ host_vendor = unknown
159159
htmldir = ${docdir}
160160
includedir = ${prefix}/include
161161
infodir = ${datarootdir}/info
162-
install_sh = $(SHELL) /mnt/work/workspace/upspring/build/src/lib3ds-20080909/install-sh
162+
install_sh = $(SHELL) /mnt/work/workspace/upspring/testing/src/lib3ds/install-sh
163163
libdir = ${exec_prefix}/lib
164164
libexecdir = ${exec_prefix}/libexec
165165
localedir = ${datarootdir}/locale

‎src/lib3ds/examples/Makefile

+11-11
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ ETAGS = etags
5555
CTAGS = ctags
5656
DIST_SUBDIRS = $(SUBDIRS)
5757
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
58-
ACLOCAL = ${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run aclocal-1.10
59-
AMTAR = ${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run tar
58+
ACLOCAL = ${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run aclocal-1.10
59+
AMTAR = ${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run tar
6060
AR = ar
61-
AUTOCONF = ${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run autoconf
62-
AUTOHEADER = ${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run autoheader
63-
AUTOMAKE = ${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run automake-1.10
61+
AUTOCONF = ${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run autoconf
62+
AUTOHEADER = ${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run autoheader
63+
AUTOMAKE = ${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run automake-1.10
6464
AWK = gawk
6565
CC = gcc
6666
CCDEPMODE = depmode=gcc3
@@ -99,7 +99,7 @@ LIBS =
9999
LIBTOOL = $(SHELL) $(top_builddir)/libtool
100100
LN_S = ln -s
101101
LTLIBOBJS =
102-
MAKEINFO = ${SHELL} /mnt/work/workspace/upspring/build/src/lib3ds-20080909/missing --run makeinfo
102+
MAKEINFO = ${SHELL} /mnt/work/workspace/upspring/testing/src/lib3ds/missing --run makeinfo
103103
MKDIR_P = /bin/mkdir -p
104104
NMEDIT =
105105
OBJEXT = o
@@ -116,10 +116,10 @@ SET_MAKE =
116116
SHELL = /bin/sh
117117
STRIP = strip
118118
VERSION = 2.0.0
119-
abs_builddir = /mnt/work/workspace/upspring/build/src/lib3ds-20080909/examples
120-
abs_srcdir = /mnt/work/workspace/upspring/build/src/lib3ds-20080909/examples
121-
abs_top_builddir = /mnt/work/workspace/upspring/build/src/lib3ds-20080909
122-
abs_top_srcdir = /mnt/work/workspace/upspring/build/src/lib3ds-20080909
119+
abs_builddir = /mnt/work/workspace/upspring/testing/src/lib3ds/examples
120+
abs_srcdir = /mnt/work/workspace/upspring/testing/src/lib3ds/examples
121+
abs_top_builddir = /mnt/work/workspace/upspring/testing/src/lib3ds
122+
abs_top_srcdir = /mnt/work/workspace/upspring/testing/src/lib3ds
123123
ac_ct_CC = gcc
124124
ac_ct_CXX = g++
125125
ac_ct_F77 = gfortran
@@ -148,7 +148,7 @@ host_vendor = unknown
148148
htmldir = ${docdir}
149149
includedir = ${prefix}/include
150150
infodir = ${datarootdir}/info
151-
install_sh = $(SHELL) /mnt/work/workspace/upspring/build/src/lib3ds-20080909/install-sh
151+
install_sh = $(SHELL) /mnt/work/workspace/upspring/testing/src/lib3ds/install-sh
152152
libdir = ${exec_prefix}/lib
153153
libexecdir = ${exec_prefix}/libexec
154154
localedir = ${datarootdir}/locale

0 commit comments

Comments
 (0)