Permalink
Browse files

Renamed Cxbx -> gui folder

  • Loading branch information...
ergo720 committed Dec 15, 2018
1 parent 980e073 commit 0cb83f9cc84d8025c5f5d086121669c3467b2e5a
@@ -218,7 +218,7 @@
<ClInclude Include="..\..\src\Common\XDVDFS Tools\xdvdfs.h" />
<ClInclude Include="..\..\src\Cxbx.h" />
<ClInclude Include="..\..\src\CxbxKrnl\CxbxKrnl.h" />
<ClInclude Include="..\..\src\CxbxKrnl\DbgConsole.h" />
<ClInclude Include="..\..\src\gui\DbgConsole.h" />
<ClInclude Include="..\..\src\core\HLE\D3D8\Direct3D9\Direct3D9.h" />
<ClInclude Include="..\..\src\core\HLE\D3D8\XbD3D8Types.h" />
<ClInclude Include="..\..\src\core\HLE\D3D8\XbConvert.h" />
@@ -258,20 +258,20 @@
<ClInclude Include="..\..\src\CxbxKrnl\VMManager.h" />
<ClInclude Include="..\..\src\CxbxVersion.h" />
<ClInclude Include="..\..\src\common\xbdm\CxbxXbdm.h" />
<ClInclude Include="..\..\src\Cxbx\DlgAbout.h" />
<ClInclude Include="..\..\src\Cxbx\DlgAudioConfig.h" />
<ClInclude Include="..\..\src\Cxbx\DlgControllerConfig.h" />
<ClInclude Include="..\..\src\Cxbx\DlgEepromConfig.h" />
<ClInclude Include="..\..\src\Cxbx\DlgLoggingConfig.h" />
<ClInclude Include="..\..\src\Cxbx\DlgVideoConfig.h" />
<ClInclude Include="..\..\src\gui\DlgAbout.h" />
<ClInclude Include="..\..\src\gui\DlgAudioConfig.h" />
<ClInclude Include="..\..\src\gui\DlgControllerConfig.h" />
<ClInclude Include="..\..\src\gui\DlgEepromConfig.h" />
<ClInclude Include="..\..\src\gui\DlgLoggingConfig.h" />
<ClInclude Include="..\..\src\gui\DlgVideoConfig.h" />
<ClInclude Include="..\..\src\CxbxKrnl\Emu.h" />
<ClInclude Include="..\..\src\CxbxKrnl\EmuShared.h" />
<ClInclude Include="..\..\src\Common\Error.h" />
<ClInclude Include="..\..\src\Common\Win32\Mutex.h" />
<ClInclude Include="..\..\src\Cxbx\DlgXboxControllerPortMapping.h" />
<ClInclude Include="..\..\src\Cxbx\ResCxbx.h" />
<ClInclude Include="..\..\src\Cxbx\Wnd.h" />
<ClInclude Include="..\..\src\Cxbx\WndMain.h" />
<ClInclude Include="..\..\src\gui\DlgXboxControllerPortMapping.h" />
<ClInclude Include="..\..\src\gui\ResCxbx.h" />
<ClInclude Include="..\..\src\gui\Wnd.h" />
<ClInclude Include="..\..\src\gui\WndMain.h" />
<ClInclude Include="..\..\src\Common\Win32\DInputController.h" />
<ClInclude Include="..\..\src\common\xbe\Xbe.h" />
<ClInclude Include="..\..\src\devices\ADM1032Device.h" />
@@ -371,7 +371,7 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WholeProgramOptimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</WholeProgramOptimization>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\DbgConsole.cpp">
<ClCompile Include="..\..\src\gui\DbgConsole.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -465,17 +465,17 @@
<ClCompile Include="..\..\src\devices\usb\Timer.cpp" />
<ClCompile Include="..\..\src\CxbxKrnl\VMManager.cpp" />
<ClCompile Include="..\..\src\common\xbdm\CxbxXbdm.cpp" />
<ClCompile Include="..\..\src\Cxbx\DlgAbout.cpp" />
<ClCompile Include="..\..\src\Cxbx\DlgAudioConfig.cpp" />
<ClCompile Include="..\..\src\Cxbx\DlgControllerConfig.cpp">
<ClCompile Include="..\..\src\gui\DlgAbout.cpp" />
<ClCompile Include="..\..\src\gui\DlgAudioConfig.cpp" />
<ClCompile Include="..\..\src\gui\DlgControllerConfig.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\src\Cxbx\DlgEepromConfig.cpp" />
<ClCompile Include="..\..\src\Cxbx\DlgLoggingConfig.cpp" />
<ClCompile Include="..\..\src\Cxbx\DlgVideoConfig.cpp">
<ClCompile Include="..\..\src\gui\DlgEepromConfig.cpp" />
<ClCompile Include="..\..\src\gui\DlgLoggingConfig.cpp" />
<ClCompile Include="..\..\src\gui\DlgVideoConfig.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -493,20 +493,20 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\src\Cxbx\DlgXboxControllerPortMapping.cpp" />
<ClCompile Include="..\..\src\Cxbx\WinMain.cpp">
<ClCompile Include="..\..\src\gui\DlgXboxControllerPortMapping.cpp" />
<ClCompile Include="..\..\src\gui\WinMain.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\src\Cxbx\Wnd.cpp">
<ClCompile Include="..\..\src\gui\Wnd.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\src\Cxbx\WndMain.cpp">
<ClCompile Include="..\..\src\gui\WndMain.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\..\src\Cxbx\DlgControllerConfig.cpp">
<ClCompile Include="..\..\src\gui\DlgControllerConfig.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Cxbx\DlgVideoConfig.cpp">
<ClCompile Include="..\..\src\gui\DlgVideoConfig.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Cxbx\WinMain.cpp">
<ClCompile Include="..\..\src\gui\WinMain.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Cxbx\Wnd.cpp">
<ClCompile Include="..\..\src\gui\Wnd.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Cxbx\WndMain.cpp">
<ClCompile Include="..\..\src\gui\WndMain.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\HLE\D3D8\XbConvert.cpp">
@@ -100,7 +100,7 @@
<ClCompile Include="..\..\src\CxbxKrnl\CxbxKrnl.cpp">
<Filter>Emulator</Filter>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\DbgConsole.cpp">
<ClCompile Include="..\..\src\gui\DbgConsole.cpp">
<Filter>Emulator</Filter>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\Emu.cpp">
@@ -169,13 +169,13 @@
<ClCompile Include="..\..\src\Common\EmuEEPROM.cpp">
<Filter>Shared</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Cxbx\DlgAbout.cpp">
<ClCompile Include="..\..\src\gui\DlgAbout.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\HLE\D3D8\XbD3D8Logging.cpp">
<Filter>core\HLE\D3D8</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Cxbx\DlgAudioConfig.cpp">
<ClCompile Include="..\..\src\gui\DlgAudioConfig.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\PhysicalMemory.cpp">
@@ -266,7 +266,7 @@
<ClCompile Include="..\..\src\CxbxKrnl\EmuRsa.cpp">
<Filter>Emulator</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Cxbx\DlgEepromConfig.cpp">
<ClCompile Include="..\..\src\gui\DlgEepromConfig.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\PoolManager.cpp">
@@ -287,7 +287,7 @@
<ClCompile Include="..\..\src\devices\usb\XidGamepad.cpp">
<Filter>Hardware\Usb</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Cxbx\DlgXboxControllerPortMapping.cpp">
<ClCompile Include="..\..\src\gui\DlgXboxControllerPortMapping.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Common\Win32\XBPortMapping.cpp">
@@ -314,22 +314,22 @@
<ClCompile Include="..\..\src\Common\Win32\DInputController.cpp">
<Filter>Shared</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Cxbx\DlgLoggingConfig.cpp">
<ClCompile Include="..\..\src\gui\DlgLoggingConfig.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Common\Win32\IPCWindows.cpp">
<Filter>Cross Platform\Win32</Filter>
</ClCompile>
<ClInclude Include="..\..\src\Cxbx\DlgControllerConfig.h">
<ClInclude Include="..\..\src\gui\DlgControllerConfig.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Cxbx\DlgVideoConfig.h">
<ClInclude Include="..\..\src\gui\DlgVideoConfig.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Cxbx\WndMain.h">
<ClInclude Include="..\..\src\gui\WndMain.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Cxbx\Wnd.h">
<ClInclude Include="..\..\src\gui\Wnd.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\D3D8\XbConvert.h">
@@ -368,7 +368,7 @@
<ClInclude Include="..\..\src\Common\Win32\Mutex.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Cxbx\ResCxbx.h">
<ClInclude Include="..\..\src\gui\ResCxbx.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\common\xbe\Xbe.h">
@@ -377,7 +377,7 @@
<ClInclude Include="..\..\src\CxbxKrnl\CxbxKrnl.h">
<Filter>Emulator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\DbgConsole.h">
<ClInclude Include="..\..\src\gui\DbgConsole.h">
<Filter>Emulator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\D3D8\Direct3D9\Direct3D9.h">
@@ -455,7 +455,7 @@
<ClInclude Include="..\..\src\CxbxVersion.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Cxbx\DlgAbout.h">
<ClInclude Include="..\..\src\gui\DlgAbout.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\D3D8\XbD3D8Logging.h">
@@ -467,7 +467,7 @@
<ClInclude Include="..\..\src\core\HLE\DSOUND\DirectSound\DirectSoundInline.hpp">
<Filter>core\HLE\DSOUND\DirectSound</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Cxbx\DlgAudioConfig.h">
<ClInclude Include="..\..\src\gui\DlgAudioConfig.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\PhysicalMemory.h">
@@ -575,7 +575,7 @@
<ClInclude Include="..\..\src\CxbxKrnl\EmuRsa.h">
<Filter>Emulator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Cxbx\DlgEepromConfig.h">
<ClInclude Include="..\..\src\gui\DlgEepromConfig.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\PoolManager.h">
@@ -599,7 +599,7 @@
<ClInclude Include="..\..\src\devices\usb\XidGamepad.h">
<Filter>Hardware\Usb</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Cxbx\DlgXboxControllerPortMapping.h">
<ClInclude Include="..\..\src\gui\DlgXboxControllerPortMapping.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Common\Win32\XBPortMapping.h">
@@ -620,7 +620,7 @@
<ClInclude Include="..\..\src\Common\Win32\DInputController.h">
<Filter>Shared</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Cxbx\DlgLoggingConfig.h">
<ClInclude Include="..\..\src\gui\DlgLoggingConfig.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Common\IPCHybrid.hpp">
@@ -1,6 +1,6 @@
// Microsoft Visual C++ generated resource script.
//
#include "..\src\Cxbx\ResCxbx.h"
#include "..\src\gui\ResCxbx.h"

