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

Updated win32 solution and also made mgm files optional (not required) so that mega-glest will work with or without the new 8 player maps

This commit is contained in:
Mark Vejvoda 2010-03-09 00:43:46 +00:00
parent 3041efaa77
commit 4ecc284f75
11 changed files with 924 additions and 915 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mk/linux/glest
View File

@ -19,6 +19,7 @@ cd $GAMEDIR
# export game library directory # export game library directory
test -n "${LIBDIR}" && export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${GAMEDIR}/${LIBDIR}" test -n "${LIBDIR}" && export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${GAMEDIR}/${LIBDIR}"
./glest.bin > glest.log 2>&1 #./glest.bin > glest.log 2>&1
./glest.bin
# ./glest > /tmp/`date +"%F_%k-%M-%S"`.glest.log 2>&1 # ./glest > /tmp/`date +"%F_%k-%M-%S"`.glest.log 2>&1

BIN
mk/windoze/Glest.suo
View File

Binary file not shown.

16
mk/windoze/g3d_viewer.vcproj
View File

@ -39,7 +39,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="&quot;W:\glest\megaglest\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\mswd&quot;;&quot;W:\glest\megaglest\source\win32_deps\wxWidgets-2.8.10\include\msvc&quot;;W:\glest\megaglest\source\shared_lib\include\util;W:\glest\megaglest\source\shared_lib\include\platform\win32;W:\glest\megaglest\source\shared_lib\include\graphics\gl;W:\glest\megaglest\source\win32_deps\include;W:\glest\megaglest\source\shared_lib\include\graphics;&quot;W:\glest\megaglest\source\win32_deps\wxWidgets-2.8.10\include&quot;" AdditionalIncludeDirectories="&quot;..\..\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\mswd&quot;;&quot;..\..\source\win32_deps\wxWidgets-2.8.10\include\msvc&quot;;..\..\source\shared_lib\include\util;..\..\source\shared_lib\include\platform\win32;..\..\source\shared_lib\include\graphics\gl;..\..\source\win32_deps\include;..\..\source\shared_lib\include\graphics;&quot;..\..\source\win32_deps\wxWidgets-2.8.10\include&quot;"
PreprocessorDefinitions="MWIN;__WXMSW__;__WXDEBUG__" PreprocessorDefinitions="MWIN;__WXMSW__;__WXDEBUG__"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -65,7 +65,7 @@
AdditionalDependencies="wxbase28d.lib wxbase28d_net.lib wxbase28d_xml.lib wxexpatd.lib wxjpegd.lib wxmsw28d_adv.lib wxmsw28d_aui.lib wxmsw28d_core.lib wxmsw28d_gl.lib wxmsw28d_html.lib wxmsw28d_media.lib wxmsw28d_qa.lib wxmsw28d_richtext.lib wxmsw28d_xrc.lib wxpngd.lib wxregexd.lib wxtiffd.lib wxzlibd.lib ..\libglest.lib kernel32.lib user32.lib gdi32.lib ole32.lib oleaut32.lib comctl32.lib comdlg32.lib uuid.lib advapi32.lib shell32.lib winmm.lib rpcrt4.lib" AdditionalDependencies="wxbase28d.lib wxbase28d_net.lib wxbase28d_xml.lib wxexpatd.lib wxjpegd.lib wxmsw28d_adv.lib wxmsw28d_aui.lib wxmsw28d_core.lib wxmsw28d_gl.lib wxmsw28d_html.lib wxmsw28d_media.lib wxmsw28d_qa.lib wxmsw28d_richtext.lib wxmsw28d_xrc.lib wxpngd.lib wxregexd.lib wxtiffd.lib wxzlibd.lib ..\libglest.lib kernel32.lib user32.lib gdi32.lib ole32.lib oleaut32.lib comctl32.lib comdlg32.lib uuid.lib advapi32.lib shell32.lib winmm.lib rpcrt4.lib"
OutputFile="$(OutDir)\G3D_Viewer.exe" OutputFile="$(OutDir)\G3D_Viewer.exe"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="W:\glest\megaglest\source\win32_deps\lib" AdditionalLibraryDirectories="..\..\source\win32_deps\lib"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
TargetMachine="1" TargetMachine="1"
@ -115,7 +115,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;W:\glest\megaglest\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\mswd&quot;;&quot;W:\glest\megaglest\source\win32_deps\wxWidgets-2.8.10\include\msvc&quot;;W:\glest\megaglest\source\shared_lib\include\util;W:\glest\megaglest\source\shared_lib\include\platform\win32;W:\glest\megaglest\source\shared_lib\include\graphics\gl;W:\glest\megaglest\source\win32_deps\include;W:\glest\megaglest\source\shared_lib\include\graphics;&quot;W:\glest\megaglest\source\win32_deps\wxWidgets-2.8.10\include&quot;" AdditionalIncludeDirectories="&quot;..\..\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\mswd&quot;;&quot;..\..\source\win32_deps\wxWidgets-2.8.10\include\msvc&quot;;..\..\source\shared_lib\include\util;..\..\source\shared_lib\include\platform\win32;..\..\source\shared_lib\include\graphics\gl;..\..\source\win32_deps\include;..\..\source\shared_lib\include\graphics;&quot;..\..\source\win32_deps\wxWidgets-2.8.10\include&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;"
RuntimeLibrary="0" RuntimeLibrary="0"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
@ -178,11 +178,11 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
<File <File
RelativePath=".\main.h" RelativePath="..\..\source\g3d_viewer\main.h"
> >
</File> </File>
<File <File
RelativePath=".\renderer.h" RelativePath="..\..\source\g3d_viewer\renderer.h"
> >
</File> </File>
</Filter> </Filter>
@ -192,7 +192,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
> >
<File <File
RelativePath="..\..\mk\windoze\glest.rc" RelativePath=".\glest.rc"
> >
</File> </File>
</Filter> </Filter>
@ -202,11 +202,11 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File <File
RelativePath=".\main.cpp" RelativePath="..\..\source\g3d_viewer\main.cpp"
> >
</File> </File>
<File <File
RelativePath=".\renderer.cpp" RelativePath="..\..\source\g3d_viewer\renderer.cpp"
> >
</File> </File>
</Filter> </Filter>

