neo/MayaImport.vcxproj | 11 +- neo/_Release.props | 4 +- neo/doom.suo | Bin 42496 -> 44544 bytes neo/doomdll.vcxproj | 797 +------------------------------ neo/doomdll.vcxproj.filters | 966 ------------------------------------- neo/framework/BuildDefines.h | 6 +- neo/game-d3xp.vcxproj | 7 + neo/game.vcxproj | 7 + neo/sys/win32/win_shared.cpp | 2 + neo/sys/win32/win_taskkeyhook.cpp | 2 +- neo/tools/comafx/StdAfx.h | 4 +- neo/typeinfo.vcxproj | 11 + 12 files changed, 50 insertions(+), 1767 deletions(-) diff --git a/neo/MayaImport.vcxproj b/neo/MayaImport.vcxproj index cbf455e..fd3b460 100644 --- a/neo/MayaImport.vcxproj +++ b/neo/MayaImport.vcxproj @@ -155,7 +155,16 @@ - + + + libcmt.lib;%(AdditionalDependencies) + + + + + + + diff --git a/neo/_Release.props b/neo/_Release.props index 1ce0627..d46db3b 100644 --- a/neo/_Release.props +++ b/neo/_Release.props @@ -19,8 +19,8 @@ ProgramDatabase - nafxcw.lib;libcmt.lib;%(AdditionalDependencies) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + libcmt.lib;%(AdditionalDependencies) + libcmt.lib;%(IgnoreSpecificDefaultLibraries) false false true diff --git a/neo/doom.suo b/neo/doom.suo index e810b58..081e17e 100644 Binary files a/neo/doom.suo and b/neo/doom.suo differ diff --git a/neo/doomdll.vcxproj b/neo/doomdll.vcxproj index 7dd996e..9655bd1 100644 --- a/neo/doomdll.vcxproj +++ b/neo/doomdll.vcxproj @@ -156,6 +156,8 @@ AllRules.ruleset + $(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;C:\Program Files (x86)\Microsoft DirectX SDK (June 2010)\Include; + $(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;C:\Program Files (x86)\Microsoft DirectX SDK (June 2010)\Lib\x86 @@ -190,6 +192,9 @@ openal\lib;sys\win32\dongle;%(AdditionalLibraryDirectories) + libcmt.lib;%(AdditionalDependencies) + + @@ -1395,211 +1400,6 @@ - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - @@ -1714,591 +1514,6 @@ true true - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - - - true - true - true - @@ -2385,7 +1600,6 @@ - @@ -2424,7 +1638,6 @@ true true - true true diff --git a/neo/doomdll.vcxproj.filters b/neo/doomdll.vcxproj.filters index 6b449cb..d30ecfe 100644 --- a/neo/doomdll.vcxproj.filters +++ b/neo/doomdll.vcxproj.filters @@ -49,18 +49,6 @@ {af0039d7-487e-4e9c-859d-c7b4c194b985} - - {de4b7a7a-3038-4cac-a5d1-95b015b026ec} - - - {1041a97c-8f17-4731-a48e-a94cf40753fe} - - - {082fe765-698a-408b-ae96-04db4f62a5dc} - - - {e51aaa76-0800-450c-9cf5-63484392d7a3} - {83ad091e-339c-4f64-ad0d-e0776c4fe142} @@ -79,30 +67,6 @@ {bdc52484-8a48-4b82-b396-9228f0304808} - - {6b6929e6-0646-465b-9c53-e0b8535bf175} - - - {33958bbe-2c45-4c6c-bf13-2bdea604a1f1} - - - {44a955ea-0e6e-4cd1-aeb0-5e355aabe9bc} - - - {e245eb22-9902-436d-b292-1bd362aee648} - - - {527cec37-a4ca-4466-9d91-f925361a7aea} - - - {06cc72d4-f944-4821-8693-667ae16daaee} - - - {60417518-1848-4aa4-87d8-b8d81c6c1ac4} - - - {1116e2f3-d474-4b47-b913-d95b022f80b2} - {b3166d25-0562-49da-bc8d-961006fe1785} @@ -1166,129 +1130,6 @@ Sys\RC - - Tools\AF - - - Tools\AF - - - Tools\AF - - - Tools\AF - - - Tools\AF - - - Tools\AF - - - Tools\AF - - - Tools\AF - - - Tools\AF - - - Tools\AF - - - Tools\AF - - - Tools\AF - - - Tools\ComAfx - - - Tools\ComAfx - - - Tools\ComAfx - - - Tools\ComAfx - - - Tools\ComAfx - - - Tools\ComAfx - - - Tools\ComAfx - - - Tools\ComAfx - - - Tools\Common - - - Tools\Common - - - Tools\Common - - - Tools\Common - - - Tools\Common - - - Tools\Common - - - Tools\Common - - - Tools\Common - - - Tools\Common\PropTree - - - Tools\Common\PropTree - - - Tools\Common\PropTree - - - Tools\Common\PropTree - - - Tools\Common\PropTree - - - Tools\Common\PropTree - - - Tools\Common\PropTree - - - Tools\Common\PropTree - - - Tools\Common\PropTree - - - Tools\Common\PropTree - - - Tools\Common\PropTree - - - Tools\Common\PropTree - - - Tools\Common\PropTree - Tools\Compilers\AAS @@ -1415,357 +1256,6 @@ Tools\Debugger - - Tools\Decl - - - Tools\Decl - - - Tools\Decl - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\Sound - - - Tools\Sound - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\Particle - - - Tools\PDA - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Script - Ui @@ -2014,9 +1504,6 @@ Sys\RC\res - - Tools\ComAfx - @@ -2031,9 +1518,6 @@ Sys\RC - - Sys\RC - Sys\RC @@ -2063,129 +1547,6 @@ Tools - - Tools\AF - - - Tools\AF - - - Tools\AF - - - Tools\AF - - - Tools\AF - - - Tools\AF - - - Tools\AF - - - Tools\AF - - - Tools\AF - - - Tools\AF - - - Tools\AF - - - Tools\AF - - - Tools\ComAfx - - - Tools\ComAfx - - - Tools\ComAfx - - - Tools\ComAfx - - - Tools\ComAfx - - - Tools\ComAfx - - - Tools\ComAfx - - - Tools\ComAfx - - - Tools\Common - - - Tools\Common - - - Tools\Common - - - Tools\Common - - - Tools\Common - - - Tools\Common - - - Tools\Common - - - Tools\Common - - - Tools\Common\PropTree - - - Tools\Common\PropTree - - - Tools\Common\PropTree - - - Tools\Common\PropTree - - - Tools\Common\PropTree - - - Tools\Common\PropTree - - - Tools\Common\PropTree - - - Tools\Common\PropTree - - - Tools\Common\PropTree - - - Tools\Common\PropTree - - - Tools\Common\PropTree - - - Tools\Common\PropTree - - - Tools\Common\PropTree - Tools\Debugger @@ -2213,332 +1574,5 @@ Tools\Debugger - - Tools\Decl - - - Tools\Decl - - - Tools\Decl - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\GuiEd - - - Tools\Sound - - - Tools\Sound - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\MaterialEditor - - - Tools\Particle - - - Tools\PDA - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Radiant - - - Tools\Script - \ No newline at end of file diff --git a/neo/framework/BuildDefines.h b/neo/framework/BuildDefines.h index 8f0bbaf..32cab9a 100644 --- a/neo/framework/BuildDefines.h +++ b/neo/framework/BuildDefines.h @@ -92,9 +92,9 @@ If you have questions concerning this license or the applicable additional terms //#define ID_DEMO_BUILD // don't define ID_ALLOW_TOOLS when we don't want tool code in the executable. -#if defined( _WIN32 ) && !defined( ID_DEDICATED ) && !defined( ID_DEMO_BUILD ) - #define ID_ALLOW_TOOLS -#endif +//~ #if defined( _WIN32 ) && !defined( ID_DEDICATED ) && !defined( ID_DEMO_BUILD ) + //~ #define ID_ALLOW_TOOLS +//~ #endif // don't do backtraces in release builds. // atm, we have no useful way to reconstruct the trace, so let's leave it off diff --git a/neo/game-d3xp.vcxproj b/neo/game-d3xp.vcxproj index ef0df27..82708ef 100644 --- a/neo/game-d3xp.vcxproj +++ b/neo/game-d3xp.vcxproj @@ -196,6 +196,13 @@ "build\Win32\$(Configuration)\TypeInfo.exe" d3xp + + libcmt.lib;%(AdditionalDependencies) + + + + + diff --git a/neo/game.vcxproj b/neo/game.vcxproj index 1fb6594..7855f3f 100644 --- a/neo/game.vcxproj +++ b/neo/game.vcxproj @@ -189,6 +189,13 @@ cd $(SolutionDir)\.. "build\Win32\$(Configuration)\TypeInfo.exe" + + libcmt.lib;%(AdditionalDependencies) + + + + + diff --git a/neo/sys/win32/win_shared.cpp b/neo/sys/win32/win_shared.cpp index 8b29c60..43b8bad 100644 --- a/neo/sys/win32/win_shared.cpp +++ b/neo/sys/win32/win_shared.cpp @@ -47,6 +47,8 @@ If you have questions concerning this license or the applicable additional terms #pragma comment (lib, "wbemuuid.lib") #endif +#include "win_nanoafx.h" + /* ================ Sys_Milliseconds diff --git a/neo/sys/win32/win_taskkeyhook.cpp b/neo/sys/win32/win_taskkeyhook.cpp index 2252540..24ff583 100644 --- a/neo/sys/win32/win_taskkeyhook.cpp +++ b/neo/sys/win32/win_taskkeyhook.cpp @@ -34,7 +34,7 @@ If you have questions concerning this license or the applicable additional terms // //#define _WIN32_WINNT 0x0500 // for KBDLLHOOKSTRUCT -#include // MFC core and standard components +//#include // MFC core and standard components #include "win_local.h" #define DLLEXPORT __declspec(dllexport) diff --git a/neo/tools/comafx/StdAfx.h b/neo/tools/comafx/StdAfx.h index abfec46..073acc7 100644 --- a/neo/tools/comafx/StdAfx.h +++ b/neo/tools/comafx/StdAfx.h @@ -28,7 +28,7 @@ If you have questions concerning this license or the applicable additional terms #ifndef __AFX_STDAFX_H__ #define __AFX_STDAFX_H__ - +/* // include file for standard system include files, // or project specific include files that are used frequently, but // are changed infrequently @@ -62,5 +62,5 @@ float EditSpinFloat( CEdit *edit, bool up ); int SetSafeComboBoxSelection( CComboBox *combo, const char *string, int skip ); int GetSafeComboBoxSelection( CComboBox *combo, CString &string, int skip ); int UnsetSafeComboBoxSelection( CComboBox *combo, CString &string ); - +*/ #endif /* !__AFX_STDAFX_H__ */ diff --git a/neo/typeinfo.vcxproj b/neo/typeinfo.vcxproj index 9597401..9231af1 100644 --- a/neo/typeinfo.vcxproj +++ b/neo/typeinfo.vcxproj @@ -154,6 +154,17 @@ nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + + + libcmt.lib;%(AdditionalDependencies) + + + + + + + + Create