Skip to content
Permalink
Browse files

fix Visual Studio resource generated files

  • Loading branch information...
RadWolfie committed Apr 12, 2019
1 parent 8f50a2c commit 5d973b2dec17d4326cf37b14d36c0b1b50567b0a
Showing with 24 additions and 30 deletions.
  1. +2 −9 build/win32/Cxbx.vcxproj
  2. +17 −16 resource/Cxbx.rc
  3. +5 −5 src/gui/ResCxbx.h
@@ -92,7 +92,6 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
<AdditionalIncludeDirectories>Include\Win32\Cxbx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>legacy_stdio_definitions.lib;d3d9.lib;dinput8.lib;dxguid.lib;odbc32.lib;odbccp32.lib;Shlwapi.lib;dxerr9.lib;ws2_32.lib;dsound.lib;winmm.lib;ddraw.lib;d3dx9.lib;dbghelp.lib;comctl32.lib;XINPUT9_1_0.LIB;tomcryptd.lib;tommath.lib;wpcap.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -163,7 +162,6 @@
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
<AdditionalIncludeDirectories>Include\Win32\Cxbx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>legacy_stdio_definitions.lib;d3d9.lib;dinput8.lib;dxguid.lib;odbc32.lib;odbccp32.lib;Shlwapi.lib;dxerr9.lib;ws2_32.lib;dsound.lib;winmm.lib;ddraw.lib;d3dx9.lib;dbghelp.lib;comctl32.lib;XINPUT9_1_0.LIB;tomcrypt.lib;tommath.lib;wpcap.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -344,12 +342,7 @@
<None Include="..\..\src\devices\video\EmuNV2A_USER.cpp" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\resource\Cxbx.rc">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\cxbx\git\cxbx-ds\resource;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\cxbx\git\cxbx-ds\resource;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<ResourceCompile Include="..\..\resource\Cxbx.rc" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\common\crypto\EmuDes.cpp" />
@@ -578,4 +571,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
@@ -54,12 +54,12 @@ BEGIN
IDD_AUDIO_CFG, DIALOG
BEGIN
END

IDD_NETWORK_CFG, DIALOG
BEGIN
BOTTOMMARGIN, 74
BOTTOMMARGIN, 74
END

IDD_EEPROM_CFG, DIALOG
BEGIN
END
@@ -311,15 +311,15 @@ BEGIN
END

IDD_NETWORK_CFG DIALOGEX 0, 0, 404, 76
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Cxbx : Network Configuration"
FONT 8, "Verdana", 0, 0, 0x1
BEGIN
PUSHBUTTON "Cancel", IDC_AC_CANCEL, 285, 51, 50, 14, BS_FLAT
PUSHBUTTON "Accept", IDC_AC_ACCEPT, 339, 51, 50, 14, BS_FLAT
GROUPBOX "Network Configuration", -1, 4, 1, 396, 69, BS_CENTER
LTEXT "Network Adapter", -1, 13, 14, 57, 8, 0, WS_EX_RIGHT
COMBOBOX IDC_NETWORK_ADAPTER, 14, 28, 374, 30, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Cxbx : Network Configuration"
FONT 8, "Verdana", 0, 0, 0x1
BEGIN
PUSHBUTTON "Cancel",IDC_AC_CANCEL,285,51,50,14,BS_FLAT
PUSHBUTTON "Accept",IDC_AC_ACCEPT,339,51,50,14,BS_FLAT
GROUPBOX "Network Configuration",-1,4,1,396,69,BS_CENTER
LTEXT "Network Adapter",-1,13,14,57,8,0,WS_EX_RIGHT
COMBOBOX IDC_NETWORK_ADAPTER,14,28,374,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
END

IDD_EEPROM_CFG DIALOGEX 0, 0, 259, 279
@@ -445,6 +445,7 @@ END
//
// AFX_DIALOG_LAYOUT
//

