games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

[c::b] update projects, disable PHC for now, +few fixes (still wip)

Browse Source
This commit is contained in:
alexvins
2014-01-05 17:48:50 +00:00
parent 1f325bafb3
commit a740f7989c
11 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AI/BattleAI/BattleAI.cbp
View File

@@ -50,7 +50,6 @@
<Unit filename="BattleAI.cpp" /> <Unit filename="BattleAI.cpp" />
<Unit filename="BattleAI.h" /> <Unit filename="BattleAI.h" />
<Unit filename="StdInc.h"> <Unit filename="StdInc.h">
<Option compile="1" />
<Option weight="0" /> <Option weight="0" />
</Unit> </Unit>
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />

1
AI/EmptyAI/EmptyAI.cbp
View File

@@ -51,7 +51,6 @@
<Unit filename="CEmptyAI.cpp" /> <Unit filename="CEmptyAI.cpp" />
<Unit filename="CEmptyAI.h" /> <Unit filename="CEmptyAI.h" />
<Unit filename="StdInc.h"> <Unit filename="StdInc.h">
<Option compile="1" />
<Option weight="0" /> <Option weight="0" />
</Unit> </Unit>
<Unit filename="exp_funcs.cpp" /> <Unit filename="exp_funcs.cpp" />

1
AI/StupidAI/StupidAI.cbp
View File

@@ -51,7 +51,6 @@
<Add directory="../.." /> <Add directory="../.." />
</Linker> </Linker>
<Unit filename="StdInc.h"> <Unit filename="StdInc.h">
<Option compile="1" />
<Option weight="0" /> <Option weight="0" />
</Unit> </Unit>
<Unit filename="StupidAI.cpp" /> <Unit filename="StupidAI.cpp" />

1
AI/VCAI/VCAI.cbp
View File

@@ -60,7 +60,6 @@
<Unit filename="Fuzzy.cpp" /> <Unit filename="Fuzzy.cpp" />
<Unit filename="Fuzzy.h" /> <Unit filename="Fuzzy.h" />
<Unit filename="StdInc.h"> <Unit filename="StdInc.h">
<Option compile="1" />
<Option weight="0" /> <Option weight="0" />
</Unit> </Unit>
<Unit filename="VCAI.cpp" /> <Unit filename="VCAI.cpp" />

2
client/CMT.cpp
View File

@@ -193,7 +193,7 @@ static void prog_help(const po::options_description &opts)
void OSX_checkForUpdates(); void OSX_checkForUpdates();
#endif #endif
#ifdef _WIN32 #if defined(_WIN32) && !defined (__GNUC__)
int wmain(int argc, wchar_t* argv[]) int wmain(int argc, wchar_t* argv[])
#elif defined(__APPLE__) #elif defined(__APPLE__)
int SDL_main(int argc, char *argv[]) int SDL_main(int argc, char *argv[])

1
client/VCMI_client.cbp
View File

@@ -116,7 +116,6 @@
<Unit filename="NetPacksClient.cpp" /> <Unit filename="NetPacksClient.cpp" />
<Unit filename="SDLMain.h" /> <Unit filename="SDLMain.h" />
<Unit filename="StdInc.h"> <Unit filename="StdInc.h">
<Option compile="1" />
<Option weight="0" /> <Option weight="0" />
</Unit> </Unit>
<Unit filename="VCMI_client.rc"> <Unit filename="VCMI_client.rc">

5
lib/VCMI_lib.cbp
View File

