[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freesci-develop] r1552 - in freesci/trunk: . src/engine src/gfx/drivers
|
From: |
freesci |
|
Subject: |
[freesci-develop] r1552 - in freesci/trunk: . src/engine src/gfx/drivers src/menu src/win32 |
|
Date: |
Mon, 13 Feb 2006 22:09:34 +0100 |
Author: arangas
Date: 2006-02-13 22:09:21 +0100 (Mon, 13 Feb 2006)
New Revision: 1552
Modified:
freesci/trunk/ChangeLog
freesci/trunk/src/engine/game.c
freesci/trunk/src/gfx/drivers/dx_driver.cpp
freesci/trunk/src/menu/game_select_init.c
freesci/trunk/src/win32/freesci.def
freesci/trunk/src/win32/freesci.sln
freesci/trunk/src/win32/fsci_dll.vcproj
freesci/trunk/src/win32/sciv.vcproj
Log:
Primarily Win32 VS2003 build clean up based on experience of re-creating
solution in VS2005 (Win32 people please test).
Unsure if game_select_init.c change will break other platforms, please test.
-- Alex Angas.
Modified: freesci/trunk/ChangeLog
===================================================================
--- freesci/trunk/ChangeLog 2006-02-13 20:52:36 UTC (rev 1551)
+++ freesci/trunk/ChangeLog 2006-02-13 21:09:21 UTC (rev 1552)
@@ -1,3 +1,19 @@
+2006-02-14 Alex Angas <address@hidden>
+
+ * src/menu/game_select_init.c: Changed include "" to <>.
+
+ * src/engine/game.c: Compiler warning for old SDK versions only.
+ * src/gfx/drivers/dx_driver.cpp: Compiler warning for non-DirectX 8 SDK.
+
+ * src/win32/freesci.sln: Added README to solution.
+ * src/win32/fsci_dll.vcproj: Defined character set as in sciv, disabled
+ pre-compiled header, created win32 filter in source folder, removed
files
+ no longer used.
+ * src/win32/sciv.vcproj: Added post-build step to copy SDL.dll, disabled
+ pre-compiled header, added win32 filter in source folder, removed files
+ no longer used.
+ * src/win32/freesci.def: Removed files no longer used.
+
2006-02-12 Walter van Niftrik <address@hidden>
* README.GP32: Updated.
Modified: freesci/trunk/src/engine/game.c
===================================================================
--- freesci/trunk/src/engine/game.c 2006-02-13 20:52:36 UTC (rev 1551)
+++ freesci/trunk/src/engine/game.c 2006-02-13 21:09:21 UTC (rev 1552)
@@ -26,7 +26,7 @@
***************************************************************************/
/* Attempt to guess if recent version of Platform SDK */
-#ifdef _WIN32
+#if _MSC_VER < 1300
# pragma message("******************** IMPORTANT MESSAGE
********************")
# pragma message("You must have installed a recent Platform and DirectX
SDK")
# pragma message("for this build to be successful. Download MS SDKs
from:")
Modified: freesci/trunk/src/gfx/drivers/dx_driver.cpp
===================================================================
--- freesci/trunk/src/gfx/drivers/dx_driver.cpp 2006-02-13 20:52:36 UTC (rev
1551)
+++ freesci/trunk/src/gfx/drivers/dx_driver.cpp 2006-02-13 21:09:21 UTC (rev
1552)
@@ -48,7 +48,9 @@
#include <graphics_directx.h>
#if (DIRECT3D_VERSION < 0x0800)
-#error ERROR: DirectX 8 or higher is required for this driver.
+# error ERROR: DirectX 8 or higher is required for this driver.
+#elseif (DIRECT3D_VERSION > 0x0800)
+# warning This driver has been developed against the DirectX 8 SDK and
may not work against this version DIRECT3D_VERSION
#endif
Modified: freesci/trunk/src/menu/game_select_init.c
===================================================================
--- freesci/trunk/src/menu/game_select_init.c 2006-02-13 20:52:36 UTC (rev
1551)
+++ freesci/trunk/src/menu/game_select_init.c 2006-02-13 21:09:21 UTC (rev
1552)
@@ -27,8 +27,8 @@
#include <sci_memory.h>
#include <gfx_operations.h>
-#include "game_select.h"
-#include "sciresource.h"
+#include <game_select.h>
+#include <sciresource.h>
/* NOTE: THIS CODE BASED ON _gfxop_init_common (COPIED AND MODIFIED) */
static int
Modified: freesci/trunk/src/win32/freesci.def
===================================================================
(Binary files differ)
Modified: freesci/trunk/src/win32/freesci.sln
===================================================================
--- freesci/trunk/src/win32/freesci.sln 2006-02-13 20:52:36 UTC (rev 1551)
+++ freesci/trunk/src/win32/freesci.sln 2006-02-13 21:09:21 UTC (rev 1552)
@@ -30,6 +30,7 @@
EndGlobalSection
GlobalSection(SolutionItems) = postSolution
..\..\ChangeLog = ..\..\ChangeLog
+ ..\..\README = ..\..\README
..\..\README.Win32 = ..\..\README.Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
Modified: freesci/trunk/src/win32/fsci_dll.vcproj
===================================================================
--- freesci/trunk/src/win32/fsci_dll.vcproj 2006-02-13 20:52:36 UTC (rev
1551)
+++ freesci/trunk/src/win32/fsci_dll.vcproj 2006-02-13 21:09:21 UTC (rev
1552)
@@ -18,6 +18,7 @@
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2"
WholeProgramOptimization="TRUE">
<Tool
Name="VCCLCompilerTool"
@@ -94,16 +95,19 @@
IntermediateDirectory=".\fsci_dll_Debug"
ConfigurationType="2"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\SDL\include,..\include,..\include\win32"
PreprocessorDefinitions="_DEBUG;PACKAGE=\"FreeSCI\";_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX;WANT_CONSOLE"
+ BasicRuntimeChecks="3"
RuntimeLibrary="3"
- EnableFunctionLevelLinking="TRUE"
- UsePrecompiledHeader="2"
-
PrecompiledHeaderFile=".\fsci_dll_Debug/fsci_dll.pch"
+ EnableFunctionLevelLinking="FALSE"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=""
AssemblerListingLocation=".\fsci_dll_Debug/"
ObjectFile=".\fsci_dll_Debug/"
ProgramDataBaseFileName=".\fsci_dll_Debug/"
@@ -235,41 +239,6 @@
<Filter
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
- <File
- RelativePath="..\gfx\drivers\dx_driver.h">
- </File>
- <File
- RelativePath="usleep.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="NDEBUG;PACKAGE=\"FreeSCI\";_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;VERSION=__TIMESTAMP__;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="_DEBUG;PACKAGE=\"FreeSCI\";VERSION=__TIMESTAMP__;_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
- BasicRuntimeChecks="3"
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Purify|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="SATISFY_PURIFY;_DEBUG;PACKAGE=\"FreeSCI\";VERSION=__TIMESTAMP__;_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
- BasicRuntimeChecks="3"
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
<Filter
Name="engine"
Filter="">
@@ -853,38 +822,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\engine\simplesaid.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
-
AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="NDEBUG;PACKAGE=\"FreeSCI\";_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;VERSION=__TIMESTAMP__;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
-
AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="_DEBUG;PACKAGE=\"FreeSCI\";VERSION=__TIMESTAMP__;_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
- BasicRuntimeChecks="3"
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Purify|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
-
AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="SATISFY_PURIFY;_DEBUG;PACKAGE=\"FreeSCI\";VERSION=__TIMESTAMP__;_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
- BasicRuntimeChecks="3"
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
RelativePath="..\engine\vm.c">
<FileConfiguration
Name="Release|Win32">
@@ -1345,38 +1282,6 @@
BrowseInformation="1"/>
</FileConfiguration>
</File>
- <File
- RelativePath="..\gfx\wrapper.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
-
AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="NDEBUG;PACKAGE=\"FreeSCI\";_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;VERSION=__TIMESTAMP__;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
-
AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="_DEBUG;PACKAGE=\"FreeSCI\";VERSION=__TIMESTAMP__;_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
- BasicRuntimeChecks="3"
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Purify|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
-
AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="SATISFY_PURIFY;_DEBUG;PACKAGE=\"FreeSCI\";VERSION=__TIMESTAMP__;_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
- BasicRuntimeChecks="3"
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
<Filter
Name="resource"
Filter="">
@@ -1445,38 +1350,6 @@
</FileConfiguration>
</File>
<File
-
RelativePath="..\gfx\resource\sci_pal_1.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
-
Name="VCCLCompilerTool"
- Optimization="1"
-
AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="NDEBUG;PACKAGE=\"FreeSCI\";_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;VERSION=__TIMESTAMP__;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
-
BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
-
Name="VCCLCompilerTool"
- Optimization="0"
-
AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="_DEBUG;PACKAGE=\"FreeSCI\";VERSION=__TIMESTAMP__;_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
-
BasicRuntimeChecks="3"
-
BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Purify|Win32">
- <Tool
-
Name="VCCLCompilerTool"
- Optimization="0"
-
AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="SATISFY_PURIFY;_DEBUG;PACKAGE=\"FreeSCI\";VERSION=__TIMESTAMP__;_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
-
BasicRuntimeChecks="3"
-
BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
RelativePath="..\gfx\resource\sci_pic_0.c">
<FileConfiguration
Name="Release|Win32">
@@ -1572,38 +1445,6 @@
BrowseInformation="1"/>
</FileConfiguration>
</File>
- <File
-
RelativePath="..\gfx\resource\sci_view_1.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
-
Name="VCCLCompilerTool"
- Optimization="1"
-
AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="NDEBUG;PACKAGE=\"FreeSCI\";_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;VERSION=__TIMESTAMP__;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
-
BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
-
Name="VCCLCompilerTool"
- Optimization="0"
-
AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="_DEBUG;PACKAGE=\"FreeSCI\";VERSION=__TIMESTAMP__;_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
-
BasicRuntimeChecks="3"
-
BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Purify|Win32">
- <Tool
-
Name="VCCLCompilerTool"
- Optimization="0"
-
AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="SATISFY_PURIFY;_DEBUG;PACKAGE=\"FreeSCI\";VERSION=__TIMESTAMP__;_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
-
BasicRuntimeChecks="3"
-
BrowseInformation="1"/>
- </FileConfiguration>
- </File>
</Filter>
<Filter
Name="drivers"
@@ -1902,38 +1743,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\scicore\old_objects.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
-
AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="NDEBUG;PACKAGE=\"FreeSCI\";_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;VERSION=__TIMESTAMP__;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
-
AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="_DEBUG;PACKAGE=\"FreeSCI\";VERSION=__TIMESTAMP__;_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
- BasicRuntimeChecks="3"
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Purify|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
-
AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="SATISFY_PURIFY;_DEBUG;PACKAGE=\"FreeSCI\";VERSION=__TIMESTAMP__;_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
- BasicRuntimeChecks="3"
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
RelativePath="..\scicore\resource.c">
<FileConfiguration
Name="Release|Win32">
@@ -2030,38 +1839,6 @@
</FileConfiguration>
</File>
<File
-
RelativePath="..\scicore\resourcecheck.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
-
AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="NDEBUG;PACKAGE=\"FreeSCI\";_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;VERSION=__TIMESTAMP__;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
-
AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="_DEBUG;PACKAGE=\"FreeSCI\";VERSION=__TIMESTAMP__;_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
- BasicRuntimeChecks="3"
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Purify|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
-
AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="SATISFY_PURIFY;_DEBUG;PACKAGE=\"FreeSCI\";VERSION=__TIMESTAMP__;_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
- BasicRuntimeChecks="3"
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
RelativePath="..\scicore\sci_memory.c">
<FileConfiguration
Name="Release|Win32">
@@ -2261,38 +2038,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\sound\midi_adlib.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
-
AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="NDEBUG;PACKAGE=\"FreeSCI\";_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;VERSION=__TIMESTAMP__;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
-
AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="_DEBUG;PACKAGE=\"FreeSCI\";VERSION=__TIMESTAMP__;_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
- BasicRuntimeChecks="3"
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Purify|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
-
AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="SATISFY_PURIFY;_DEBUG;PACKAGE=\"FreeSCI\";VERSION=__TIMESTAMP__;_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
- BasicRuntimeChecks="3"
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
RelativePath="..\sound\midi_adlibemu.c">
<FileConfiguration
Name="Release|Win32">
@@ -2680,38 +2425,6 @@
RelativePath="..\sound\sfx_save.cfsml">
</File>
<File
- RelativePath="..\sound\song_iterator.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
-
AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="NDEBUG;PACKAGE=\"FreeSCI\";_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;VERSION=__TIMESTAMP__;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
-
AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="_DEBUG;PACKAGE=\"FreeSCI\";VERSION=__TIMESTAMP__;_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
- BasicRuntimeChecks="3"
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Purify|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
-
AdditionalIncludeDirectories=""
-
PreprocessorDefinitions="SATISFY_PURIFY;_DEBUG;PACKAGE=\"FreeSCI\";VERSION=__TIMESTAMP__;_WINDOWS;WIN32;_USRDLL;_CONSOLE;FREESCI_EXPORTS;X_DISPLAY_MISSING;HAVE_SDL;HAVE_MEMCHR;HAVE_SYS_STAT_H;HAVE_FCNTL_H;HAVE_STRING_H;HAVE_DIRECTX"
- BasicRuntimeChecks="3"
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
RelativePath="..\sound\sound.c">
<FileConfiguration
Name="Release|Win32">
@@ -2777,6 +2490,13 @@
</File>
<File
RelativePath="..\sound\thread_ss_sdl.c">
+ </File>
+ </Filter>
+ <Filter
+ Name="win32"
+ Filter="">
+ <File
+ RelativePath="usleep.c">
<FileConfiguration
Name="Release|Win32">
<Tool
@@ -2837,6 +2557,9 @@
RelativePath="..\include\gfx_options.h">
</File>
<File
+ RelativePath="..\include\gfx_res_options.h">
+ </File>
+ <File
RelativePath="..\include\gfx_resmgr.h">
</File>
<File
@@ -2846,9 +2569,6 @@
RelativePath="..\include\gfx_sci.h">
</File>
<File
- RelativePath="..\include\gfx_state.h">
- </File>
- <File
RelativePath="..\include\gfx_state_internal.h">
</File>
<File
@@ -2951,9 +2671,6 @@
RelativePath="..\include\graphics_directx.h">
</File>
<File
-
RelativePath="..\include\win32\messages.h">
- </File>
- <File
RelativePath="..\include\win32\sci_win32.h">
</File>
</Filter>
Modified: freesci/trunk/src/win32/sciv.vcproj
===================================================================
--- freesci/trunk/src/win32/sciv.vcproj 2006-02-13 20:52:36 UTC (rev 1551)
+++ freesci/trunk/src/win32/sciv.vcproj 2006-02-13 21:09:21 UTC (rev 1552)
@@ -3,6 +3,7 @@
ProjectType="Visual C++"
Version="7.10"
Name="sciv"
+ RootNamespace="sciv"
SccProjectName=""
SccLocalPath="">
<Platforms>
@@ -58,7 +59,10 @@
TypeLibraryName=".\Release/sciv.tlb"
HeaderFileName=""/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ CommandLine="echo Copying SDL.dll to
$(OutDir)\..\..\..\bin\
+copy /y ..\..\..\SDL\lib\sdl.dll $(OutDir)\..\..\..\bin\
+"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
@@ -157,11 +161,12 @@
Optimization="0"
AdditionalIncludeDirectories="..\..\..\SDL\include,..\include,..\include\win32"
PreprocessorDefinitions="_DEBUG;PACKAGE=\"freesci\";HAVE_GETOPT_H;WIN32;_CONSOLE;HAVE_STRING_H;HAVE_SYS_STAT_H;HAVE_FCNTL_H;WANT_CONSOLE"
+ BasicRuntimeChecks="3"
RuntimeLibrary="3"
- EnableFunctionLevelLinking="TRUE"
+ EnableFunctionLevelLinking="FALSE"
RuntimeTypeInfo="TRUE"
- UsePrecompiledHeader="2"
- PrecompiledHeaderFile=".\sciv_Debug/sciv.pch"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile=""
AssemblerListingLocation=".\sciv_Debug/"
ObjectFile=".\sciv_Debug/"
ProgramDataBaseFileName=".\sciv_Debug/"
@@ -187,7 +192,10 @@
TypeLibraryName=".\Debug/sciv.tlb"
HeaderFileName=""/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ CommandLine="echo Copying SDL.dll to $(OutDir)\
+copy /y ..\..\..\SDL\lib\sdl.dll $(OutDir)\
+"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
@@ -250,38 +258,6 @@
RelativePath="..\config.l">
</File>
<File
- RelativePath="getopt.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Purify|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
- <File
RelativePath="..\main.c">
<FileConfiguration
Name="Release|Win32">
@@ -313,38 +289,6 @@
BrowseInformation="1"/>
</FileConfiguration>
</File>
- <File
- RelativePath="..\scicore\sci_memory.c">
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Purify|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
- BrowseInformation="1"/>
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
- BrowseInformation="1"/>
- </FileConfiguration>
- </File>
<Filter
Name="scicore"
Filter="">
@@ -372,6 +316,42 @@
RelativePath="..\gfx\font.c">
</File>
</Filter>
+ <Filter
+ Name="win32"
+ Filter="">
+ <File
+ RelativePath="getopt.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+
AdditionalIncludeDirectories=""
+
PreprocessorDefinitions=""
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Purify|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+
AdditionalIncludeDirectories=""
+
PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+
AdditionalIncludeDirectories=""
+
PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ BrowseInformation="1"/>
+ </FileConfiguration>
+ </File>
+ </Filter>
</Filter>
<Filter
Name="Header Files"
@@ -392,9 +372,6 @@
RelativePath="..\include\games.h">
</File>
<File
- RelativePath="..\include\win32\getopt.h">
- </File>
- <File
RelativePath="..\include\gfx_driver.h">
</File>
<File
@@ -422,9 +399,6 @@
RelativePath="..\include\gfx_widgets.h">
</File>
<File
- RelativePath="..\include\graphics.h">
- </File>
- <File
RelativePath="..\include\heap.h">
</File>
<File
@@ -443,6 +417,9 @@
RelativePath="..\include\midiout.h">
</File>
<File
+ RelativePath="..\include\pcmout.h">
+ </File>
+ <File
RelativePath="..\include\resource.h">
</File>
<File
@@ -481,6 +458,13 @@
<File
RelativePath="..\include\vocabulary.h">
</File>
+ <Filter
+ Name="win32"
+ Filter="">
+ <File
+
RelativePath="..\include\win32\getopt.h">
+ </File>
+ </Filter>
</Filter>
</Files>
<Globals>
- [freesci-develop] r1552 - in freesci/trunk: . src/engine src/gfx/drivers src/menu src/win32,
freesci <=