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:
parent
3041efaa77
commit
4ecc284f75
|
@ -19,6 +19,7 @@ cd $GAMEDIR
|
|||
# export game library directory
|
||||
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
|
||||
|
||||
|
|
Binary file not shown.
|
@ -39,7 +39,7 @@
|
|||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""W:\glest\megaglest\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\mswd";"W:\glest\megaglest\source\win32_deps\wxWidgets-2.8.10\include\msvc";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;"W:\glest\megaglest\source\win32_deps\wxWidgets-2.8.10\include""
|
||||
AdditionalIncludeDirectories=""..\..\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\mswd";"..\..\source\win32_deps\wxWidgets-2.8.10\include\msvc";..\..\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;"..\..\source\win32_deps\wxWidgets-2.8.10\include""
|
||||
PreprocessorDefinitions="MWIN;__WXMSW__;__WXDEBUG__"
|
||||
MinimalRebuild="true"
|
||||
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"
|
||||
OutputFile="$(OutDir)\G3D_Viewer.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="W:\glest\megaglest\source\win32_deps\lib"
|
||||
AdditionalLibraryDirectories="..\..\source\win32_deps\lib"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
TargetMachine="1"
|
||||
|
@ -115,7 +115,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories=""W:\glest\megaglest\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\mswd";"W:\glest\megaglest\source\win32_deps\wxWidgets-2.8.10\include\msvc";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;"W:\glest\megaglest\source\win32_deps\wxWidgets-2.8.10\include""
|
||||
AdditionalIncludeDirectories=""..\..\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\mswd";"..\..\source\win32_deps\wxWidgets-2.8.10\include\msvc";..\..\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;"..\..\source\win32_deps\wxWidgets-2.8.10\include""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;"
|
||||
RuntimeLibrary="0"
|
||||
UsePrecompiledHeader="0"
|
||||
|
@ -178,11 +178,11 @@
|
|||
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
|
||||
>
|
||||
<File
|
||||
RelativePath=".\main.h"
|
||||
RelativePath="..\..\source\g3d_viewer\main.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\renderer.h"
|
||||
RelativePath="..\..\source\g3d_viewer\renderer.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
|
@ -192,7 +192,7 @@
|
|||
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\mk\windoze\glest.rc"
|
||||
RelativePath=".\glest.rc"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
|
@ -202,11 +202,11 @@
|
|||
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
|
||||
>
|
||||
<File
|
||||
RelativePath=".\main.cpp"
|
||||
RelativePath="..\..\source\g3d_viewer\main.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\renderer.cpp"
|
||||
RelativePath="..\..\source\g3d_viewer\renderer.cpp"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""W:\glest\megaglest\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\mswd";"W:\glest\megaglest\source\win32_deps\wxWidgets-2.8.10\include\msvc";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;"W:\glest\megaglest\source\win32_deps\wxWidgets-2.8.10\include""
|
||||
AdditionalIncludeDirectories=""..\..\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\mswd";"..\..\source\win32_deps\wxWidgets-2.8.10\include\msvc";..\..\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;"..\..\source\win32_deps\wxWidgets-2.8.10\include""
|
||||
PreprocessorDefinitions="MWIN;__WXMSW__;__WXDEBUG__"
|
||||
MinimalRebuild="true"
|
||||
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"
|
||||
OutputFile="$(OutDir)\Glest_Editor.exe"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="W:\glest\megaglest\source\win32_deps\lib"
|
||||
AdditionalLibraryDirectories="..\..\source\win32_deps\lib"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
TargetMachine="1"
|
||||
|
@ -116,7 +116,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories=""W:\glest\megaglest\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\msw";"W:\glest\megaglest\source\win32_deps\wxWidgets-2.8.10\include\msvc";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;"W:\glest\megaglest\source\win32_deps\wxWidgets-2.8.10\include""
|
||||
AdditionalIncludeDirectories=""..\..\source\win32_deps\wxWidgets-2.8.10\lib\vc_lib\msw";"..\..\source\win32_deps\wxWidgets-2.8.10\include\msvc";..\..\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;"..\..\source\win32_deps\wxWidgets-2.8.10\include""
|
||||
PreprocessorDefinitions="MWIN;__WXMSW__"
|
||||
RuntimeLibrary="0"
|
||||
UsePrecompiledHeader="0"
|
||||
|
@ -179,19 +179,19 @@
|
|||
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
|
||||
>
|
||||
<File
|
||||
RelativePath=".\main.h"
|
||||
RelativePath="..\..\source\glest_map_editor\main.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\map.h"
|
||||
RelativePath="..\..\source\glest_map_editor\map.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\program.h"
|
||||
RelativePath="..\..\source\glest_map_editor\program.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\renderer.h"
|
||||
RelativePath="..\..\source\glest_map_editor\renderer.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
|
@ -201,7 +201,7 @@
|
|||
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\mk\windoze\glest.rc"
|
||||
RelativePath=".\glest.rc"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
|
@ -211,19 +211,19 @@
|
|||
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
|
||||
>
|
||||
<File
|
||||
RelativePath=".\main.cpp"
|
||||
RelativePath="..\..\source\glest_map_editor\main.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\map.cpp"
|
||||
RelativePath="..\..\source\glest_map_editor\map.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\program.cpp"
|
||||
RelativePath="..\..\source\glest_map_editor\program.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\renderer.cpp"
|
||||
RelativePath="..\..\source\glest_map_editor\renderer.cpp"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
|
|
|
@ -388,6 +388,10 @@
|
|||
RelativePath="..\..\source\glest_game\graphics\renderer.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\source\glest_game\graphics\unit_particle_type.cpp"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="gui"
|
||||
|
|
|
@ -51,8 +51,9 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, b
|
|||
buttonPlayNow.init(525, 140, 125);
|
||||
|
||||
//map listBox
|
||||
findAll("maps/*.gbm", glestMaps, true);
|
||||
findAll("maps/*.mgm", megaMaps, true);
|
||||
findAll("maps/*.gbm", glestMaps, true, true);
|
||||
findAll("maps/*.mgm", megaMaps, true, false);
|
||||
|
||||
mapFiles.resize(glestMaps.size() + megaMaps.size());
|
||||
if (!glestMaps.empty()) {
|
||||
copy(glestMaps.begin(), glestMaps.end(), mapFiles.begin());
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -88,7 +88,7 @@ public:
|
|||
// 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);
|
||||
vector<std::pair<string,int32> > getFolderTreeContentsCheckSumListRecursively(const string &path, const string &filterFileExt, vector<std::pair<string,int32> > *recursiveMap);
|
||||
void createDirectoryPaths(string Path);
|
||||
|
|
|
@ -98,7 +98,7 @@ public:
|
|||
// 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);
|
||||
vector<std::pair<string,int32> > getFolderTreeContentsCheckSumListRecursively(const string &path, const string &filterFileExt, vector<std::pair<string,int32> > *recursiveMap);
|
||||
void createDirectoryPaths(string Path);
|
||||
|
|
|
@ -119,7 +119,7 @@ int64 Chrono::queryCounter(int multiplier) const {
|
|||
// =====================================
|
||||
|
||||
//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();
|
||||
|
||||
std::string mypath = path;
|
||||
|
@ -131,6 +131,8 @@ void findAll(const string &path, vector<string> &results, bool cutExtension) {
|
|||
mypath += "*";
|
||||
}
|
||||
|
||||
if(Socket::enableDebugText) printf("In [%s::%s] scanning [%s]\n",__FILE__,__FUNCTION__,mypath.c_str());
|
||||
|
||||
glob_t 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);
|
||||
|
||||
if(results.size() == 0) {
|
||||
if(results.size() == 0 && errorOnNotFound == true) {
|
||||
throw runtime_error("No files found in: " + mypath);
|
||||
}
|
||||
|
||||
|
|
|
@ -163,7 +163,7 @@ void PlatformExceptionHandler::install(string dumpFileName){
|
|||
// =====================================================
|
||||
|
||||
//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;
|
||||
struct _finddata_t fi;
|
||||
|
@ -184,11 +184,11 @@ void findAll(const string &path, vector<string> &results, bool cutExtension){
|
|||
}
|
||||
while(_findnext(handle, &fi)==0);
|
||||
}
|
||||
else{
|
||||
else if(errorOnNotFound == true){
|
||||
throw runtime_error("Error opening files: "+ path);
|
||||
}
|
||||
|
||||
if(i==0){
|
||||
if(i==0 && errorOnNotFound == true){
|
||||
throw runtime_error("No files found: "+ path);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue