(See r1587 on 0.4rc1):
1) empty robot templates have been moved from 'tools' to src/robots (documentation was updated), and are now included in source distributions Removed tools directory which is now empty. 2) Include documentation in source distributions (but only player_manual will be installed) 3) Added missing bullet documentation files and removed unnecessary cmake files. git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1588 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk
parent
fa549f3e98
commit
8d2779495b
@ -1,6 +1,6 @@
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
SUBDIRS = @BULLETTREE@ src wavs images models oggs data fonts
|
||||
SUBDIRS = @BULLETTREE@ src wavs images models oggs doc data fonts
|
||||
|
||||
EXTRA_DIST = README ChangeLog COPYING missing
|
||||
|
||||
|
||||
33
configure.ac
33
configure.ac
@ -383,11 +383,6 @@ dnl Bullet physics
|
||||
dnl ==============
|
||||
AC_DEFINE([BT_NO_PROFILE], [], [Disable bullet internal profiling])
|
||||
CXXFLAGS="$CXXFLAGS -Ibullet/src"
|
||||
AC_CONFIG_FILES([ \
|
||||
src/bullet/Makefile \
|
||||
src/bullet/src/Makefile \
|
||||
src/bullet/Demos/OpenGL/Makefile
|
||||
])
|
||||
SUMMARY="$SUMMARY\nUsing bullet physics."
|
||||
BULLETTREE="src/bullet"
|
||||
|
||||
@ -405,17 +400,23 @@ AC_SUBST(BULLETTREE)
|
||||
dnl ================
|
||||
dnl Create makefiles
|
||||
dnl ================
|
||||
AC_CONFIG_FILES([ \
|
||||
Makefile \
|
||||
data/Makefile \
|
||||
fonts/Makefile \
|
||||
images/Makefile \
|
||||
models/Makefile \
|
||||
oggs/Makefile \
|
||||
src/Makefile \
|
||||
wavs/Makefile \
|
||||
wavs/radio/Makefile \
|
||||
wavs/tintagel/Makefile \
|
||||
AC_CONFIG_FILES([ \
|
||||
Makefile \
|
||||
data/Makefile \
|
||||
doc/Makefile \
|
||||
doc/players_manual/Makefile \
|
||||
fonts/Makefile \
|
||||
images/Makefile \
|
||||
models/Makefile \
|
||||
oggs/Makefile \
|
||||
src/Makefile \
|
||||
src/robots/Makefile \
|
||||
src/bullet/Makefile \
|
||||
src/bullet/src/Makefile \
|
||||
src/bullet/Demos/OpenGL/Makefile \
|
||||
wavs/Makefile \
|
||||
wavs/radio/Makefile \
|
||||
wavs/tintagel/Makefile \
|
||||
models/herrings/Makefile
|
||||
])
|
||||
AC_OUTPUT
|
||||
|
||||
@ -1,3 +1,7 @@
|
||||
# contrib/
|
||||
# doc
|
||||
|
||||
EXTRA_DIST =
|
||||
SUBDIRS = players_manual
|
||||
|
||||
pkgdatadir = $(datadir)/games/@PACKAGE@/doc
|
||||
|
||||
EXTRA_DIST = conventions.txt implementation.txt robots.txt
|
||||
|
||||
7
doc/players_manual/Makefile.am
Normal file
7
doc/players_manual/Makefile.am
Normal file
@ -0,0 +1,7 @@
|
||||
# doc/players_manual
|
||||
|
||||
pkgdatadir = $(datadir)/games/@PACKAGE@/doc/players_manual
|
||||
|
||||
pkgdata_DATA = manual.html $(wildcard *.png)
|
||||
|
||||
EXTRA_DIST = $(pkgdata_DATA)
|
||||
@ -1,6 +1,6 @@
|
||||
To create a robot, here is what you should do:
|
||||
|
||||
- There is a template for the robots in the contrib/ directory, modify it
|
||||
- There is a template for the robots in the src/robots directory, modify it
|
||||
to create your own robot, the files are named empty_robot.cpp and
|
||||
empty_robot.hpp .
|
||||
- Name your source file <name of robot>_robot.cpp, and your header as
|
||||
|
||||
@ -124,7 +124,7 @@ supertuxkart_SOURCES = main.cpp \
|
||||
replay_player.hpp replay_player.cpp \
|
||||
replay_recorder.hpp replay_recorder.cpp \
|
||||
ide/vc8/supertuxkart.sln ide/vc8/supertuxkart.vcproj \
|
||||
ide/vc8/bullet_lib.vcproj
|
||||
ide/vc8/bullet_lib.vcproj ide/vc8/README
|
||||
|
||||
|
||||
# Link in the specific gcc 4.1 bug work around
|
||||
@ -135,3 +135,6 @@ supertuxkart_LDADD = -L. -lstatic_ssg \
|
||||
.PHONY: pot
|
||||
pot:
|
||||
xgettext -o supertuxkart.pot -k_ --c++ *.?pp */*.?pp
|
||||
|
||||
SUBDIRS = robots
|
||||
|
||||
|
||||
@ -1,63 +0,0 @@
|
||||
# This is basically the overall name of the project in Visual Studio this is the name of the Solution File
|
||||
|
||||
|
||||
# For every executable you have with a main method you should have an add_executable line below.
|
||||
# For every add executable line you should list every .cpp and .h file you have associated with that executable.
|
||||
|
||||
|
||||
# This is the variable for Windows. I use this to define the root of my directory structure.
|
||||
SET(GLUT_ROOT ${BULLET_PHYSICS_SOURCE_DIR}/glut)
|
||||
|
||||
# You shouldn't have to modify anything below this line
|
||||
########################################################
|
||||
|
||||
|
||||
# This is the shortcut to finding GLU, GLUT and OpenGL if they are properly installed on your system
|
||||
# This should be the case.
|
||||
INCLUDE (${CMAKE_ROOT}/Modules/FindGLU.cmake)
|
||||
INCLUDE (${CMAKE_ROOT}/Modules/FindGLUT.cmake)
|
||||
INCLUDE (${CMAKE_ROOT}/Modules/FindOpenGL.cmake)
|
||||
|
||||
|
||||
IF (WIN32)
|
||||
# This is the Windows code for which Opengl, and Glut are not properly installed
|
||||
# since I can't install them I must cheat and copy libraries around
|
||||
INCLUDE_DIRECTORIES(${GLUT_ROOT})
|
||||
# LINK_DIRECTORIES(${GLUT_ROOT}\\lib)
|
||||
# IF (${GLUT_glut_LIBRARY} MATCHES "GLUT_glut_LIBRARY-NOTFOUND")
|
||||
# LINK_LIBRARIES(${GLUT_ROOT}\\lib\\glut32 ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY})
|
||||
# TARGET_LINK_LIBRARIES(table ${GLUT_ROOT}\\lib\\glut32)
|
||||
#
|
||||
# ADD_CUSTOM_COMMAND(TARGET table POST_BUILD COMMAND copy ${GLUT_ROOT}\\lib\\glut32.dll ${GLUT_ROOT}\\bin\\vs2005\\Debug
|
||||
# COMMAND copy ${GLUT_ROOT}\\lib\\glut32.dll ${GLUT_ROOT}\\bin\\vs2003\\Debug
|
||||
# COMMAND copy ${GLUT_ROOT}\\lib\\glut32.dll ${GLUT_ROOT}\\bin\\vs6\\Debug)
|
||||
# ELSE (${GLUT_glut_LIBRARY} MATCHES "GLUT_glut_LIBRARY-NOTFOUND")
|
||||
# LINK_LIBRARIES(${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
|
||||
# TARGET_LINK_LIBRARIES(table ${GLUT_glut_LIBRARY})
|
||||
# ENDIF(${GLUT_glut_LIBRARY} MATCHES "GLUT_glut_LIBRARY-NOTFOUND")
|
||||
# TARGET_LINK_LIBRARIES(table ${OPENGL_gl_LIBRARY})
|
||||
# TARGET_LINK_LIBRARIES(table ${OPENGL_glu_LIBRARY})
|
||||
ELSE (WIN32)
|
||||
# This is the lines for linux. This should always work if everything is installed and working fine.
|
||||
# SET(CMAKE_BUILD_TYPE Debug)
|
||||
# SET(CMAKE_CXX_FLAGS_DEBUG "-g")
|
||||
INCLUDE_DIRECTORIES(/usr/include /usr/local/include ${GLUT_INCLUDE_DIR})
|
||||
# TARGET_LINK_LIBRARIES(table ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
|
||||
# TARGET_LINK_LIBRARIES(checker ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
|
||||
ENDIF (WIN32)
|
||||
|
||||
INCLUDE_DIRECTORIES(
|
||||
${BULLET_PHYSICS_SOURCE_DIR}/src }
|
||||
)
|
||||
|
||||
ADD_LIBRARY(LibOpenGLSupport
|
||||
BMF_Api.cpp
|
||||
BMF_BitmapFont.cpp
|
||||
BMF_font_helv10.cpp
|
||||
GL_ShapeDrawer.cpp
|
||||
GL_Simplex1to4.cpp
|
||||
GLDebugDrawer.cpp
|
||||
GlutStuff.cpp
|
||||
RenderTexture.cpp
|
||||
DemoApplication.cpp
|
||||
)
|
||||
@ -1 +1,5 @@
|
||||
SUBDIRS=src Demos/OpenGL
|
||||
SUBDIRS=src Demos/OpenGL
|
||||
|
||||
EXTRA_DIST = BulletLicense.txt ChangeLog.txt copy_bullet_files \
|
||||
LICENSE README VERSION
|
||||
|
||||
|
||||
4
src/robots/Makefile.am
Normal file
4
src/robots/Makefile.am
Normal file
@ -0,0 +1,4 @@
|
||||
# src/robots
|
||||
|
||||
EXTRA_DIST = empty_robot.cpp empty_robot.hpp
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user