Updated VS project file, fixed minor compilation and style

problems (note: atm addons are not compiled on VS).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5600 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2010-07-01 00:14:56 +00:00
parent 9698b08b87
commit 5fcd69554e
3 changed files with 67 additions and 9 deletions

View File

@ -821,6 +821,14 @@
<Filter
Name="states_screen"
>
<File
RelativePath="..\..\states_screens\addons_screen.cpp"
>
</File>
<File
RelativePath="..\..\states_screens\addons_update_screen.cpp"
>
</File>
<File
RelativePath="..\..\states_screens\arenas_screen.cpp"
>
@ -908,6 +916,10 @@
RelativePath="..\..\states_screens\dialogs\add_device_dialog.cpp"
>
</File>
<File
RelativePath="..\..\states_screens\dialogs\addons_loading.cpp"
>
</File>
<File
RelativePath="..\..\states_screens\dialogs\confirm_resolution_dialog.cpp"
>
@ -942,6 +954,22 @@
</File>
</Filter>
</Filter>
<Filter
Name="addons"
>
<File
RelativePath="..\..\addons\addons.cpp"
>
</File>
<File
RelativePath="..\..\addons\network.cpp"
>
</File>
<File
RelativePath="..\..\addons\zip.cpp"
>
</File>
</Filter>
</Filter>
<Filter
Name="Headerdateien"
@ -1635,6 +1663,14 @@
<Filter
Name="states_screens"
>
<File
RelativePath="..\..\states_screens\addons_screen.hpp"
>
</File>
<File
RelativePath="..\..\states_screens\addons_update_screen.hpp"
>
</File>
<File
RelativePath="..\..\states_screens\arenas_screen.hpp"
>
@ -1722,6 +1758,10 @@
RelativePath="..\..\states_screens\dialogs\add_device_dialog.hpp"
>
</File>
<File
RelativePath="..\..\states_screens\dialogs\addons_loading.hpp"
>
</File>
<File
RelativePath="..\..\states_screens\dialogs\confirm_resolution_dialog.hpp"
>
@ -1756,6 +1796,22 @@
</File>
</Filter>
</Filter>
<Filter
Name="addons"
>
<File
RelativePath="..\..\addons\addons.hpp"
>
</File>
<File
RelativePath="..\..\addons\network.hpp"
>
</File>
<File
RelativePath="..\..\addons\zip.hpp"
>
</File>
</Filter>
</Filter>
<Filter
Name="Ressourcendateien"

View File

@ -19,6 +19,11 @@
#include "states_screens/addons_screen.hpp"
/*pthread aren't supported natively by windows. Here a port: http://sourceware.org/pthreads-win32/ */
# include <pthread.h>
# include <sstream>
#include "addons/addons.hpp"
#include "addons/network.hpp"
#include "guiengine/widget.hpp"
@ -29,11 +34,6 @@
#include "states_screens/state_manager.hpp"
#include "states_screens/dialogs/addons_loading.hpp"
/*pthread aren't supported natively by windows. Here a port: http://sourceware.org/pthreads-win32/ */
#include <pthread.h>
#include <sstream>
DEFINE_SCREEN_SINGLETON( AddonsUpdateScreen );
// ------------------------------------------------------------------------------------------------------
@ -147,5 +147,4 @@ void * startInstall(void* pthis)
obj->loadInformations();
return NULL;
}
#endif

View File

@ -17,6 +17,12 @@
#include "states_screens/main_menu_screen.hpp"
#include <iostream>
#include <string>
#ifdef ADDONS_MANAGER
# include <pthread.h>
#endif
#include "guiengine/widgets.hpp"
#include "karts/kart_properties_manager.hpp"
#include "main_loop.hpp"
@ -39,9 +45,6 @@
#include "tracks/track_manager.hpp"
#include "tracks/track.hpp"
#include <iostream>
#include <string>
#include <pthread.h>
using namespace GUIEngine;