speed-dreams/speed-dreams-code
6
0
Fork 1
Code Issues 8 Pull requests 1 Projects Releases Packages Wiki Activity Actions

VC++ 2010 related bug fixes

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@3999 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 945e46511f15ea1e8b5ddacc226bc04e6fb99e0b
Former-commit-id: b7ba3fba8a3763e9ec6643d63b819921b613c40b
This commit is contained in:
wdbee 2011-10-25 15:26:41 +00:00
parent 2898bb1fd4
commit b691348de7
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmake/macros.cmake
View file

@ -1207,11 +1207,17 @@ MACRO(SD_INSTALL_FILES)
INSTALL(CODE INSTALL(CODE
"FILE(READ ${CMAKE_BINARY_DIR}/xmlversion_loc.txt XMLVERSION_EXE) "FILE(READ ${CMAKE_BINARY_DIR}/xmlversion_loc.txt XMLVERSION_EXE)
STRING(REPLACE \"$(OutDir)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" XMLVERSION_EXE \${XMLVERSION_EXE}) STRING(REPLACE \"$(OutDir)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" XMLVERSION_EXE \${XMLVERSION_EXE})
STRING(REPLACE \"$(ConfigurationName)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" XMLVERSION_EXE \${XMLVERSION_EXE})
STRING(REPLACE \"$(Configuration)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" XMLVERSION_EXE \${XMLVERSION_EXE})
GET_FILENAME_COMPONENT(XMLVERSION_DIR \${XMLVERSION_EXE} PATH) GET_FILENAME_COMPONENT(XMLVERSION_DIR \${XMLVERSION_EXE} PATH)
SET(TXML_LIB ${TXML_LIB}) SET(TXML_LIB ${TXML_LIB})
STRING(REPLACE \"$(OutDir)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" TXML_LIB \${TXML_LIB}) STRING(REPLACE \"$(OutDir)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" TXML_LIB \${TXML_LIB})
STRING(REPLACE \"$(ConfigurationName)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" TXML_LIB \${TXML_LIB})
STRING(REPLACE \"$(Configuration)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" TXML_LIB \${TXML_LIB})
SET(TGF_LIB ${TGF_LIB}) SET(TGF_LIB ${TGF_LIB})
STRING(REPLACE \"$(OutDir)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" TGF_LIB \${TGF_LIB}) STRING(REPLACE \"$(OutDir)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" TGF_LIB \${TGF_LIB})
STRING(REPLACE \"$(ConfigurationName)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" TGF_LIB \${TGF_LIB})
STRING(REPLACE \"$(Configuration)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" TGF_LIB \${TGF_LIB})
FILE(INSTALL DESTINATION \${XMLVERSION_DIR} TYPE FILE FILES \${TXML_LIB} \${TGF_LIB} \"${SDL_LIB}\") FILE(INSTALL DESTINATION \${XMLVERSION_DIR} TYPE FILE FILES \${TXML_LIB} \${TGF_LIB} \"${SDL_LIB}\")
SET(SD_DATADIR_ABS \"${SD_DATADIR}\") SET(SD_DATADIR_ABS \"${SD_DATADIR}\")
IF(NOT IS_ABSOLUTE \${SD_DATADIR_ABS}) IF(NOT IS_ABSOLUTE \${SD_DATADIR_ABS})
@ -1358,11 +1364,17 @@ MACRO(SD_INSTALL_DIRECTORIES)
INSTALL(CODE INSTALL(CODE
"FILE(READ ${CMAKE_BINARY_DIR}/xmlversion_loc.txt XMLVERSION_EXE) "FILE(READ ${CMAKE_BINARY_DIR}/xmlversion_loc.txt XMLVERSION_EXE)
STRING(REPLACE \"$(OutDir)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" XMLVERSION_EXE \${XMLVERSION_EXE}) STRING(REPLACE \"$(OutDir)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" XMLVERSION_EXE \${XMLVERSION_EXE})
STRING(REPLACE \"$(ConfigurationName)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" XMLVERSION_EXE \${XMLVERSION_EXE})
STRING(REPLACE \"$(Configuration)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" XMLVERSION_EXE \${XMLVERSION_EXE})
GET_FILENAME_COMPONENT(XMLVERSION_DIR \${XMLVERSION_EXE} PATH) GET_FILENAME_COMPONENT(XMLVERSION_DIR \${XMLVERSION_EXE} PATH)
SET(TXML_LIB ${TXML_LIB}) SET(TXML_LIB ${TXML_LIB})
STRING(REPLACE \"$(OutDir)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" TXML_LIB \${TXML_LIB}) STRING(REPLACE \"$(OutDir)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" TXML_LIB \${TXML_LIB})
STRING(REPLACE \"$(ConfigurationName)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" TXML_LIB \${TXML_LIB})
STRING(REPLACE \"$(Configuration)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" TXML_LIB \${TXML_LIB})
SET(TGF_LIB ${TGF_LIB}) SET(TGF_LIB ${TGF_LIB})
STRING(REPLACE \"$(OutDir)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" TGF_LIB \${TGF_LIB}) STRING(REPLACE \"$(OutDir)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" TGF_LIB \${TGF_LIB})
STRING(REPLACE \"$(ConfigurationName)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" TGF_LIB \${TGF_LIB})
STRING(REPLACE \"$(Configuration)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" TGF_LIB \${TGF_LIB})
FILE(INSTALL DESTINATION \${XMLVERSION_DIR} TYPE FILE FILES \${TXML_LIB} \${TGF_LIB} \"${SDL_LIB}\") FILE(INSTALL DESTINATION \${XMLVERSION_DIR} TYPE FILE FILES \${TXML_LIB} \${TGF_LIB} \"${SDL_LIB}\")
SET(SD_DATADIR_ABS \"${SD_DATADIR}\") SET(SD_DATADIR_ABS \"${SD_DATADIR}\")
IF(NOT IS_ABSOLUTE \${SD_DATADIR_ABS}) IF(NOT IS_ABSOLUTE \${SD_DATADIR_ABS})

4
src/drivers/simplix/simplix_sc/tracks/g-track-1.xml
View file

@ -25,8 +25,8 @@
<attnum name="pit stop dist" val="1.5"/> <attnum name="pit stop dist" val="1.5"/>
<attnum name="offset skill" val="0.00"/> <attnum name="offset skill" val="0.00"/>
<attnum name="scale skill" val="0.50"/> <attnum name="scale skill" val="0.50"/>
<attnum name="scale_brake" min="0.1" max="2.0" val="1.11"/> <attnum name="scale_brake" min="0.1" max="2.0" val="1.05"/>
<attnum name="scale_mu" min="0.1" max="2.0" val="1.18"/> <attnum name="scale_mu" min="0.1" max="2.0" val="1.03"/>
<attnum name="scale bump" min="0" max="1" val="0.01"/> <attnum name="scale bump" min="0" max="1" val="0.01"/>
<attnum name="scale bump outer" min="0" max="2" val="0.01"/> <attnum name="scale bump outer" min="0" max="2" val="0.01"/>
<attnum name="lookaheadfactor" min="0.0" max="0.5" val="0.33"/> <attnum name="lookaheadfactor" min="0.0" max="0.5" val="0.33"/>

4
src/libs/tgf/eventloop.cpp
View file

@ -95,9 +95,9 @@ int GfEventLoop::Private::translateKeySym(int code, int modifier, int unicode)
// Truncate unicodes above GF_MAX_KEYCODE (no need for more). // Truncate unicodes above GF_MAX_KEYCODE (no need for more).
keyUnicode = unicode ? (unicode & GF_MAX_KEYCODE) : code; keyUnicode = unicode ? (unicode & GF_MAX_KEYCODE) : code;
_mapUnicodes[keyId] = keyUnicode; _mapUnicodes[keyId] = keyUnicode;
GfLogDebug("translateKeySym(c=%X, m=%X, u=%X) : '%c', id=%X, ucode=%X (nk=%d)\n", GfLogDebug("translateKeySym(c=%X, m=%X, u=%X) : '%d', id=%X, ucode=%X (nk=%d)\n",
code, modifier, unicode, code, modifier, unicode,
isprint(keyUnicode) ? (char)keyUnicode : ' ', keyUnicode,
keyId, keyUnicode, _mapUnicodes.size()); keyId, keyUnicode, _mapUnicodes.size());
} }