diff --git a/mk/windoze/g2xml.vcxproj b/mk/windoze/g2xml.vcxproj index 0dc09943..9a5b3d81 100644 --- a/mk/windoze/g2xml.vcxproj +++ b/mk/windoze/g2xml.vcxproj @@ -43,6 +43,7 @@ .\..\..\data\glest_game\ $(Configuration)\ false + false diff --git a/mk/windoze/g3d_viewer.vcxproj b/mk/windoze/g3d_viewer.vcxproj index f15a64c8..128fda9f 100644 --- a/mk/windoze/g3d_viewer.vcxproj +++ b/mk/windoze/g3d_viewer.vcxproj @@ -54,6 +54,7 @@ $(Configuration)\ true megaglest_g3dviewer.exe + false @@ -111,7 +112,11 @@ - MachineX86 + + + false + + diff --git a/mk/windoze/glest_editor.vcxproj b/mk/windoze/glest_editor.vcxproj index a65771c0..793ff159 100644 --- a/mk/windoze/glest_editor.vcxproj +++ b/mk/windoze/glest_editor.vcxproj @@ -54,6 +54,7 @@ $(Configuration)\ true megaglest_editor.exe + false @@ -110,7 +111,11 @@ - MachineX86 + + + + + false diff --git a/mk/windoze/make-binary-archive.bat b/mk/windoze/make-binary-archive.bat new file mode 100644 index 00000000..56fe2bec --- /dev/null +++ b/mk/windoze/make-binary-archive.bat @@ -0,0 +1,44 @@ +@echo off + +rem change to the directory of this batch file +ECHO -------------------------------- +ECHO Changing to build folder [%~dp0] p1 [%1] p2 [%2] +rem pause +cd /d "%~dp0" + +ECHO Checking for windows binaries... + +set mg_version= +for /f "tokens=2 delims= " %%i in ('..\..\data\glest_game\megaglest.exe --version') do call :mgver %%i +goto got_ver + +:mgver +rem echo *[%1%]* +if "%mg_version%." == "." goto set_mg_ver +goto exit_mg_ver + +:set_mg_ver +set mg_version=%1% +rem echo *1[%mg_version%] +set mg_version=%mg_version:~1% +rem echo *2[%mg_version%] + +:exit_mg_ver +exit /B 0 + +:got_ver +echo [%mg_version%] + +set RELEASENAME=megaglest-binary-win32-i386 +set PACKAGE=%RELEASENAME%-%mg_version%.7z + +cd /d ..\..\data\glest_game\ + +echo creating [%PACKAGE%] ... +if exist "%PACKAGE%" del "%PACKAGE%" +7z a -mmt -mx=9 -ms=on -mhc=on "%PACKAGE%" megaglest.exe megaglest_g3dviewer.exe megaglest_editor.exe xerces-c_3_0.dll libvlc.dll libvlccore.dll lua plugins 7z.exe 7z.dll xml2g.exe openal32.dll g2xml.exe glest.ini glestkeys.ini servers.ini + +dir "%PACKAGE%" +cd /d "%~dp0" + +pause \ No newline at end of file diff --git a/mk/windoze/make-data-archive.bat b/mk/windoze/make-data-archive.bat new file mode 100644 index 00000000..67fa09ca --- /dev/null +++ b/mk/windoze/make-data-archive.bat @@ -0,0 +1,81 @@ +@echo off + +rem change to the directory of this batch file +ECHO -------------------------------- +ECHO Changing to build folder [%~dp0] p1 [%1] p2 [%2] +rem pause +cd /d "%~dp0" + +set mg_version= +for /f "tokens=2 delims= " %%i in ('..\..\data\glest_game\megaglest.exe --version') do call :mgver %%i +goto got_ver + +:mgver +rem echo *[%1%]* +if "%mg_version%." == "." goto set_mg_ver +goto exit_mg_ver + +:set_mg_ver +set mg_version=%1% +rem echo *1[%mg_version%] +set mg_version=%mg_version:~1% +rem echo *2[%mg_version%] + +:exit_mg_ver +exit /B 0 + +:got_ver +echo [%mg_version%] + +set RELEASENAME=megaglest-standalone-data +set PACKAGE=%RELEASENAME%-%mg_version%.7z +set RELEASEDIR=release\%RELEASENAME%-%mg_version% +set PROJDIR=..\..\ + +goto make_archive + +echo Creating data package in [%RELEASEDIR%] + +if exist %RELEASEDIR% rd /s /q %RELEASEDIR% +mkdir %RELEASEDIR% + +rem copy data +echo copying data ... +mkdir %RELEASEDIR%\data\ +svn export --force ..\..\data\glest_game\data %RELEASEDIR%\data\ +mkdir %RELEASEDIR%\docs\ +svn export --force ..\..\data\glest_game\docs %RELEASEDIR%\docs\ +svn export --force ..\..\data\glest_game\docs\CHANGELOG.txt %RELEASEDIR%\docs\CHANGELOG.txt +svn export --force ..\..\data\glest_game\README.txt %RELEASEDIR%\docs\README.txt +mkdir %RELEASEDIR%\maps\ +svn export --force ..\..\data\glest_game\maps %RELEASEDIR%\maps\ +mkdir %RELEASEDIR%\scenarios\ +svn export --force ..\..\data\glest_game\scenarios %RELEASEDIR%\scenarios\ +mkdir %RELEASEDIR%\techs\ +svn export --force ..\..\data\glest_game\techs %RELEASEDIR%\techs\ +mkdir %RELEASEDIR%\tilesets\ +svn export --force ..\..\data\glest_game\tilesets %RELEASEDIR%\tilesets\ +mkdir %RELEASEDIR%\tutorials\ +svn export --force ..\..\data\glest_game\tutorials %RELEASEDIR%\tutorials\ + +rem special export for flag images +mkdir %RELEASEDIR%\data\core\misc_textures\flags\ +svn export --force ..\..\source\masterserver\flags %RELEASEDIR%\data\core\misc_textures\flags\ + +rem START +rem remove embedded data +rem rm -rf "%RELEASEDIR%\data\core\fonts" +rem END +:make_archive +echo Current directory[%CD%] +echo creating data archive: %PACKAGE% +if exist release\%PACKAGE% del release\%PACKAGE% +cd /d %RELEASEDIR% +echo Current directory[%CD%] + +..\..\..\..\data\glest_game\7z.exe a -mmt -mx=9 -ms=on -mhc=on ..\%PACKAGE% * + +dir "..\%PACKAGE%" +cd /d "%~dp0" + +pause \ No newline at end of file diff --git a/mk/windoze/xml2g.vcxproj b/mk/windoze/xml2g.vcxproj index 9c955344..dfce64f4 100644 --- a/mk/windoze/xml2g.vcxproj +++ b/mk/windoze/xml2g.vcxproj @@ -43,6 +43,7 @@ .\..\..\data\glest_game\ $(Configuration)\ false + false