@@ -46,6 +46,7 @@
<Add option="-Wno-sign-compare" /> <Add option="-Wno-sign-compare" />
<Add option="-Wno-unused-parameter" /> <Add option="-Wno-unused-parameter" />
<Add option="-Wno-overloaded-virtual" /> <Add option="-Wno-overloaded-virtual" />
<Add option="-Wno-unused-local-typedefs" />
<Add option="-DVCMI_DLL" /> <Add option="-DVCMI_DLL" />
<Add option="-DBOOST_THREAD_USE_LIB" /> <Add option="-DBOOST_THREAD_USE_LIB" />
<Add option="-D_WIN32_WINNT=0x0501" /> <Add option="-D_WIN32_WINNT=0x0501" />
@@ -62,8 +63,10 @@
<Add option="-lboost_system$(#boost.libsuffix)" /> <Add option="-lboost_system$(#boost.libsuffix)" />
<Add option="-lboost_thread$(#boost.libsuffix)" /> <Add option="-lboost_thread$(#boost.libsuffix)" />
<Add option="-lboost_chrono$(#boost.libsuffix)" /> <Add option="-lboost_chrono$(#boost.libsuffix)" />
<Add option="-lboost_locale$(#boost.libsuffix)" />
<Add directory="$(#boost.lib)" /> <Add directory="$(#boost.lib)" />
<Add directory="$(#sdl.lib)" /> <Add directory="$(#sdl.lib)" />
<Add directory="../" />
</Linker> </Linker>
<Unit filename="AI_Base.h" /> <Unit filename="AI_Base.h" />
<Unit filename="BattleAction.cpp" /> <Unit filename="BattleAction.cpp" />
@@ -143,7 +146,6 @@
<Unit filename="ScopeGuard.h" /> <Unit filename="ScopeGuard.h" />
<Unit filename="StartInfo.h" /> <Unit filename="StartInfo.h" />
<Unit filename="StdInc.h"> <Unit filename="StdInc.h">
<Option compile="1" />
<Option weight="0" /> <Option weight="0" />
</Unit> </Unit>
<Unit filename="StringConstants.h" /> <Unit filename="StringConstants.h" />
@@ -169,7 +171,6 @@
<Unit filename="filesystem/CInputStream.h" /> <Unit filename="filesystem/CInputStream.h" />
<Unit filename="filesystem/CMemoryStream.cpp" /> <Unit filename="filesystem/CMemoryStream.cpp" />
<Unit filename="filesystem/CMemoryStream.h" /> <Unit filename="filesystem/CMemoryStream.h" />
<Unit filename="filesystem/CResourceLoader.cpp" />
<Unit filename="filesystem/CZipLoader.cpp" /> <Unit filename="filesystem/CZipLoader.cpp" />
<Unit filename="filesystem/CZipLoader.h" /> <Unit filename="filesystem/CZipLoader.h" />
<Unit filename="filesystem/Filesystem.cpp" /> <Unit filename="filesystem/Filesystem.cpp" />

4
lib/minizip/minizip.cbp
View File

@@ -7,6 +7,7 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Build> <Build>
<Target title="Debug"> <Target title="Debug">
<Option platforms="Windows;" />
<Option output="../../minizip" prefix_auto="1" extension_auto="1" /> <Option output="../../minizip" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/Debug/" /> <Option object_output="obj/Debug/" />
<Option type="3" /> <Option type="3" />
@@ -19,11 +20,10 @@
</Compiler> </Compiler>
</Target> </Target>
<Target title="Release"> <Target title="Release">
<Option output="bin/Release/minizip" prefix_auto="1" extension_auto="1" /> <Option output="../../minizip" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/Release/" /> <Option object_output="obj/Release/" />
<Option type="3" /> <Option type="3" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option createDefFile="1" />
<Option createStaticLib="1" /> <Option createStaticLib="1" />
<Compiler> <Compiler>
<Add option="-O2" /> <Add option="-O2" />

6
server/CVCMIServer.cpp
View File

@@ -32,7 +32,7 @@
#include "../lib/UnlockGuard.h" #include "../lib/UnlockGuard.h"
#ifdef __GNUC__ #if defined(__GNUC__) && !defined (__MINGW32__)
#include <execinfo.h> #include <execinfo.h>
#endif #endif
@@ -535,7 +535,7 @@ static void handleCommandOptions(int argc, char *argv[])
po::notify(cmdLineOptions); po::notify(cmdLineOptions);
} }
#ifdef __GNUC__ #if defined(__GNUC__) && !defined (__MINGW32__)
void handleLinuxSignal(int sig) void handleLinuxSignal(int sig)
{ {
const int STACKTRACE_SIZE = 100; const int STACKTRACE_SIZE = 100;
@@ -566,7 +566,7 @@ int main(int argc, char** argv)
{ {
// Installs a sig sev segmentation violation handler // Installs a sig sev segmentation violation handler
// to log stacktrace // to log stacktrace
#ifdef __GNUC__ #if defined(__GNUC__) && !defined (__MINGW32__)
signal(SIGSEGV, handleLinuxSignal); signal(SIGSEGV, handleLinuxSignal);
#endif #endif

1
server/VCMI_server.cbp
View File

@@ -67,7 +67,6 @@
<Unit filename="CVCMIServer.h" /> <Unit filename="CVCMIServer.h" />
<Unit filename="NetPacksServer.cpp" /> <Unit filename="NetPacksServer.cpp" />
<Unit filename="StdInc.h"> <Unit filename="StdInc.h">
<Option compile="1" />
<Option weight="0" /> <Option weight="0" />
</Unit> </Unit>
<Extensions> <Extensions>

4
vcmi.workspace
View File

@@ -2,7 +2,9 @@
<CodeBlocks_workspace_file> <CodeBlocks_workspace_file>
<Workspace title="vcmi"> <Workspace title="vcmi">
<Project filename="lib/minizip/minizip.cbp" /> <Project filename="lib/minizip/minizip.cbp" />
<Project filename="lib/VCMI_lib.cbp" /> <Project filename="lib/VCMI_lib.cbp">
<Depends filename="lib/minizip/minizip.cbp" />
</Project>
<Project filename="client/VCMI_client.cbp"> <Project filename="client/VCMI_client.cbp">
<Depends filename="lib/VCMI_lib.cbp" /> <Depends filename="lib/VCMI_lib.cbp" />
</Project> </Project>