Permalink
Browse files

Mouse grab

- ozCore
  * System::isInstrumented()
- matrix
  * ObjectClass::cost
- client
  * mouse grab enabled unless running under debugger, detached in crash handler
- tests
  * Mono
  • Loading branch information...
ducakar committed Jan 10, 2013
1 parent fafd6a5 commit f8f403efc150c10d9774fa58aab85dbe00a06aa5
View
@@ -101,7 +101,6 @@ You may also want to set several options when configuring CMake build system:
on any Linux distro or Windows without installation.
`OFF` by default, forced to `ON` on Windows, forced to `OFF` on Android and NaCl.
-
Tools
-----
@@ -153,7 +152,6 @@ parameter is used as target directory, `share/openzone` if nothing is given) and
file `share/openzone/packeages.ozManifest` containing list of package files and respective
timestamps.
-
Scripts
-------
@@ -165,7 +163,7 @@ Some targets have lots of source files and it would be hard to keep them all con
up-to-date manually. Lists of source files in corresponding `CMakeLists.txt` are thus generated by
this script.
-Additionally this scripts also updates version numbers in various files.
+Additionally this scripts updates version numbers in various files.
### `build.sh [clean | conf | build]` ###
@@ -215,7 +213,7 @@ option) that can be distributed in a ZIP archive (i.e. no installation required,
included).
This script is currently Arch Linux-specific and assumes one has all 64-bit, 32-bit (`lib32-*`) and
-MinGW (`mingw32-*`) versions of all dependent libraries installed. Many of those packages must be
+MinGW (`mingw32-*`) versions of all required libraries installed. Many of those packages must be
built from AUR.
The following commands may be given (`build` is assumed if none):
@@ -285,7 +283,6 @@ see documentation once it is generated.
Currently only liboz documentation is complete.
-
Legal
-----
View
@@ -6,7 +6,7 @@
# up-to-date manually. Lists of source files in corresponding CMakeLists.txt are thus generated by
# this script.
#
-# Additionally this scripts also updates version numbers in various files.
+# Additionally this scripts updates version numbers in various files.
#
version=0.3.81
@@ -38,8 +38,8 @@ sed -r 's|^(PROJECT_NUMBER *= *).*$|\1"'"$version"'"|' -i doc/Doxyfile*
echo "Updating HTML READMEs doc/*.html"
sed -r 's|(<!--OZ_VERSION-->)[^<"]*|\1'"$version"'|' -i doc/*.html
-echo "Updating version in etc/PKGBUILD*"
-sed -r 's|^(pkgver=).*$|\1'"$version"'|' -i etc/PKGBUILD*
-
echo "Updating version in etc/openzone.spec"
sed -r 's|^(Version: *).*$|\1'"$version"'|' -i etc/openzone.spec
+
+echo "Updating version in etc/PKGBUILD*"
+sed -r 's|^(pkgver=).*$|\1'"$version"'|' -i etc/PKGBUILD*
View
@@ -26,7 +26,7 @@ platforms=(
Windows-i686
NaCl-x86_64
NaCl-i686
- NaCl-ARM
+# NaCl-ARM
# PNaCl
Android14-i686
# Android14-ARM
@@ -41,7 +41,7 @@ function clean()
for platform in ${platforms[@]}; do
rm -rf build/$platform
done
- rm -rf build/{OpenZone-*,NaCl-test,Android}
+ rm -rf build/{OpenZone-*,NaCl-test,Windows-test,Android}
}
function build()
View
@@ -10,7 +10,7 @@
# each file, remove duplicated blank lines and then remove one blank line at the end of each file.
#
-files=`git ls-files | egrep -v '^README|^doc/licences/|\.patch$|^include/|\.po$|/header\.glsl$'`
+files=`git ls-files | egrep -v '^doc/licences/|^include/|\.patch$|\.po$'`
for file in $files; do
# Remove trailing blanks at the end of line.
View
@@ -1,12 +1,15 @@
# Author: Davorin Učakar <davorin.ucakar@gmail.com>
+#
+# Precompiled header (PCH) support for GCC and LLVM/Clang.
+#
# Example:
#
# add_pch( pch stable.h stable.c )
# add_executable( test test.c )
# use_pch( test pch )
#
-# where: - `pch` is PCH target name
+# where: - `pch` is PCH target name.
# - `stable.h` is a header that should be precompiled.
# - `stable.c` is a dummy module that contains only an include directive for `stable.h` (it
# is required for proper dependency resolution to trigger recompilation of PCH).
@@ -20,55 +23,55 @@
if( PCH_DISABLE )
-macro( add_pch )
-endmacro( add_pch )
+ macro( add_pch )
+ endmacro( add_pch )
-macro( use_pch )
-endmacro( use_pch )
+ macro( use_pch )
+ endmacro( use_pch )
else( PCH_DISABLE )
-macro( add_pch _pchTarget _inputHeader _inputModule )
- # Extract CMAKE_CXX_FLAGS and CMAKE_CXX_FLAGS_XXX for the current configuration XXX.
- string( TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _buildTypeFlagsVar )
- set( _flags "${CMAKE_CXX_FLAGS} ${${_buildTypeFlagsVar}}" )
+ macro( add_pch _pchTarget _inputHeader _inputModule )
+ # Extract CMAKE_CXX_FLAGS and CMAKE_CXX_FLAGS_XXX for the current configuration XXX.
+ string( TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _buildTypeFlagsVar )
+ set( _flags "${CMAKE_CXX_FLAGS} ${${_buildTypeFlagsVar}}" )
- # Convert string of space separated flags into a list.
- separate_arguments( _flags )
+ # Convert string of space separated flags into a list.
+ separate_arguments( _flags )
- # Extract include directories set by include_directories command.
- get_directory_property( _includes INCLUDE_DIRECTORIES )
- foreach( _include ${_includes} )
- list( APPEND _flags "-I${_include}" )
- endforeach()
+ # Extract include directories set by include_directories command.
+ get_directory_property( _includes INCLUDE_DIRECTORIES )
+ foreach( _include ${_includes} )
+ list( APPEND _flags "-I${_include}" )
+ endforeach()
- # Extract definitions set by add_definitions command.
- get_directory_property( _defines COMPILE_DEFINITIONS )
- foreach( _define ${_defines} )
- list( APPEND _flags "-D${_define}" )
- endforeach()
+ # Extract definitions set by add_definitions command.
+ get_directory_property( _defines COMPILE_DEFINITIONS )
+ foreach( _define ${_defines} )
+ list( APPEND _flags "-D${_define}" )
+ endforeach()
- # Helper target that properly triggers recompilation of precompiled header.
- add_library( ${_pchTarget}_trigger STATIC "${_inputModule}" )
+ # Helper target that properly triggers recompilation of precompiled header.
+ add_library( ${_pchTarget}_trigger STATIC "${_inputModule}" )
- # Build PCH and copy original header to the build folder since we include PCH indirectly.
- add_custom_command( OUTPUT "${_inputHeader}.gch"
- DEPENDS ${_pchTarget}_trigger
- COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/${_inputHeader}"
- "${_inputHeader}"
- COMMAND "${CMAKE_COMMAND}" -E remove -f "${_inputHeader}.gch"
- COMMAND "${CMAKE_CXX_COMPILER}" ${_flags} -o "${_inputHeader}.gch"
- "${CMAKE_CURRENT_SOURCE_DIR}/${_inputHeader}" )
- add_custom_target( ${_pchTarget} DEPENDS "${_inputHeader}.gch" )
+ # Build PCH and copy original header to the build folder since we include PCH indirectly.
+ add_custom_command( OUTPUT "${_inputHeader}.gch"
+ DEPENDS ${_pchTarget}_trigger
+ COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/${_inputHeader}"
+ "${_inputHeader}"
+ COMMAND "${CMAKE_COMMAND}" -E remove -f "${_inputHeader}.gch"
+ COMMAND "${CMAKE_CXX_COMPILER}" ${_flags} -o "${_inputHeader}.gch"
+ "${CMAKE_CURRENT_SOURCE_DIR}/${_inputHeader}" )
+ add_custom_target( ${_pchTarget} DEPENDS "${_inputHeader}.gch" )
- # Cache header location for later `use_pch()` macros.
- set( ${_pchTarget}_output "${CMAKE_CURRENT_BINARY_DIR}/${_inputHeader}" )
-endmacro( add_pch )
+ # Cache header location for later `use_pch()` macros.
+ set( ${_pchTarget}_output "${CMAKE_CURRENT_BINARY_DIR}/${_inputHeader}" )
+ endmacro( add_pch )
-macro( use_pch _target _pchTarget )
- add_dependencies( ${_target} ${_pchTarget} )
+ macro( use_pch _target _pchTarget )
+ add_dependencies( ${_target} ${_pchTarget} )
- set_target_properties( ${_target} PROPERTIES COMPILE_FLAGS "-include ${${_pchTarget}_output}" )
-endmacro( use_pch )
+ set_target_properties( ${_target} PROPERTIES COMPILE_FLAGS "-include ${${_pchTarget}_output}" )
+ endmacro( use_pch )
endif( PCH_DISABLE )
@@ -107,84 +107,3 @@ vec4 applyFog( vec4 colour, float dist )
float ratio = min( dist / oz_Fog.dist, 1.0 );
return mix( colour, oz_Fog.colour, ratio*ratio );
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-// this file should have a 'round' number of lines to easier determine error line from compiler
-// output as it is biased by the number of lines in header.glsl file
@@ -25,7 +25,7 @@
"target": 0,
"move": [ 0, 7.68, 0 ],
"slideTime": 2.0,
- "// timeout": 3.0,
+ "timeout": 3.0,
"openSound": "free/rumble",
"closeSound": "free/rumble",
"frictSound": "kaiser_fx/hum6"
@@ -35,7 +35,7 @@
"type": "IGNORING_BLOCK",
"move": [ 0, 7.68, 0 ],
"slideTime": 2.0,
- "// timeout": 4.0,
+ "timeout": 4.0,
"openSound": "free/rumble",
"closeSound": "free/rumble",
"frictSound": "kaiser_fx/hum6",
@@ -107,84 +107,3 @@ vec4 applyFog( vec4 colour, float dist )
float ratio = min( dist / oz_Fog.dist, 1.0 );
return mix( colour, oz_Fog.colour, ratio*ratio );
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-// this file should have a 'round' number of lines to easier determine error line from compiler
-// output as it is biased by the number of lines in header.glsl file
View
2 lib.sh
@@ -8,7 +8,7 @@
# dependencies included).
#
# This script is currently Arch Linux-specific and assumes one has all 64-bit, 32-bit (`lib32-*`)
-# and MinGW (`mingw32-*`) versions of all dependent libraries installed. Many of those packages must
+# and MinGW (`mingw32-*`) versions of all required libraries installed. Many of those packages must
# be built from AUR.
#
# The following commands may be given (`build` is assumed if none):
Oops, something went wrong.

0 comments on commit f8f403e

Please sign in to comment.