IDD_NETWORK_CFG AFX_DIALOG_LAYOUT
BEGIN
0
@@ -592,7 +593,7 @@ BEGIN
MENUITEM MFT_SEPARATOR
MENUITEM "Config &Video...", ID_SETTINGS_CONFIG_VIDEO,MFT_STRING,MFS_ENABLED
MENUITEM "Config &Audio...", ID_SETTINGS_CONFIG_AUDIO,MFT_STRING,MFS_ENABLED
MENUITEM "Config &Network...", ID_SETTINGS_CONFIG_NETWORK, MFT_STRING, MFS_ENABLED
MENUITEM "Config &Network...", ID_SETTINGS_CONFIG_NETWORK,MFT_STRING,MFS_ENABLED
MENUITEM "Config &Eeprom...", ID_SETTINGS_CONFIG_EEPROM,MFT_STRING,MFS_ENABLED
MENUITEM "Config &Logging...", ID_SETTINGS_CONFIG_LOGGING,MFT_STRING,MFS_ENABLED
POPUP "Config &Data Location...", 65535,MFT_STRING,MFS_ENABLED
@@ -601,10 +602,10 @@ BEGIN
MENUITEM "Store with Executable", ID_SETTINGS_CONFIG_DLOCEXECDIR,MFT_STRING,MFS_ENABLED
MENUITEM "Custom", ID_SETTINGS_CONFIG_DLOCCUSTOM,MFT_STRING,MFS_ENABLED
END
POPUP "&Symbol Cache", 65535,MFT_STRING,MFS_ENABLED
POPUP "&Symbol Cache", 65535,MFT_STRING,MFS_ENABLED
BEGIN
MENUITEM "&Clear entire Symbol Cache", ID_CACHE_CLEARHLECACHE_ALL,MFT_STRING,MFS_ENABLED
MENUITEM "&Rescan title Symbol Cache", ID_CACHE_CLEARHLECACHE_CURRENT,MFT_STRING,MFS_ENABLED
MENUITEM "&Clear entire Symbol Cache", ID_CACHE_CLEARHLECACHE_ALL,MFT_STRING,MFS_ENABLED
MENUITEM "&Rescan title Symbol Cache", ID_CACHE_CLEARHLECACHE_CURRENT,MFT_STRING,MFS_ENABLED
END
MENUITEM MFT_SEPARATOR
POPUP "&LLE (Experimental)", 65535,MFT_STRING,MFS_ENABLED
@@ -20,6 +20,7 @@
#define IDS_UEM 123
#define IDD_CONTROLLER_HOST_MAPPING 131
#define IDD_VIRTUAL_SBC_FEEDBACK 133
#define IDD_NETWORK_CFG 134
#define IDC_LOG_CANCEL 892
#define IDC_LOG_ACCEPT 893
#define IDC_LOG_ENABLE_GENERAL 894
@@ -296,6 +297,7 @@
#define IDC_EVENT_LV 1273
#define IDC_CXBXR_EVENTS 1274
#define IDC_KERNEL_EVENTS 1275
#define IDC_NETWORK_ADAPTER 1276
#define ID_FILE_EXIT 40005
#define ID_HELP_ABOUT 40008
#define ID_EMULATION_START 40009
@@ -350,14 +352,12 @@
#define ID_HACKS_SPEEDHACKS 40103
#define ID_SETTINGS_CONFIG_DLOCCUSTOM 40104
#define ID_SETTINGS_CONFIG_DLOCAPPDATA 40105
#define ID_SETTINGS_CONFIG_DLOCEXECDIR 40106
#define ID_SETTINGS_CONFIG_DLOCEXECDIR 40106
#define ID_SETTINGS_ALLOWADMINPRIVILEGE 40107
#define ID_SETTINGS_CONFIG_LOGGING 40108
#define ID_SYNC_CONFIG_LOGGING 40109
#define ID_LOG 40110
#define ID_SETTINGS_CONFIG_NETWORK 40111
#define IDC_NETWORK_ADAPTER 1276
#define IDD_NETWORK_CFG 40112
#define IDC_STATIC -1

// Next default values for new objects
@@ -366,7 +366,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 135
#define _APS_NEXT_COMMAND_VALUE 40113
#define _APS_NEXT_CONTROL_VALUE 1257
#define _APS_NEXT_SYMED_VALUE 104
#define _APS_NEXT_CONTROL_VALUE 1277
#define _APS_NEXT_SYMED_VALUE 109
#endif
#endif

0 comments on commit 5d973b2

Please sign in to comment.
You can’t perform that action at this time.