24
mk/windoze/glest_editor.vcproj
View File

@ -40,7 +40,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="&quot;W:\glest\megaglest\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\mswd&quot;;&quot;W:\glest\megaglest\source\win32_deps\wxWidgets-2.8.10\include\msvc&quot;;W:\glest\megaglest\source\shared_lib\include\util;W:\glest\megaglest\source\shared_lib\include\platform\win32;W:\glest\megaglest\source\shared_lib\include\graphics\gl;W:\glest\megaglest\source\win32_deps\include;W:\glest\megaglest\source\shared_lib\include\graphics;&quot;W:\glest\megaglest\source\win32_deps\wxWidgets-2.8.10\include&quot;" AdditionalIncludeDirectories="&quot;..\..\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\mswd&quot;;&quot;..\..\source\win32_deps\wxWidgets-2.8.10\include\msvc&quot;;..\..\source\shared_lib\include\util;..\..\source\shared_lib\include\platform\win32;..\..\source\shared_lib\include\graphics\gl;..\..\source\win32_deps\include;..\..\source\shared_lib\include\graphics;&quot;..\..\source\win32_deps\wxWidgets-2.8.10\include&quot;"
PreprocessorDefinitions="MWIN;__WXMSW__;__WXDEBUG__" PreprocessorDefinitions="MWIN;__WXMSW__;__WXDEBUG__"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -66,7 +66,7 @@
AdditionalDependencies="wxbase28d.lib wxbase28d_net.lib wxbase28d_xml.lib wxexpatd.lib wxjpegd.lib wxmsw28d_adv.lib wxmsw28d_aui.lib wxmsw28d_core.lib wxmsw28d_gl.lib wxmsw28d_html.lib wxmsw28d_media.lib wxmsw28d_qa.lib wxmsw28d_richtext.lib wxmsw28d_xrc.lib wxpngd.lib wxregexd.lib wxtiffd.lib wxzlibd.lib winmm.lib rpcrt4.lib kernel32.lib user32.lib gdi32.lib ole32.lib oleaut32.lib comctl32.lib comdlg32.lib uuid.lib advapi32.lib shell32.lib" AdditionalDependencies="wxbase28d.lib wxbase28d_net.lib wxbase28d_xml.lib wxexpatd.lib wxjpegd.lib wxmsw28d_adv.lib wxmsw28d_aui.lib wxmsw28d_core.lib wxmsw28d_gl.lib wxmsw28d_html.lib wxmsw28d_media.lib wxmsw28d_qa.lib wxmsw28d_richtext.lib wxmsw28d_xrc.lib wxpngd.lib wxregexd.lib wxtiffd.lib wxzlibd.lib winmm.lib rpcrt4.lib kernel32.lib user32.lib gdi32.lib ole32.lib oleaut32.lib comctl32.lib comdlg32.lib uuid.lib advapi32.lib shell32.lib"
OutputFile="$(OutDir)\Glest_Editor.exe" OutputFile="$(OutDir)\Glest_Editor.exe"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="W:\glest\megaglest\source\win32_deps\lib" AdditionalLibraryDirectories="..\..\source\win32_deps\lib"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
TargetMachine="1" TargetMachine="1"
@ -116,7 +116,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;W:\glest\megaglest\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\msw&quot;;&quot;W:\glest\megaglest\source\win32_deps\wxWidgets-2.8.10\include\msvc&quot;;W:\glest\megaglest\source\shared_lib\include\util;W:\glest\megaglest\source\shared_lib\include\platform\win32;W:\glest\megaglest\source\shared_lib\include\graphics\gl;W:\glest\megaglest\source\win32_deps\include;W:\glest\megaglest\source\shared_lib\include\graphics;&quot;W:\glest\megaglest\source\win32_deps\wxWidgets-2.8.10\include&quot;" AdditionalIncludeDirectories="&quot;..\..\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\msw&quot;;&quot;..\..\source\win32_deps\wxWidgets-2.8.10\include\msvc&quot;;..\..\source\shared_lib\include\util;..\..\source\shared_lib\include\platform\win32;..\..\source\shared_lib\include\graphics\gl;..\..\source\win32_deps\include;..\..\source\shared_lib\include\graphics;&quot;..\..\source\win32_deps\wxWidgets-2.8.10\include&quot;"
PreprocessorDefinitions="MWIN;__WXMSW__" PreprocessorDefinitions="MWIN;__WXMSW__"
RuntimeLibrary="0" RuntimeLibrary="0"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
@ -179,19 +179,19 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
<File <File
RelativePath=".\main.h" RelativePath="..\..\source\glest_map_editor\main.h"
> >
</File> </File>
<File <File
RelativePath=".\map.h" RelativePath="..\..\source\glest_map_editor\map.h"
> >
</File> </File>
<File <File
RelativePath=".\program.h" RelativePath="..\..\source\glest_map_editor\program.h"
> >
</File> </File>
<File <File
RelativePath=".\renderer.h" RelativePath="..\..\source\glest_map_editor\renderer.h"
> >
</File> </File>
</Filter> </Filter>
@ -201,7 +201,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
> >
<File <File
RelativePath="..\..\mk\windoze\glest.rc" RelativePath=".\glest.rc"
> >
</File> </File>
</Filter> </Filter>
@ -211,19 +211,19 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File <File
RelativePath=".\main.cpp" RelativePath="..\..\source\glest_map_editor\main.cpp"
> >
</File> </File>
<File <File
RelativePath=".\map.cpp" RelativePath="..\..\source\glest_map_editor\map.cpp"
> >
</File> </File>
<File <File
RelativePath=".\program.cpp" RelativePath="..\..\source\glest_map_editor\program.cpp"
> >
</File> </File>
<File <File
RelativePath=".\renderer.cpp" RelativePath="..\..\source\glest_map_editor\renderer.cpp"
> >
</File> </File>
</Filter> </Filter>

