diff options
| author | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-05-26 16:38:08 +0000 |
|---|---|---|
| committer | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-05-26 16:38:08 +0000 |
| commit | 9a9de7689176de013872e5a6a5367f79202d0844 (patch) | |
| tree | aaf098cfd51175b9e1d675fd21373d0c3de5ef8d /Magic2 | |
| parent | 75f9af66439ec416634188eb3ef020df4e4752b7 (diff) | |
| download | starshatter-9a9de7689176de013872e5a6a5367f79202d0844.zip starshatter-9a9de7689176de013872e5a6a5367f79202d0844.tar.gz starshatter-9a9de7689176de013872e5a6a5367f79202d0844.tar.bz2 | |
Getting closer to getting magic to compile. The file renaming was necessary in order to remove a conflict between the WinSDK's locale.h and starshatter's own version.
Diffstat (limited to 'Magic2')
| -rw-r--r-- | Magic2/Magic.vcxproj | 8 | ||||
| -rw-r--r-- | Magic2/MainFrm.cpp | 2 | ||||
| -rw-r--r-- | Magic2/MainFrm.h | 2 | ||||
| -rw-r--r-- | Magic2/ModelFileMAG.cpp | 2 | ||||
| -rw-r--r-- | Magic2/StdAfx.h | 3 |
5 files changed, 11 insertions, 6 deletions
diff --git a/Magic2/Magic.vcxproj b/Magic2/Magic.vcxproj index 7d13d8a..5acc1d6 100644 --- a/Magic2/Magic.vcxproj +++ b/Magic2/Magic.vcxproj @@ -172,9 +172,10 @@ <SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
- <IgnoreSpecificDefaultLibraries>LIBCMT;LIBCD;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+ <IgnoreSpecificDefaultLibraries>LIBCMTD.lib;LIBCMT.lib;LIBCD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<OutputFile>.\Debug\Magic.exe</OutputFile>
- <AdditionalDependencies>..\Opcode\OpcodeLib\Debug\OpcodeLib.lib;..\zlib\debug\zlib.lib;..\libpng\debug\libpng.lib;wsock32.lib;dinput.lib;dsound.lib;d3d9.lib;d3dx9.lib;dxguid.lib;winmm.lib;version.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\Opcode\Debug\Opcode_D.lib;..\zlib\debug\zlib.lib;..\libpng\debug\libpng.lib;wsock32.lib;..\DirectX\lib\dinput.lib;dsound.lib;d3d9.lib;d3dx9.lib;dxguid.lib;winmm.lib;version.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(DXSDK_DIR)\lib\x86\;..\oggvorbis\lib;</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -254,7 +255,8 @@ <SubSystem>Windows</SubSystem>
<IgnoreSpecificDefaultLibraries>LIBC;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<OutputFile>.\Release\Magic.exe</OutputFile>
- <AdditionalDependencies>..\Opcode\OpcodeLib\Release\OpcodeLib.lib;..\ngenex\release\ngenex.lib;..\zlib\release\zlib.lib;..\libpng\release\libpng.lib;wsock32.lib;dinput.lib;dsound.lib;d3d9.lib;d3dx9.lib;dxguid.lib;winmm.lib;version.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\Opcode\Release\Opcode.lib;..\ngenex\release\ngenex.lib;..\zlib\release\zlib.lib;..\libpng\release\libpng.lib;wsock32.lib;..\DirectX\lib\dinput.lib;dsound.lib;d3d9.lib;d3dx9.lib;dxguid.lib;winmm.lib;version.lib;ogg_static.lib;vorbis_static.lib;vorbisfile_static.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(DXSDK_DIR)\lib\x86\;..\oggvorbis\lib;</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release x64|Win32'">
diff --git a/Magic2/MainFrm.cpp b/Magic2/MainFrm.cpp index 9cc2193..97ee18b 100644 --- a/Magic2/MainFrm.cpp +++ b/Magic2/MainFrm.cpp @@ -139,7 +139,7 @@ void MainFrame::Dump(CDumpContext& dc) const // MainFrame message handlers
-void MainFrame::OnActivateApp(BOOL bActive, HTASK hTask)
+void MainFrame::OnActivateApp(BOOL bActive, DWORD dwThreadID)
{
((Magic*)AfxGetApp())->SetAppActivated(bActive ? true : false);
}
diff --git a/Magic2/MainFrm.h b/Magic2/MainFrm.h index f7de5db..8d51197 100644 --- a/Magic2/MainFrm.h +++ b/Magic2/MainFrm.h @@ -48,7 +48,7 @@ protected: // control bar embedded members protected:
//{{AFX_MSG(MainFrame)
afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
- afx_msg void OnActivateApp(BOOL bActive, HTASK hTask);
+ afx_msg void OnActivateApp(BOOL bActive, DWORD dwThreadID);
afx_msg void OnRender();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
diff --git a/Magic2/ModelFileMAG.cpp b/Magic2/ModelFileMAG.cpp index 4157434..953f22d 100644 --- a/Magic2/ModelFileMAG.cpp +++ b/Magic2/ModelFileMAG.cpp @@ -78,7 +78,7 @@ ModelFileMAG::Load(Model* m, double scale) }
ZeroMemory(pname, 64);
- strncpy_s(pname, filename, 63);
+ strncpy(pname, filename, 63);
char file_id[5];
fread(file_id, 4, 1, fp);
diff --git a/Magic2/StdAfx.h b/Magic2/StdAfx.h index aa81375..67f99f5 100644 --- a/Magic2/StdAfx.h +++ b/Magic2/StdAfx.h @@ -11,6 +11,9 @@ #endif // _MSC_VER > 1000
#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN
+
+#define _WIN32_WINNT 0x0502 // XP is the lowest supported OS
#include <afxwin.h> // MFC core and standard components
#include <afxext.h> // MFC extensions
|