Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
2008-04-03 Øyvind Kolås <pippin@o-hand.com>
Initial svn import of clutter-box2d. * box2d-build-and-install-shared.patch: a patch for box2d's build system making it build a shared library and install a usable header. * clutter-box2d.h: * clutter-box2d.cpp: actual box2d glue group. * clutter-box2d.pc.in: pkg-config file for clutter-box2d * examples/blockbox.c: a small framework for adding more clutter-box2d tests. * autogen.sh: distribution boilerplate stuff, mostly lifted from clutter-cairo with minimal search and replace. * configure.ac: * Makefile.am: * examples/Makefile.am: * AUTHORS: * COPYING: * INSTALL: * README:
- Loading branch information
Øyvind Kolås
committed
Apr 3, 2008
0 parents
commit 7a7a713
Showing
16 changed files
with
2,066 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Øyvind Kolås <pippin@o-hand.com> |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
2008-04-03 Øyvind Kolås <pippin@o-hand.com> | ||
|
||
Initial svn import of clutter-box2d. | ||
|
||
* box2d-build-and-install-shared.patch: a patch for box2d's build | ||
system making it build a shared library and install a usable header. | ||
|
||
* clutter-box2d.h: | ||
* clutter-box2d.cpp: actual box2d glue group. | ||
* clutter-box2d.pc.in: pkg-config file for clutter-box2d | ||
* examples/blockbox.c: a small framework for adding more clutter-box2d | ||
tests. | ||
|
||
* autogen.sh: distribution boilerplate stuff, mostly lifted from | ||
clutter-cairo with minimal search and replace. | ||
* configure.ac: | ||
* Makefile.am: | ||
* examples/Makefile.am: | ||
* AUTHORS: | ||
* COPYING: | ||
* INSTALL: | ||
* README: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,234 @@ | ||
Installation Instructions | ||
************************* | ||
|
||
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, | ||
2006 Free Software Foundation, Inc. | ||
|
||
This file is free documentation; the Free Software Foundation gives | ||
unlimited permission to copy, distribute and modify it. | ||
|
||
Basic Installation | ||
================== | ||
|
||
Briefly, the shell commands `./configure; make; make install' should | ||
configure, build, and install this package. The following | ||
more-detailed instructions are generic; see the `README' file for | ||
instructions specific to this package. | ||
|
||
The `configure' shell script attempts to guess correct values for | ||
various system-dependent variables used during compilation. It uses | ||
those values to create a `Makefile' in each directory of the package. | ||
It may also create one or more `.h' files containing system-dependent | ||
definitions. Finally, it creates a shell script `config.status' that | ||
you can run in the future to recreate the current configuration, and a | ||
file `config.log' containing compiler output (useful mainly for | ||
debugging `configure'). | ||
|
||
It can also use an optional file (typically called `config.cache' | ||
and enabled with `--cache-file=config.cache' or simply `-C') that saves | ||
the results of its tests to speed up reconfiguring. Caching is | ||
disabled by default to prevent problems with accidental use of stale | ||
cache files. | ||
|
||
If you need to do unusual things to compile the package, please try | ||
to figure out how `configure' could check whether to do them, and mail | ||
diffs or instructions to the address given in the `README' so they can | ||
be considered for the next release. If you are using the cache, and at | ||
some point `config.cache' contains results you don't want to keep, you | ||
may remove or edit it. | ||
|
||
The file `configure.ac' (or `configure.in') is used to create | ||
`configure' by a program called `autoconf'. You need `configure.ac' if | ||
you want to change it or regenerate `configure' using a newer version | ||
of `autoconf'. | ||
|
||
The simplest way to compile this package is: | ||
|
||
1. `cd' to the directory containing the package's source code and type | ||
`./configure' to configure the package for your system. | ||
|
||
Running `configure' might take a while. While running, it prints | ||
some messages telling which features it is checking for. | ||
|
||
2. Type `make' to compile the package. | ||
|
||
3. Optionally, type `make check' to run any self-tests that come with | ||
the package. | ||
|
||
4. Type `make install' to install the programs and any data files and | ||
documentation. | ||
|
||
5. You can remove the program binaries and object files from the | ||
source code directory by typing `make clean'. To also remove the | ||
files that `configure' created (so you can compile the package for | ||
a different kind of computer), type `make distclean'. There is | ||
also a `make maintainer-clean' target, but that is intended mainly | ||
for the package's developers. If you use it, you may have to get | ||
all sorts of other programs in order to regenerate files that came | ||
with the distribution. | ||
|
||
Compilers and Options | ||
===================== | ||
|
||
Some systems require unusual options for compilation or linking that the | ||
`configure' script does not know about. Run `./configure --help' for | ||
details on some of the pertinent environment variables. | ||
|
||
You can give `configure' initial values for configuration parameters | ||
by setting variables in the command line or in the environment. Here | ||
is an example: | ||
|
||
./configure CC=c99 CFLAGS=-g LIBS=-lposix | ||
|
||
*Note Defining Variables::, for more details. | ||
|
||
Compiling For Multiple Architectures | ||
==================================== | ||
|
||
You can compile the package for more than one kind of computer at the | ||
same time, by placing the object files for each architecture in their | ||
own directory. To do this, you can use GNU `make'. `cd' to the | ||
directory where you want the object files and executables to go and run | ||
the `configure' script. `configure' automatically checks for the | ||
source code in the directory that `configure' is in and in `..'. | ||
|
||
With a non-GNU `make', it is safer to compile the package for one | ||
architecture at a time in the source code directory. After you have | ||
installed the package for one architecture, use `make distclean' before | ||
reconfiguring for another architecture. | ||
|
||
Installation Names | ||
================== | ||
|
||
By default, `make install' installs the package's commands under | ||
`/usr/local/bin', include files under `/usr/local/include', etc. You | ||
can specify an installation prefix other than `/usr/local' by giving | ||
`configure' the option `--prefix=PREFIX'. | ||
|
||
You can specify separate installation prefixes for | ||
architecture-specific files and architecture-independent files. If you | ||
pass the option `--exec-prefix=PREFIX' to `configure', the package uses | ||
PREFIX as the prefix for installing programs and libraries. | ||
Documentation and other data files still use the regular prefix. | ||
|
||
In addition, if you use an unusual directory layout you can give | ||
options like `--bindir=DIR' to specify different values for particular | ||
kinds of files. Run `configure --help' for a list of the directories | ||
you can set and what kinds of files go in them. | ||
|
||
If the package supports it, you can cause programs to be installed | ||
with an extra prefix or suffix on their names by giving `configure' the | ||
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. | ||
|
||
Optional Features | ||
================= | ||
|
||
Some packages pay attention to `--enable-FEATURE' options to | ||
`configure', where FEATURE indicates an optional part of the package. | ||
They may also pay attention to `--with-PACKAGE' options, where PACKAGE | ||
is something like `gnu-as' or `x' (for the X Window System). The | ||
`README' should mention any `--enable-' and `--with-' options that the | ||
package recognizes. | ||
|
||
For packages that use the X Window System, `configure' can usually | ||
find the X include and library files automatically, but if it doesn't, | ||
you can use the `configure' options `--x-includes=DIR' and | ||
`--x-libraries=DIR' to specify their locations. | ||
|
||
Specifying the System Type | ||
========================== | ||
|
||
There may be some features `configure' cannot figure out automatically, | ||
but needs to determine by the type of machine the package will run on. | ||
Usually, assuming the package is built to be run on the _same_ | ||
architectures, `configure' can figure that out, but if it prints a | ||
message saying it cannot guess the machine type, give it the | ||
`--build=TYPE' option. TYPE can either be a short name for the system | ||
type, such as `sun4', or a canonical name which has the form: | ||
|
||
CPU-COMPANY-SYSTEM | ||
|
||
where SYSTEM can have one of these forms: | ||
|
||
OS KERNEL-OS | ||
|
||
See the file `config.sub' for the possible values of each field. If | ||
`config.sub' isn't included in this package, then this package doesn't | ||
need to know the machine type. | ||
|
||
If you are _building_ compiler tools for cross-compiling, you should | ||
use the option `--target=TYPE' to select the type of system they will | ||
produce code for. | ||
|
||
If you want to _use_ a cross compiler, that generates code for a | ||
platform different from the build platform, you should specify the | ||
"host" platform (i.e., that on which the generated programs will | ||
eventually be run) with `--host=TYPE'. | ||
|
||
Sharing Defaults | ||
================ | ||
|
||
If you want to set default values for `configure' scripts to share, you | ||
can create a site shell script called `config.site' that gives default | ||
values for variables like `CC', `cache_file', and `prefix'. | ||
`configure' looks for `PREFIX/share/config.site' if it exists, then | ||
`PREFIX/etc/config.site' if it exists. Or, you can set the | ||
`CONFIG_SITE' environment variable to the location of the site script. | ||
A warning: not all `configure' scripts look for a site script. | ||
|
||
Defining Variables | ||
================== | ||
|
||
Variables not defined in a site shell script can be set in the | ||
environment passed to `configure'. However, some packages may run | ||
configure again during the build, and the customized values of these | ||
variables may be lost. In order to avoid this problem, you should set | ||
them in the `configure' command line, using `VAR=value'. For example: | ||
|
||
./configure CC=/usr/local2/bin/gcc | ||
|
||
causes the specified `gcc' to be used as the C compiler (unless it is | ||
overridden in the site shell script). | ||
|
||
Unfortunately, this technique does not work for `CONFIG_SHELL' due to | ||
an Autoconf bug. Until the bug is fixed you can use this workaround: | ||
|
||
CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash | ||
|
||
`configure' Invocation | ||
====================== | ||
|
||
`configure' recognizes the following options to control how it operates. | ||
|
||
`--help' | ||
`-h' | ||
Print a summary of the options to `configure', and exit. | ||
|
||
`--version' | ||
`-V' | ||
Print the version of Autoconf used to generate the `configure' | ||
script, and exit. | ||
|
||
`--cache-file=FILE' | ||
Enable the cache: use and save the results of the tests in FILE, | ||
traditionally `config.cache'. FILE defaults to `/dev/null' to | ||
disable caching. | ||
|
||
`--config-cache' | ||
`-C' | ||
Alias for `--cache-file=config.cache'. | ||
|
||
`--quiet' | ||
`--silent' | ||
`-q' | ||
Do not print messages saying which checks are being made. To | ||
suppress all normal output, redirect it to `/dev/null' (any error | ||
messages will still be shown). | ||
|
||
`--srcdir=DIR' | ||
Look for the package's source code in directory DIR. Usually | ||
`configure' can determine that directory automatically. | ||
|
||
`configure' also accepts some other, not widely useful, options. Run | ||
`configure --help' for more details. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
SUBDIRS = . examples | ||
|
||
clutter-box2d-0.6.pc: clutter-box2d.pc | ||
@cp -f clutter-box2d.pc clutter-box2d-0.6.pc | ||
|
||
pkgconfig_DATA = clutter-box2d-0.6.pc | ||
pkgconfigdir = $(libdir)/pkgconfig | ||
|
||
INCLUDES = @GCC_FLAGS@ @DEPS_CFLAGS@ | ||
|
||
lib_LTLIBRARIES = libclutter-box2d-@CLUTTER_BOX2D_MAJORMINOR@.la | ||
|
||
libclutter_box2d_@CLUTTER_BOX2D_MAJORMINOR@_la_SOURCES = clutter-box2d.cpp | ||
libclutter_box2d_@CLUTTER_BOX2D_MAJORMINOR@_la_LIBADD = @DEPS_LIBS@ | ||
libclutter_box2d_@CLUTTER_BOX2D_MAJORMINOR@_la_LDFLAGS = @CLUTTER_BOX2D_LT_LDFLAGS@ | ||
|
||
clutter_box2dheaders_HEADERS = clutter-box2d.h | ||
clutter_box2dheadersdir = $(includedir)/clutter-0.6/clutter-box2d | ||
|
||
EXTRA_DIST = clutter-box2d.pc.in | ||
|
||
CLEANFILES = clutter-box2d-0.6.pc | ||
DISTCLEANFILES = clutter-box2d.pc | ||
|
||
# Extra clean files so that maintainer-clean removes *everything* | ||
MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub \ | ||
configure depcomp install-sh ltmain.sh \ | ||
Makefile.in missing config.h.in |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
Clutter-Box2d | ||
============= | ||
|
||
A glue layer between clutter and box2d that provides a special group where the | ||
actors can be set to be static or dynamic in regard to a physics simulation. | ||
|
||
TODO: | ||
- joints | ||
- springs | ||
- motors | ||
- access to underlying body | ||
|
||
--- | ||
|
||
To link against box2d apply the patch in the root of the clutter-box2d | ||
distribution to the unix makefiles of box2d to allow building a shared library | ||
as well as installing it with usable headers. Paths used by box2d are hardcoded | ||
with /usr/local/ for now waiting to see how box2d finally settles it's build | ||
system. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
#! /bin/sh | ||
autoreconf -v --install || exit 1 | ||
./configure --enable-maintainer-mode "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
Index: Source/Makefile | ||
=================================================================== | ||
--- Source/Makefile (revision 139) | ||
+++ Source/Makefile (working copy) | ||
@@ -1,4 +1,5 @@ | ||
TARGETS= Gen/float/libbox2d.a Gen/fixed/libbox2d.a | ||
+TARGETS+= Gen/float/libbox2d.so Gen/fixed/libbox2d.so | ||
|
||
ifdef DEVKITPRO | ||
TARGETS += Gen/nds-float/lib/libbox2d.a Gen/nds-fixed/lib/libbox2d.a | ||
@@ -71,6 +72,8 @@ | ||
Gen/float/libbox2d.a: $(addprefix Gen/float/,$(SOURCES:.cpp=.o)) | ||
ar cr $@ $^ | ||
ranlib $@ | ||
+Gen/float/libbox2d.so: $(addprefix Gen/float/,$(SOURCES:.cpp=.o)) | ||
+ $(CXX) -shared -fPIC -C $^ -o $@ -lm -lgcc | ||
|
||
Gen/float/%.d: %.cpp | ||
@mkdir -p $(dir $@) | ||
@@ -81,11 +84,12 @@ | ||
@mkdir -p $(dir $@) | ||
c++ $(CXXFLAGS) -DTARGET_FLOAT32_IS_FIXED -c -o $@ $< | ||
|
||
- | ||
Gen/fixed/libbox2d.a: $(addprefix Gen/fixed/,$(SOURCES:.cpp=.o)) | ||
ar cr $@ $^ | ||
ranlib $@ | ||
|
||
+Gen/fixed/libbox2d.so: $(addprefix Gen/fixed/,$(SOURCES:.cpp=.o)) | ||
+ $(CXX) -shared -fPIC -C $^ -o $@ -lm -lgcc | ||
|
||
Gen/fixed/%.d: %.cpp | ||
@mkdir -p $(dir $@) | ||
@@ -129,6 +133,3 @@ | ||
Gen/nds-float/%.d: %.cpp | ||
@mkdir -p $(dir $@) | ||
arm-eabi-g++ -MM -MT $(@:.d=.o) $(NDS_COMPILE_FLAGS) -o $@ $< | ||
- | ||
- | ||
- | ||
Index: Makefile | ||
=================================================================== | ||
--- Makefile (revision 139) | ||
+++ Makefile (working copy) | ||
@@ -6,6 +6,25 @@ | ||
(cd Source; make) | ||
(cd Examples/TestBed; make) | ||
|
||
+install: all | ||
+ install Source/Gen/float/libbox2d.a \ | ||
+ Source/Gen/float/libbox2d.so \ | ||
+ /usr/local/lib | ||
+ | ||
+ for dir in Collision \ | ||
+ Common \ | ||
+ Dynamics \ | ||
+ Collision/Shapes \ | ||
+ Dynamics/Joints \ | ||
+ Dynamics/Contacts; \ | ||
+ do \ | ||
+ install -d /usr/local/include/box2d/Source/$$dir;\ | ||
+ install Source/$$dir/*.h /usr/local/include/box2d/Source/$$dir/;\ | ||
+ done | ||
+ | ||
+ #rewrite header file to make it possible to use it from the installed location. | ||
+ cat Include/Box2D.h | sed s:\\.\\.:box2d: > /usr/local/include/box2d/Box2D.h | ||
+ | ||
clean: | ||
(cd Contrib/freeglut; make clean) | ||
(cd Contrib/glui; make clean) | ||
Index: Examples/TestBed/Framework/Test.cpp | ||
=================================================================== | ||
--- Examples/TestBed/Framework/Test.cpp (revision 139) | ||
+++ Examples/TestBed/Framework/Test.cpp (working copy) | ||
@@ -171,8 +171,8 @@ | ||
md.body2 = body; | ||
md.target = p; | ||
#ifdef TARGET_FLOAT32_IS_FIXED | ||
- md.maxForce = (body->m_mass < 16.0)? | ||
- (1000.0f * body->m_mass) : float32(16000.0); | ||
+ md.maxForce = (body->GetMass() < 16.0)? | ||
+ (1000.0f * body->GetMass()) : float32(16000.0); | ||
#else | ||
md.maxForce = 1000.0f * body->GetMass(); | ||
#endif |
Oops, something went wrong.