summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Magic2/Magic.vcxproj8
-rw-r--r--Magic2/MainFrm.cpp2
-rw-r--r--Magic2/MainFrm.h2
-rw-r--r--Magic2/ModelFileMAG.cpp2
-rw-r--r--Magic2/StdAfx.h3
-rw-r--r--nGenEx/ContentBundle.h2
-rw-r--r--nGenEx/Locale_ss.cpp (renamed from nGenEx/Locale.cpp)2
-rw-r--r--nGenEx/Locale_ss.h (renamed from nGenEx/Locale.h)0
-rw-r--r--nGenEx/nGenEx.vcxproj4
-rw-r--r--nGenEx/nGenEx.vcxproj.filters12
10 files changed, 21 insertions, 16 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
diff --git a/nGenEx/ContentBundle.h b/nGenEx/ContentBundle.h
index d0c103b..4848716 100644
--- a/nGenEx/ContentBundle.h
+++ b/nGenEx/ContentBundle.h
@@ -18,7 +18,7 @@
#include "Types.h"
#include "Dictionary.h"
#include "Text.h"
-#include "Locale.h"
+#include "Locale_ss.h"
// +--------------------------------------------------------------------+
diff --git a/nGenEx/Locale.cpp b/nGenEx/Locale_ss.cpp
index 1e7d511..9a87650 100644
--- a/nGenEx/Locale.cpp
+++ b/nGenEx/Locale_ss.cpp
@@ -13,7 +13,7 @@
*/
#include "MemDebug.h"
-#include "Locale.h"
+#include "Locale_ss.h"
void Print(const char* fmt, ...);
diff --git a/nGenEx/Locale.h b/nGenEx/Locale_ss.h
index 551c379..551c379 100644
--- a/nGenEx/Locale.h
+++ b/nGenEx/Locale_ss.h
diff --git a/nGenEx/nGenEx.vcxproj b/nGenEx/nGenEx.vcxproj
index 9a0b68d..3b9f232 100644
--- a/nGenEx/nGenEx.vcxproj
+++ b/nGenEx/nGenEx.vcxproj
@@ -373,7 +373,7 @@
<ClCompile Include="Layout.cpp" />
<ClCompile Include="Light.cpp" />
<ClCompile Include="ListBox.cpp" />
- <ClCompile Include="Locale.cpp" />
+ <ClCompile Include="Locale_ss.cpp" />
<ClCompile Include="MachineInfo.cpp" />
<ClCompile Include="MCIWave.cpp" />
<ClCompile Include="..\FoundationEx\MemDebug.cpp" />
@@ -461,7 +461,7 @@
<ClInclude Include="Layout.h" />
<ClInclude Include="Light.h" />
<ClInclude Include="ListBox.h" />
- <ClInclude Include="Locale.h" />
+ <ClInclude Include="Locale_ss.h" />
<ClInclude Include="MachineInfo.h" />
<ClInclude Include="MCIWave.h" />
<ClInclude Include="..\FoundationEx\MemDebug.h" />
diff --git a/nGenEx/nGenEx.vcxproj.filters b/nGenEx/nGenEx.vcxproj.filters
index b31e5e7..e5049f1 100644
--- a/nGenEx/nGenEx.vcxproj.filters
+++ b/nGenEx/nGenEx.vcxproj.filters
@@ -119,9 +119,6 @@
<ClCompile Include="ListBox.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="Locale.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="MachineInfo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -257,6 +254,9 @@
<ClCompile Include="Window.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="Locale_ss.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="ActiveWindow.h">
@@ -379,9 +379,6 @@
<ClInclude Include="ListBox.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="Locale.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="MachineInfo.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -538,6 +535,9 @@
<ClInclude Include="Window.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="Locale_ss.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\FoundationEx\Dictionary.inl">
generated by cgit v1.1 at 2024-11-04 21:33:46 +0000