xavi
/
speed-dreams
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added empty webserver.xml 

Fixes for OSX
Added files to the installers


git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6528 30fe4595-0a0c-4342-8851-515496e4dcbd
This commit is contained in:
beaglejoe 2018-03-09 02:31:03 +00:00
parent fca6bcc00c
commit 8c6b6a9b2d
7 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/config/CMakeLists.txt
View File

@ -3,9 +3,9 @@ INCLUDE(../../cmake/macros.cmake)
# User settings.
SET(_CONFIG_USER_FILES logging.xml raceengine.xml screen.xml graph.xml sound.xml osghudconfig.xml)
#IF(OPTION_WEBSERVER)
# SET(_CONFIG_USER_FILES ${_CONFIG_USER_FILES} webserver.xml)
#ENDIF(OPTION_WEBSERVER)
IF(OPTION_WEBSERVER)
SET(_CONFIG_USER_FILES ${_CONFIG_USER_FILES} webserver.xml)
ENDIF(OPTION_WEBSERVER)
#IF(OPTION_CLIENT_SERVER)
#SET(_CONFIG_USER_FILES ${_CONFIG_USER_FILES} networking.xml)

2
data/config/webserver.xml
View File

@ -16,7 +16,7 @@
<params name="webserver" type="param" mode="mw" version="1">
<section name="WebServer Settings">
<attstr name="url" val="http://www.madbad.altervista.org/speed-dreams/webserver.php"/>
<attstr name="url" val=""/>
</section>
</params>

2
packaging/sources/sd-src-base.lst
View File

@ -64,6 +64,8 @@ data/config/raceengine.xml
data/config/raceresults.xsl
data/config/screen.xml
data/config/sound.xml
data/config/osghudconfig.xml
data/config/webserver.xml
data/config/raceman/CMakeLists.txt
data/config/raceman/extra

1
packaging/sources/sd-src-more-hq-cars-and-tracks.lst
View File

@ -1,5 +1,6 @@
data/config/raceman/championship.xml
data/config/raceman/championship-mpa1.xml
data/config/raceman/championship-mpa11.xml
data/config/raceman/championship-supercars.xml
data/config/raceman/championship-trb1.xml

3
packaging/windows/speed-dreams-more-hq-cars-and-tracks.nsi
View File

@ -66,7 +66,8 @@ Section -CoreData
File "${BUILD_INST_DIR}\data\config\raceman\championship.xml"
File "${BUILD_INST_DIR}\data\config\raceman\championship-supercars.xml"
File "${BUILD_INST_DIR}\data\config\raceman\championship-trb1.xml"
File "${BUILD_INST_DIR}\data\config\raceman\championship-mpa1.xml"
File "${BUILD_INST_DIR}\data\config\raceman\championship-mpa1.xml"
File "${BUILD_INST_DIR}\data\config\raceman\championship-mpa11.xml"
SectionEnd

4
src/libs/tgfclient/guitexture.cpp
View File

@ -394,10 +394,10 @@ GfTexReadImageFromJPEG(const char *filename, float screen_gamma, int *pWidth, in
// Initialize the JPEG image decompressor for 24 bit RGB output.
jpeg_create_decompress(&cinfo);
jpeg_stdio_src(&cinfo, infile);
(void)jpeg_read_header(&cinfo, TRUE);
(void)jpeg_read_header(&cinfo, (boolean)TRUE);
cinfo.out_color_space = JCS_RGB;
cinfo.quantize_colors = FALSE;
cinfo.quantize_colors = (boolean)FALSE;
jpeg_calc_output_dimensions(&cinfo);
// Load and check image dimensions.

2
src/main/CMakeLists.txt
View File

@ -146,6 +146,8 @@ ENDIF(NOT OPTION_OFFICIAL_ONLY)
LIST(APPEND PlugIns "\${CMAKE_INSTALL_PREFIX}/lib64/games/${_TARGET_NAME}/drivers/usr_rs/usr_rs.so")
LIST(APPEND PlugIns "\${CMAKE_INSTALL_PREFIX}/lib64/games/${_TARGET_NAME}/drivers/usr_sc/usr_sc.so")
LIST(APPEND PlugIns "\${CMAKE_INSTALL_PREFIX}/lib64/games/${_TARGET_NAME}/drivers/usr_trb1/usr_trb1.so")
LIST(APPEND PlugIns "\${CMAKE_INSTALL_PREFIX}/lib64/games/${_TARGET_NAME}/drivers/usr_mp10/usr_mp10.so")
LIST(APPEND PlugIns "\${CMAKE_INSTALL_PREFIX}/lib64/games/${_TARGET_NAME}/drivers/usr_srw/usr_srw.so")
IF(OPTION_OSGGRAPH)
#SET(OSG_PLUGIN_DIR /opt/local/lib/osgPlugins-3.4.0)