* [gentoo-commits] gentoo-x86 commit in games-simulation/crashtest/files: crashtest-1.1-gentoo.patch
@ 2009-10-14 5:48 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; 3+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2009-10-14 5:48 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 09/10/14 05:48:32
Added: crashtest-1.1-gentoo.patch
Log:
version bump
(Portage version: 2.1.6.13/cvs/Linux i686)
Revision Changes Path
1.1 games-simulation/crashtest/files/crashtest-1.1-gentoo.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch?rev=1.1&content-type=text/plain
Index: crashtest-1.1-gentoo.patch
===================================================================
diff -ru crashtest-1.1.orig/src-crashtest/Makefile crashtest-1.1/src-crashtest/Makefile
--- crashtest-1.1.orig/src-crashtest/Makefile 2009-02-15 17:11:31.000000000 -0500
+++ crashtest-1.1/src-crashtest/Makefile 2009-10-14 01:00:13.900627555 -0400
@@ -1,34 +1,11 @@
-# EDIT THESE SETTINGS
-
-PLIBPREFIX=/usr
-ODEPREFIX=/usr
-CXX=g++
-
-#PLIBPREFIX=$(HOME)
-#ODEPREFIX=$(HOME)
-#CXX=g++-4.0
-
-# END OF CUSTOM SETTINGS
-
-CXXFLAGS=\
- -I$(ODEPREFIX)/include \
- -I$(PLIBPREFIX)/include \
- -I../src-common \
- -O2 -g -Wall
-
-LFLAGS=\
- -L$(PLIBPREFIX)/lib \
- -L/usr/X11R6/lib
-
OBJS=staticworldobject.o crashtest.o dynamicobject.o cartobject.o
-LIBS= $(ODEPREFIX)/lib/libode.a -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul -lGLU -lGL `fltk-config --use-gl --use-images --ldflags`
-
+LIBS= `ode-config --libs` -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul -lGLU -lGL -lasound `fltk-config --use-gl --use-images --ldflags` -lglut
all: crashtest
crashtest: $(OBJS)
- $(CXX) -o crashtest $(OBJS) $(LFLAGS) $(LIBS)
+ $(CXX) -o crashtest $(OBJS) $(LDFLAGS) $(LIBS)
staticworldobject.o: ../src-common/staticworldobject.cxx ../src-common/staticworldobject.h ../src-common/worldobject.h
$(CXX) -c $(CXXFLAGS) ../src-common/staticworldobject.cxx
@@ -37,10 +14,10 @@
$(CXX) -c $(CXXFLAGS) ../src-common/dynamicobject.cxx
cartobject.o: cartobject.cxx cartobject.h
- $(CXX) -c $(CXXFLAGS) cartobject.cxx
+ $(CXX) -c $(CXXFLAGS) -I../src-common cartobject.cxx
crashtest.o: crashtest.cxx crashworld.h ../src-common/modelmap.h cartobject.h bipedobject.h ../src-common/brickwall.h ../src-common/stereocontext.h ../src-common/usercam.h
- $(CXX) -c $(CXXFLAGS) crashtest.cxx
+ $(CXX) -c $(CXXFLAGS) -I../src-common crashtest.cxx
@@ -48,13 +25,13 @@
PLODE_DATADIR=`pwd` ./crashtest
-GAMEDIR=$(DESTDIR)/usr/share/games/crashtest
+GAMEDIR=$(DESTDIR)@GENTOO_DATADIR@
install: crashtest
# Directories
- mkdir -p $(DESTDIR)/usr/games/
+ mkdir -p $(DESTDIR)@GENTOO_BINDIR@
mkdir -p $(GAMEDIR)/models/
# Binary
- install crashtest $(DESTDIR)/usr/games/crashtest
+ install crashtest $(DESTDIR)@GENTOO_BINDIR@
# Models
install -m 644 models/testground.3ds $(GAMEDIR)/models/testground.3ds
install -m 644 models/biped_torso.3ds $(GAMEDIR)/models/biped_torso.3ds
diff -ru crashtest-1.1.orig/src-crashtest/crashtest.cxx crashtest-1.1/src-crashtest/crashtest.cxx
--- crashtest-1.1.orig/src-crashtest/crashtest.cxx 2009-02-15 17:08:24.000000000 -0500
+++ crashtest-1.1/src-crashtest/crashtest.cxx 2009-10-14 01:01:25.822753522 -0400
@@ -15,14 +15,14 @@
#include <GL/glu.h>
#endif
-#include <FL/Fl.H>
-#include <FL/Fl_Box.H>
-#include <FL/Fl_Button.H>
-#include <FL/Fl_Check_Button.H>
-#include <FL/Fl_Chart.H>
-#include <FL/Fl_Value_Slider.H>
-#include <FL/Fl_Gl_Window.H>
-#include <FL/fl_draw.H>
+#include <fltk-1.1/FL/Fl.H>
+#include <fltk-1.1/FL/Fl_Box.H>
+#include <fltk-1.1/FL/Fl_Button.H>
+#include <fltk-1.1/FL/Fl_Check_Button.H>
+#include <fltk-1.1/FL/Fl_Chart.H>
+#include <fltk-1.1/FL/Fl_Value_Slider.H>
+#include <fltk-1.1/FL/Fl_Gl_Window.H>
+#include <fltk-1.1/FL/fl_draw.H>
#include <plib/ssg.h>
#include <plib/ul.h>
@@ -615,13 +615,7 @@
int main(int argc, char *argv[])
{
- char *bindirname = dirname(argv[0]);
- if (!strcmp(bindirname,"."))
- dirprefix="/usr/share/games/crashtest";
- else
- {
- dirprefix = dirname(bindirname) + std::string("/share/games/crashtest");
- }
+ dirprefix="@GENTOO_DATADIR@";
if (getenv("PLODE_DATADIR"))
dirprefix = getenv("PLODE_DATADIR");
modelmap = new ModelMap(dirprefix);
@@ -745,4 +739,3 @@
Fl::add_idle(idle, &simwin);
Fl::run();
}
-
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in games-simulation/crashtest/files: crashtest-1.1-gentoo.patch
@ 2011-04-05 9:51 Alfredo Tupone (tupone)
0 siblings, 0 replies; 3+ messages in thread
From: Alfredo Tupone (tupone) @ 2011-04-05 9:51 UTC (permalink / raw
To: gentoo-commits
tupone 11/04/05 09:51:26
Modified: crashtest-1.1-gentoo.patch
Log:
Fix slot change in x11-libs/fltk. Bug #361833
(Portage version: 2.1.9.42/cvs/Linux x86_64)
Revision Changes Path
1.2 games-simulation/crashtest/files/crashtest-1.1-gentoo.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch?r1=1.1&r2=1.2
Index: crashtest-1.1-gentoo.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- crashtest-1.1-gentoo.patch 14 Oct 2009 05:48:32 -0000 1.1
+++ crashtest-1.1-gentoo.patch 5 Apr 2011 09:51:26 -0000 1.2
@@ -1,7 +1,7 @@
diff -ru crashtest-1.1.orig/src-crashtest/Makefile crashtest-1.1/src-crashtest/Makefile
--- crashtest-1.1.orig/src-crashtest/Makefile 2009-02-15 17:11:31.000000000 -0500
+++ crashtest-1.1/src-crashtest/Makefile 2009-10-14 01:00:13.900627555 -0400
-@@ -1,34 +1,11 @@
+@@ -1,34 +1,12 @@
-# EDIT THESE SETTINGS
-
-PLIBPREFIX=/usr
@@ -25,6 +25,7 @@
- -L/usr/X11R6/lib
-
OBJS=staticworldobject.o crashtest.o dynamicobject.o cartobject.o
++CXXFLAGS+=-I `fltk-config --includedir`
-LIBS= $(ODEPREFIX)/lib/libode.a -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul -lGLU -lGL `fltk-config --use-gl --use-images --ldflags`
-
@@ -71,29 +72,6 @@
diff -ru crashtest-1.1.orig/src-crashtest/crashtest.cxx crashtest-1.1/src-crashtest/crashtest.cxx
--- crashtest-1.1.orig/src-crashtest/crashtest.cxx 2009-02-15 17:08:24.000000000 -0500
+++ crashtest-1.1/src-crashtest/crashtest.cxx 2009-10-14 01:01:25.822753522 -0400
-@@ -15,14 +15,14 @@
- #include <GL/glu.h>
- #endif
-
--#include <FL/Fl.H>
--#include <FL/Fl_Box.H>
--#include <FL/Fl_Button.H>
--#include <FL/Fl_Check_Button.H>
--#include <FL/Fl_Chart.H>
--#include <FL/Fl_Value_Slider.H>
--#include <FL/Fl_Gl_Window.H>
--#include <FL/fl_draw.H>
-+#include <fltk-1.1/FL/Fl.H>
-+#include <fltk-1.1/FL/Fl_Box.H>
-+#include <fltk-1.1/FL/Fl_Button.H>
-+#include <fltk-1.1/FL/Fl_Check_Button.H>
-+#include <fltk-1.1/FL/Fl_Chart.H>
-+#include <fltk-1.1/FL/Fl_Value_Slider.H>
-+#include <fltk-1.1/FL/Fl_Gl_Window.H>
-+#include <fltk-1.1/FL/fl_draw.H>
-
- #include <plib/ssg.h>
- #include <plib/ul.h>
@@ -615,13 +615,7 @@
int main(int argc, char *argv[])
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in games-simulation/crashtest/files: crashtest-1.1-gentoo.patch
@ 2012-05-17 6:18 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; 3+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2012-05-17 6:18 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 12/05/17 06:18:07
Modified: crashtest-1.1-gentoo.patch
Log:
continue to work with ode-0.12
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Revision Changes Path
1.3 games-simulation/crashtest/files/crashtest-1.1-gentoo.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch?r1=1.2&r2=1.3
Index: crashtest-1.1-gentoo.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- crashtest-1.1-gentoo.patch 5 Apr 2011 09:51:26 -0000 1.2
+++ crashtest-1.1-gentoo.patch 17 May 2012 06:18:07 -0000 1.3
@@ -25,7 +25,7 @@
- -L/usr/X11R6/lib
-
OBJS=staticworldobject.o crashtest.o dynamicobject.o cartobject.o
-+CXXFLAGS+=-I `fltk-config --includedir`
++CXXFLAGS+=-I `fltk-config --includedir` `ode-config --cflags`
-LIBS= $(ODEPREFIX)/lib/libode.a -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul -lGLU -lGL `fltk-config --use-gl --use-images --ldflags`
-
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-05-17 6:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-17 6:18 [gentoo-commits] gentoo-x86 commit in games-simulation/crashtest/files: crashtest-1.1-gentoo.patch Michael Sterrett (mr_bones_)
-- strict thread matches above, loose matches on Subject: below --
2011-04-05 9:51 Alfredo Tupone (tupone)
2009-10-14 5:48 Michael Sterrett (mr_bones_)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox