From 9a9de7689176de013872e5a6a5367f79202d0844 Mon Sep 17 00:00:00 2001 From: "FWoltermann@gmail.com" Date: Sat, 26 May 2012 16:38:08 +0000 Subject: 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. --- Magic2/Magic.vcxproj | 8 +++++--- Magic2/MainFrm.cpp | 2 +- Magic2/MainFrm.h | 2 +- Magic2/ModelFileMAG.cpp | 2 +- Magic2/StdAfx.h | 3 +++ 5 files changed, 11 insertions(+), 6 deletions(-) (limited to 'Magic2') 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 @@ true true Windows - LIBCMT;LIBCD;%(IgnoreSpecificDefaultLibraries) + LIBCMTD.lib;LIBCMT.lib;LIBCD.lib;%(IgnoreSpecificDefaultLibraries) .\Debug\Magic.exe - ..\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) + ..\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) + $(DXSDK_DIR)\lib\x86\;..\oggvorbis\lib; @@ -254,7 +255,8 @@ Windows LIBC;%(IgnoreSpecificDefaultLibraries) .\Release\Magic.exe - ..\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) + ..\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) + $(DXSDK_DIR)\lib\x86\;..\oggvorbis\lib; 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 // MFC core and standard components #include // MFC extensions -- cgit v1.1