Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github-tomreyn-megaglest:MegaGlest/megaglest-source

This commit is contained in:
Tom Reynolds 2014-01-22 19:19:05 +01:00
parent 87aa45ef81 0b86e1c2d5
commit f0b1537e0b
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/glest_game

@ -1 +1 @@
Subproject commit e1c3d6ead85bb6742a23c44d21467b6881b9e745
Subproject commit 28765fb9baf715ab5adea9b71d12415464c2f0c7

BIN
mk/linux/g3dviewer.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

4
mk/windoze/build-mg-2010.bat
View File

@ -116,9 +116,9 @@ if %NUMBER_OF_PROCESSORS% GTR 1 (
ECHO Found CPU Count [%NUMBER_OF_PROCESSORS%] BuildInParallel = [%BuildInParallel%]
if "%2" == "rebuild" echo Doing a FULL REBUILD...
rem if "%2" == "rebuild" msbuild /detailedsummary %msBuildMaxCPU% /p:BuildInParallel=%BuildInParallel% /p:Configuration=Release /t:Rebuild Glest_vc2010.sln
if "%2" == "rebuild" msbuild %msBuildMaxCPU% %BuildInParallelCount% /p:Configuration=Release /t:Rebuild Glest_vc2010.sln
if "%2" == "rebuild" msbuild %msBuildMaxCPU% %BuildInParallelCount% /p:TrackFileAccess=false;Configuration=Release /t:Rebuild Glest_vc2010.sln
rem if not "%2" == "rebuild" msbuild /detailedsummary %msBuildMaxCPU% /p:BuildInParallel=%BuildInParallel% /p:Configuration=Release Glest_vc2010.sln
if not "%2" == "rebuild" msbuild %msBuildMaxCPU% %BuildInParallelCount% /p:Configuration=Release Glest_vc2010.sln
if not "%2" == "rebuild" msbuild %msBuildMaxCPU% %BuildInParallelCount% /p:TrackFileAccess=false;Configuration=Release Glest_vc2010.sln
rem pause execution so we can see the output before the batch file exits
if not "%1" == "nopause" pause

2
source/g3d_viewer/CMakeLists.txt
View File

@ -194,7 +194,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER)
# Installation of the program config and image files
INSTALL(FILES
"${PROJECT_SOURCE_DIR}/g3dviewer.ico"
"${PROJECT_SOURCE_DIR}/mk/linux/g3dviewer.ico"
DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
# Installation of the program desktop file

2
source/glest_map_editor/CMakeLists.txt
View File

@ -190,7 +190,7 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR)
# Installation of the program config and image files
INSTALL(FILES
"${PROJECT_SOURCE_DIR}/editor.ico"
"${PROJECT_SOURCE_DIR}/mk/linux/editor.ico"
DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
# Installation of the program desktop file