4
mk/windoze/glest_game.vcproj
View File

@ -388,6 +388,10 @@
RelativePath="..\..\source\glest_game\graphics\renderer.h" RelativePath="..\..\source\glest_game\graphics\renderer.h"
> >
</File> </File>
<File
RelativePath="..\..\source\glest_game\graphics\unit_particle_type.cpp"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="gui" Name="gui"

5
source/glest_game/menu/menu_state_custom_game.cpp
View File

@ -51,8 +51,9 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, b
buttonPlayNow.init(525, 140, 125); buttonPlayNow.init(525, 140, 125);
//map listBox //map listBox
findAll("maps/*.gbm", glestMaps, true); findAll("maps/*.gbm", glestMaps, true, true);
findAll("maps/*.mgm", megaMaps, true); findAll("maps/*.mgm", megaMaps, true, false);
mapFiles.resize(glestMaps.size() + megaMaps.size()); mapFiles.resize(glestMaps.size() + megaMaps.size());
if (!glestMaps.empty()) { if (!glestMaps.empty()) {
copy(glestMaps.begin(), glestMaps.end(), mapFiles.begin()); copy(glestMaps.begin(), glestMaps.end(), mapFiles.begin());

1
source/glest_map_editor/main.cpp
View File

@ -16,6 +16,7 @@
#include <ctime> #include <ctime>
#include "conversion.h" #include "conversion.h"
#include <iostream>
using namespace Shared::Util; using namespace Shared::Util;
using namespace std; using namespace std;

2
source/shared_lib/include/platform/sdl/platform_util.h
View File

@ -88,7 +88,7 @@ public:
// Misc // Misc
// ===================================================== // =====================================================
void findAll(const string &path, vector<string> &results, bool cutExtension=false); void findAll(const string &path, vector<string> &results, bool cutExtension=false, bool errorOnNotFound=true);
int32 getFolderTreeContentsCheckSumRecursively(const string &path, const string &filterFileExt, Checksum *recursiveChecksum); int32 getFolderTreeContentsCheckSumRecursively(const string &path, const string &filterFileExt, Checksum *recursiveChecksum);
vector<std::pair<string,int32> > getFolderTreeContentsCheckSumListRecursively(const string &path, const string &filterFileExt, vector<std::pair<string,int32> > *recursiveMap); vector<std::pair<string,int32> > getFolderTreeContentsCheckSumListRecursively(const string &path, const string &filterFileExt, vector<std::pair<string,int32> > *recursiveMap);
void createDirectoryPaths(string Path); void createDirectoryPaths(string Path);

2
source/shared_lib/include/platform/win32/platform_util.h
View File

@ -98,7 +98,7 @@ public:
// Misc // Misc
// ===================================================== // =====================================================
void findAll(const string &path, vector<string> &results, bool cutExtension=false); void findAll(const string &path, vector<string> &results, bool cutExtension=false, bool errorOnNotFound=true);
int32 getFolderTreeContentsCheckSumRecursively(const string &path, const string &filterFileExt, Checksum *recursiveChecksum); int32 getFolderTreeContentsCheckSumRecursively(const string &path, const string &filterFileExt, Checksum *recursiveChecksum);
vector<std::pair<string,int32> > getFolderTreeContentsCheckSumListRecursively(const string &path, const string &filterFileExt, vector<std::pair<string,int32> > *recursiveMap); vector<std::pair<string,int32> > getFolderTreeContentsCheckSumListRecursively(const string &path, const string &filterFileExt, vector<std::pair<string,int32> > *recursiveMap);
void createDirectoryPaths(string Path); void createDirectoryPaths(string Path);

6
source/shared_lib/sources/platform/sdl/platform_util.cpp
View File

@ -119,7 +119,7 @@ int64 Chrono::queryCounter(int multiplier) const {
// ===================================== // =====================================
//finds all filenames like path and stores them in resultys //finds all filenames like path and stores them in resultys
void findAll(const string &path, vector<string> &results, bool cutExtension) { void findAll(const string &path, vector<string> &results, bool cutExtension, bool errorOnNotFound) {
results.clear(); results.clear();
std::string mypath = path; std::string mypath = path;
@ -131,6 +131,8 @@ void findAll(const string &path, vector<string> &results, bool cutExtension) {
mypath += "*"; mypath += "*";
} }
if(Socket::enableDebugText) printf("In [%s::%s] scanning [%s]\n",__FILE__,__FUNCTION__,mypath.c_str());
glob_t globbuf; glob_t globbuf;
int res = glob(mypath.c_str(), 0, 0, &globbuf); int res = glob(mypath.c_str(), 0, 0, &globbuf);
@ -153,7 +155,7 @@ void findAll(const string &path, vector<string> &results, bool cutExtension) {
globfree(&globbuf); globfree(&globbuf);
if(results.size() == 0) { if(results.size() == 0 && errorOnNotFound == true) {
throw runtime_error("No files found in: " + mypath); throw runtime_error("No files found in: " + mypath);
} }

6
source/shared_lib/sources/platform/win32/platform_util.cpp
View File

@ -163,7 +163,7 @@ void PlatformExceptionHandler::install(string dumpFileName){
// ===================================================== // =====================================================
//finds all filenames like path and stores them in resultys //finds all filenames like path and stores them in resultys
void findAll(const string &path, vector<string> &results, bool cutExtension){ void findAll(const string &path, vector<string> &results, bool cutExtension, bool errorOnNotFound){
int i= 0; int i= 0;
struct _finddata_t fi; struct _finddata_t fi;
@ -184,11 +184,11 @@ void findAll(const string &path, vector<string> &results, bool cutExtension){
} }
while(_findnext(handle, &fi)==0); while(_findnext(handle, &fi)==0);
} }
else{ else if(errorOnNotFound == true){
throw runtime_error("Error opening files: "+ path); throw runtime_error("Error opening files: "+ path);
} }
if(i==0){ if(i==0 && errorOnNotFound == true){
throw runtime_error("No files found: "+ path); throw runtime_error("No files found: "+ path);
} }