[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] rev 2221 - in trunk: . src src/gui src/input/axes src/sound
|
From: |
Kenneth Gangstoe |
|
Subject: |
[Pingus-CVS] rev 2221 - in trunk: . src src/gui src/input/axes src/sound |
|
Date: |
Wed, 07 Apr 2004 12:51:47 +0200 |
Author: sphair
Date: 2004-04-07 12:51:46 +0200 (Wed, 07 Apr 2004)
New Revision: 2221
Modified:
trunk/INSTALL.Win32
trunk/Pingus.vcproj
trunk/src/globals.cxx
trunk/src/gui/display_graphic_context.cxx
trunk/src/input/axes/mouse_axis.cxx
trunk/src/pingus_main.cxx
trunk/src/sound/sound_real.cxx
Log:
- Fixed Release mode in VC.2003 workspace
- Updated Win32 guide
- Misc other win32 changes and cleanups
Modified: trunk/INSTALL.Win32
===================================================================
--- trunk/INSTALL.Win32 2004-04-07 08:35:55 UTC (rev 2220)
+++ trunk/INSTALL.Win32 2004-04-07 10:51:46 UTC (rev 2221)
@@ -6,17 +6,19 @@
Introduction
- The following instructions are only tested with Microsoft Visual C++ 6.
- To be able to compile pingus you need a working version of ClanLib
- which is correct installed. You should have both debug and release builds
- of the libraries.
+ The following instructions are only tested with Microsoft Visual Studio 6
+ and Visual Studio .NET 2003.
+
+ To be able to compile pingus you need a working version of ClanLib 0.7.8
+ or later which is correct installed. You should have both debug and release
+ builds of the libraries.
+
Please read also the normal INSTALL documentation.
_________________________________________________________________
1. Requirements for compiling Pingus
- First of all you need a Win32 operating system (you would not have
- guessed that :-) with Visual C++ 6 or Visual Studio 6 installed.
+ First of all you need a Win32 operating system with Visual Studio installed.
To compile Pingus you will need the following libraries:
@@ -26,45 +28,45 @@
-> libxml2
-> iconv
(Download at
http://www.fh-frankfurt.de/~igor/projects/libxml/index.html)
-
-
+
To compile ClanLib by yourself you will need several other libraries:
-> DirectX 8/8.1 SDK
- (Download at
http://msdn.microsoft.com/downloads/sample.asp?url=/MSDN-FILES/027/002/040/msdncompositedoc.xml)
+ (Download at
http://msdn.microsoft.com/library/default.asp?url=/downloads/list/directx.asp)
- -> Hermes
-> ZLib
-> LibJPEG
-> LibPNG
-> MikMod
-> Vorbis
- (Download at
http://www.clanlib.org/download/files/Hermes-1.3.2-win32.zip)
-> ClanLib itself
(Download at http://www.clanlib.org/)
- The sources of Hermes and ClanLib can also be found in the CVS tree
+ To make it easy, ClanLib provides all these external libs (dx8, xml, iconv,
+ zlib, jpeg, png, mikmod, vorbis) available in their External Libs package.
+ (Download at
http://www.clanlib.org/~sphair/download/external/ExternalLibs.zip)
+
+ If you download this package, you only need to download ClanLib and
nothing more
+ to compile both ClanLib and Pingus.
+
+ The sources of ClanLib can also be found in the CVS tree
(see Pingus website for more information).
_________________________________________________________________
-2. Compile Hermes
-
- Compiling the Hermes library is easy. It is documented quite well in the
- INSTALL.Win32 which comes with the sources.
-
- _________________________________________________________________
-
-3. Compile ClanLib (for further istructions read the INSTALL.win32 file
+2. Compile ClanLib (for further istructions read the INSTALL.win32 file
included in the ClanLib package)
- Compiling ClanLib is a bit tricky.
-
First step is to make sure all above mentioned libs are in the right place
(a place where MSVC++ can link against them). If you use diffrent paths
than your global include and lib path, you have to tell VC++:
+ Developer Studio .NET 2003:
+ Tools->Options->Projects->VC++ Directories
+ Add the Include and Lib paths to "Include Files", and "Library Files".
+
+ Developer Studio 6:
Extras->Optionen - tab Verzeichnisse #########FIXME: Dunno how the
menunames are in english :-( , someone please translate
After the libs are in the right place, you can open the configure.dsw for
@@ -97,27 +99,25 @@
_________________________________________________________________
-4. Compile Pingus
+3. Compile Pingus
- Before compiling Pingus you have to execute the vcfix.reg. It adds support
- for .cc and .cxx files to Visual C++.
+ Before compiling Pingus under VC 6, you have to execute the vcfix.reg.
+ It adds support for .cc and .cxx files to Visual C++ 6. This is not
+ neccessary under Visual Studio .NET.
- You have to copy the src\win32\config.h into the directory where your
- includes are.
-
- Open Pingus.dsw, change the active configuration to the "Win32 Release"
build
- (toolbar "Build") and compile it.
+ Open Pingus.dsw for VC 6, or Pingus.sln for VC.NET 2003, change the active
+ configuration to the "Win32 Release" build (toolbar "Build") and compile it.
If Pingus (or any other library) does not compile correctly, please inform
the Pingus developer mailing list (see Pingus homepage for information
about the mailing list)
+ _________________________________________________________________
+4. Run Pingus
+
+ Pingus needs some DLLs, namely iconv.dll, intl.dll and libxml2.dll. Copy
+ these into the Pingus main dir. They are included in the External Libs
+ package from clanlib.org.
-****************************************************************************
-FIXME: I did not yet compile Pingus completely, so this last part is still
under construction.
-
-
- Copy pingus.exe to the data\data directory.
- Do "pingus.exe -datafile name.scr name.dat" for every .scr file.
-
+ Hit Ctrl-F5 to run Pingus.
Modified: trunk/Pingus.vcproj
===================================================================
--- trunk/Pingus.vcproj 2004-04-07 08:35:55 UTC (rev 2220)
+++ trunk/Pingus.vcproj 2004-04-07 10:51:46 UTC (rev 2221)
@@ -24,6 +24,7 @@
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
@@ -69,8 +70,10 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="src\win32"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
- RuntimeLibrary="4"
+ RuntimeLibrary="0"
+ RuntimeTypeInfo="TRUE"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
@@ -79,6 +82,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="iconv.lib intl.lib
libxml2.lib"
OutputFile="$(OutDir)/Pingus.exe"
LinkIncremental="1"
GenerateDebugInformation="TRUE"
@@ -769,6 +773,12 @@
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+
ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCLCompilerTool"/>
+ </FileConfiguration>
</File>
<File
RelativePath=".\src\input\axes\mouse_axis.hxx">
@@ -778,6 +788,12 @@
<Tool
Name="VCCustomBuildTool"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+
ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCustomBuildTool"/>
+ </FileConfiguration>
</File>
<File
RelativePath=".\src\input\axes\multiple_axis.cxx">
@@ -959,6 +975,12 @@
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCLCompilerTool"/>
+ </FileConfiguration>
</File>
<File
RelativePath=".\src\sound\slot_manager.hxx">
@@ -968,6 +990,12 @@
<Tool
Name="VCCustomBuildTool"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCustomBuildTool"/>
+ </FileConfiguration>
</File>
<File
RelativePath=".\src\sound\sound.cxx">
@@ -1011,6 +1039,12 @@
Name="VCCLCompilerTool"
CompileAs="2"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"/>
+ </FileConfiguration>
</File>
<File
RelativePath=".\src\win32\Getopt.h">
@@ -1028,6 +1062,12 @@
Name="VCCLCompilerTool"
CompileAs="2"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"/>
+ </FileConfiguration>
</File>
<File
RelativePath=".\src\win32\pingus.rc">
@@ -1711,6 +1751,12 @@
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCLCompilerTool"/>
+ </FileConfiguration>
</File>
<File
RelativePath=".\src\indexed_canvas.hxx">
@@ -1720,6 +1766,12 @@
<Tool
Name="VCCustomBuildTool"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCustomBuildTool"/>
+ </FileConfiguration>
</File>
<File
RelativePath=".\src\indexHeader.inc">
@@ -1741,6 +1793,12 @@
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCLCompilerTool"/>
+ </FileConfiguration>
</File>
<File
RelativePath=".\src\level_desc.hxx">
@@ -1750,6 +1808,12 @@
<Tool
Name="VCCustomBuildTool"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCustomBuildTool"/>
+ </FileConfiguration>
</File>
<File
RelativePath=".\src\level_interrupt.cxx">
@@ -1765,6 +1829,12 @@
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCLCompilerTool"/>
+ </FileConfiguration>
</File>
<File
RelativePath=".\src\level_result.hxx">
@@ -1774,6 +1844,12 @@
<Tool
Name="VCCustomBuildTool"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCustomBuildTool"/>
+ </FileConfiguration>
</File>
<File
RelativePath=".\src\libxmlfwd.hxx">
@@ -2107,6 +2183,12 @@
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCLCompilerTool"/>
+ </FileConfiguration>
</File>
<File
RelativePath=".\src\target_provider.hxx">
@@ -2116,6 +2198,12 @@
<Tool
Name="VCCustomBuildTool"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCustomBuildTool"/>
+ </FileConfiguration>
</File>
<File
RelativePath=".\src\theme.cxx">
@@ -2131,6 +2219,12 @@
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCLCompilerTool"/>
+ </FileConfiguration>
</File>
<File
RelativePath=".\src\theme_selector.hxx">
@@ -2140,6 +2234,12 @@
<Tool
Name="VCCustomBuildTool"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+
Name="VCCustomBuildTool"/>
+ </FileConfiguration>
</File>
<File
RelativePath=".\src\time_display.cxx">
@@ -2242,6 +2342,33 @@
</File>
</Filter>
</Filter>
+ <File
+ RelativePath=".\ChangeLog">
+ </File>
+ <File
+ RelativePath=".\INSTALL.Win32">
+ </File>
+ <File
+ RelativePath=".\Maintaining">
+ </File>
+ <File
+ RelativePath=".\News">
+ </File>
+ <File
+ RelativePath=".\Readme">
+ </File>
+ <File
+ RelativePath=".\README.languages">
+ </File>
+ <File
+ RelativePath=".\README.Win32">
+ </File>
+ <File
+ RelativePath=".\Todo">
+ </File>
+ <File
+ RelativePath=".\Wishlist">
+ </File>
</Files>
<Globals>
</Globals>
Modified: trunk/src/globals.cxx
===================================================================
--- trunk/src/globals.cxx 2004-04-07 08:35:55 UTC (rev 2220)
+++ trunk/src/globals.cxx 2004-04-07 10:51:46 UTC (rev 2221)
@@ -39,7 +39,7 @@
#ifdef _DEBUG
bool fullscreen_enabled = false;
#else
-bool fullscreen_enabled = true;
+bool fullscreen_enabled = false;
#endif
#else
bool fullscreen_enabled = false;
Modified: trunk/src/gui/display_graphic_context.cxx
===================================================================
--- trunk/src/gui/display_graphic_context.cxx 2004-04-07 08:35:55 UTC (rev
2220)
+++ trunk/src/gui/display_graphic_context.cxx 2004-04-07 10:51:46 UTC (rev
2221)
@@ -82,7 +82,7 @@
{
CL_Rect rect;
- rect.left = Math::min (arg_rect.left, (int)arg_rect.right);
+ rect.left = Math::min (arg_rect.left, arg_rect.right);
rect.right = Math::max (arg_rect.left, arg_rect.right);
rect.top = Math::min (arg_rect.top, arg_rect.bottom);
rect.bottom = Math::max (arg_rect.top, arg_rect.bottom);
Modified: trunk/src/input/axes/mouse_axis.cxx
===================================================================
--- trunk/src/input/axes/mouse_axis.cxx 2004-04-07 08:35:55 UTC (rev 2220)
+++ trunk/src/input/axes/mouse_axis.cxx 2004-04-07 10:51:46 UTC (rev 2221)
@@ -17,7 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include <ClanLib/Display/input.h>
+#include <ClanLib/Display/Input/input.h>
#include <ClanLib/Display/Input/inputdevice.h>
#include <ClanLib/Display/Input/inputcursor.h>
#include "mouse_axis.hxx"
Modified: trunk/src/pingus_main.cxx
===================================================================
--- trunk/src/pingus_main.cxx 2004-04-07 08:35:55 UTC (rev 2220)
+++ trunk/src/pingus_main.cxx 2004-04-07 10:51:46 UTC (rev 2221)
@@ -935,11 +935,9 @@
return 0;
}
-
void
PingusMain::init_clanlib()
{
-
if (render_preview)
{
CL_SetupCore::init ();
Modified: trunk/src/sound/sound_real.cxx
===================================================================
--- trunk/src/sound/sound_real.cxx 2004-04-07 08:35:55 UTC (rev 2220)
+++ trunk/src/sound/sound_real.cxx 2004-04-07 10:51:46 UTC (rev 2221)
@@ -136,27 +136,9 @@
music_sample = 0;
-#ifdef CLANLIB_0_6
if (filename.substr(filename.size()-4, 4) == ".ogg")
{
#ifdef HAVE_LIBCLANVORBIS
- music_sample = new CL_SoundBuffer (new
CL_VorbisSoundProvider(filename.c_str()), true);
- #endif
- }
- else if (filename.substr(filename.size()-4, 4) == ".wav")
- {
- music_sample = new CL_SoundBuffer (new CL_Sample(filename.c_str(),
NULL), true);
- }
- else
- { // MikMod should support the rest...
- #ifdef HAVE_LIBCLANMIKMOD
- music_sample = new CL_SoundBuffer (new
CL_Streamed_MikModSample(filename.c_str()), true);
- #endif
- }
-#else
- if (filename.substr(filename.size()-4, 4) == ".ogg")
- {
- #ifdef HAVE_LIBCLANVORBIS
music_sample = new CL_SoundBuffer (filename.c_str());
#endif
}
@@ -170,7 +152,6 @@
music_sample = new CL_SoundBuffer (filename.c_str());
#endif
}
-#endif
if (music_sample)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] rev 2221 - in trunk: . src src/gui src/input/axes src/sound,
Kenneth Gangstoe <=