ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Project64] Move Logging.cpp/h out of c core folder

This commit is contained in:
zilmar 2015-11-08 17:45:43 +11:00
parent 568226d5ff
commit 786be5b062
7 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Source/Project64/N64 System/C Core/Logging.cpp → Source/Project64/Logging.cpp
View File

0
Source/Project64/N64 System/C Core/Logging.h → Source/Project64/Logging.h
View File

2
Source/Project64/N64 System.h
View File

@ -45,7 +45,6 @@ class CNotification;
//C Core - to be upgrdaded and removed //C Core - to be upgrdaded and removed
#include "N64 System/C Core/r4300i Commands.h" #include "N64 System/C Core/r4300i Commands.h"
#include "N64 System/C Core/Logging.h"
//Interpter //Interpter
#include "N64 System/Interpreter/Interpreter Ops.h" #include "N64 System/Interpreter/Interpreter Ops.h"
@ -77,4 +76,3 @@ class CNotification;
//Main Files //Main Files
#include "N64 System/N64 Class.h" #include "N64 System/N64 Class.h"
#include "N64 System/System Globals.h" #include "N64 System/System Globals.h"

1
Source/Project64/N64 System/Interpreter/Interpreter Ops.cpp
View File

@ -9,7 +9,6 @@
* * * *
****************************************************************************/ ****************************************************************************/
#include "stdafx.h" #include "stdafx.h"
#include "../C Core/Logging.h"
void InPermLoop(); void InPermLoop();
void TestInterpreterJump(DWORD PC, DWORD TargetPC, int Reg1, int Reg2); void TestInterpreterJump(DWORD PC, DWORD TargetPC, int Reg1, int Reg2);

16
Source/Project64/Project64.vcproj
View File

@ -145,6 +145,10 @@
Name="Source Files" Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
> >
<File
RelativePath=".\Logging.cpp"
>
</File>
<File <File
RelativePath="main.cpp" RelativePath="main.cpp"
> >
@ -511,10 +515,6 @@
<Filter <Filter
Name="C Core Source" Name="C Core Source"
> >
<File
RelativePath="N64 System\C Core\Logging.cpp"
>
</File>
<File <File
RelativePath="N64 System\C Core\r4300i Commands.cpp" RelativePath="N64 System\C Core\r4300i Commands.cpp"
> >
@ -789,6 +789,10 @@
Name="Header Files" Name="Header Files"
Filter="h;hpp;hxx;hm;inl" Filter="h;hpp;hxx;hm;inl"
> >
<File
RelativePath=".\Logging.h"
>
</File>
<File <File
RelativePath="Multilanguage.h" RelativePath="Multilanguage.h"
> >
@ -1183,10 +1187,6 @@
<Filter <Filter
Name="C Core Headers" Name="C Core Headers"
> >
<File
RelativePath="N64 System\C Core\Logging.h"
>
</File>
<File <File
RelativePath="N64 System\C Core\r4300i Commands.h" RelativePath="N64 System\C Core\r4300i Commands.h"
> >

3
Source/Project64/User Interface/Gui Class.cpp
View File

@ -13,10 +13,7 @@
#include <commctrl.h> #include <commctrl.h>
#include "Settings/SettingType/SettingsType-Application.h" #include "Settings/SettingType/SettingsType-Application.h"
extern "C"
{
void EnterLogOptions(HWND hwndOwner); void EnterLogOptions(HWND hwndOwner);
}
#pragma comment(lib, "Comctl32.lib") #pragma comment(lib, "Comctl32.lib")

1
Source/Project64/stdafx.h
View File

@ -20,6 +20,7 @@
#include <shellapi.h> #include <shellapi.h>
#include "Multilanguage.h" #include "Multilanguage.h"
#include "User Interface.h" #include "User Interface.h"
#include "Logging.h"
#include "N64 System.h" #include "N64 System.h"
#include "Plugin.h" #include "Plugin.h"
#include "Support.h" #include "Support.h"