#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -44,7 +44,7 @@ namespace xboxkrnl
#include <xboxkrnl/xboxkrnl.h>
};

#include "Cxbx\ResCxbx.h"
#include "gui\ResCxbx.h"
#include "CxbxKrnl.h"
#include "common\xbdm\CxbxXbdm.h" // For Cxbx_LibXbdmThunkTable
#include "CxbxVersion.h"
@@ -40,7 +40,7 @@

#include "Cxbx.h"
#include "CxbxKrnl/CxbxKrnl.h"
#include "Cxbx/ResCxbx.h"
#include "gui/ResCxbx.h"

#include "Common/IPCHybrid.hpp"
#include "CxbxKrnl/EmuShared.h"
@@ -51,15 +51,15 @@ namespace xboxkrnl
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuFS.h"
#include "CxbxKrnl/EmuShared.h"
#include "CxbxKrnl/DbgConsole.h"
#include "gui/DbgConsole.h"
#include "CxbxKrnl/ResourceTracker.h"
#include "CxbxKrnl/VMManager.h" // for g_VMManager
#include "CxbxKrnl/EmuXTL.h"
#include "Logging.h"
#include "../XbD3D8Logging.h"
#include "core/HLE/Intercept.hpp" // for bLLE_GPU
#include "devices/video/nv2a.h" // For GET_MASK, NV_PGRAPH_CONTROL_0
#include "Cxbx/ResCxbx.h"
#include "gui/ResCxbx.h"

#include <assert.h>
#include <process.h>
@@ -36,11 +36,11 @@
// ******************************************************************
#define _XBOXKRNL_DEFEXTRN_

#include "CxbxKrnl.h"
#include "Emu.h"
#include "CxbxKrnl\CxbxKrnl.h"
#include "CxbxKrnl\Emu.h"
#include "DbgConsole.h"
#include "ResourceTracker.h"
#include "EmuXTL.h"
#include "CxbxKrnl\ResourceTracker.h"
#include "CxbxKrnl\EmuXTL.h"

#include <conio.h>

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -41,7 +41,7 @@
#include "Winuser.h"
#include "Windowsx.h"
#include "Commctrl.h"
#include "../Cxbx/ResCxbx.h"
#include "../gui/ResCxbx.h"

#include <cstdio>

0 comments on commit 0cb83f9

Please sign in to comment.