From 5c37ceaa97be6bad18961f8e381736a11ef1573f Mon Sep 17 00:00:00 2001 From: Pysis Date: Thu, 23 Sep 2021 01:09:36 -0400 Subject: [PATCH 1/2] Re-enable logging feature with convenience It seemed useful as I was having issues while using the program normal, and since it was already developed. Added brand new gitignore file ignoring IDE cache and build result files. Updated README with additional development instructions so the project can be built and work more immediately once opening. Added new setting/preset `LOGGING` with a checkbox on the settings page. Kept the overall dialog size by placing it near the bottom off to the right side from the install driver button for now. Also fixed the tab order for all of those elements. Added the usual element id unique at least to the 1 tab, removing a typo for another while I was in that same file, along with the relevant init code and user action handler for controlling the checkbox's state. Had to initialize the `TegraRcm` object earlier in the dialog class and have the logging state properly initialized since there were `AppendLog` method calls early in program execution. Updated the project tooling to 2019 (v142). Swore the library file was being used before but I only found the include paths later on, so added that additional dependency so the program would build finding the external function references. --- .gitignore | 2 + README.md | 7 + TegraRcmGUI/DialogTab03.cpp | 23 ++ TegraRcmGUI/DialogTab03.h | 1 + TegraRcmGUI/TegraRcm.cpp | 4 +- TegraRcmGUI/TegraRcm.h | 1 + TegraRcmGUI/TegraRcmGUI.rc | Bin 23446 -> 23666 bytes TegraRcmGUI/TegraRcmGUI.vcxproj | 577 ++++++++++++++++---------------- TegraRcmGUI/TegraRcmGUIDlg.cpp | 7 +- TegraRcmGUI/resource.h | Bin 11320 -> 11320 bytes 10 files changed, 329 insertions(+), 293 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..51b1137 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.vs +x64 \ No newline at end of file diff --git a/README.md b/README.md index 262731b..48a2319 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,13 @@ For other platforms, you can use : ## Issue / Suggestion Please open new [issue](https://github.com/eliboa/TegraRcmGUI/issues) to report a bug or submit a suggestion. +## Development + +Install the [libusbk dev kit](https://sourceforge.net/projects/libusbk/) using the setup program. +If not installed in the default `C:\libusbK-dev-kit` location, then create an encironment variable with the other path as the value. +The project seems to survive a target upgrade from the tools in Visual Studio 2017 to 2019. +Make sure with the library's include files path correct, the actual library name still exists in the Project Settings/Properties > Linker > Input > Additional Dependencies list as `libusbK.lib`. + ## How to backup/restore your Nintendo Switch's NAND ? 1) Use [memloader](https://github.com/rajkosto/memloader) v3 to mount eMMC on your computer diff --git a/TegraRcmGUI/DialogTab03.cpp b/TegraRcmGUI/DialogTab03.cpp index aa857b2..54b5b6d 100644 --- a/TegraRcmGUI/DialogTab03.cpp +++ b/TegraRcmGUI/DialogTab03.cpp @@ -45,6 +45,14 @@ BOOL DialogTab03::OnInitDialog() checkbox->SetCheck(BST_CHECKED); } + value = m_TegraRcm->GetPreset("LOGGING"); + if (value == "TRUE") + { + m_TegraRcm->LOGGING_CURR = TRUE; + CMFCButton* checkbox = (CMFCButton*)GetDlgItem(LOGGING); + checkbox->SetCheck(BST_CHECKED); + } + TCHAR szPath[MAX_PATH]; if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, szPath))) { @@ -66,6 +74,7 @@ BEGIN_MESSAGE_MAP(DialogTab03, CDialogEx) ON_BN_CLICKED(MIN_TO_TRAY, &DialogTab03::OnClickedMinToTray) ON_BN_CLICKED(ID_INSTALL_DRIVER, &DialogTab03::OnBnClickedInstallDriver) ON_BN_CLICKED(RUN_WINSTART, &DialogTab03::OnBnClickedWinstart) + ON_BN_CLICKED(LOGGING, &DialogTab03::OnClickedLogging) //ON_BN_CLICKED(IDC_BUTTON2, &DialogTab03::OnBnClickedButton2) END_MESSAGE_MAP() @@ -113,6 +122,20 @@ void DialogTab03::OnClickedMinToTray() } +void DialogTab03::OnClickedLogging() +{ + // Get Minimize to tray checkbox value (checked, unchecked) + CButton* m_ctlCheck = (CButton*)GetDlgItem(LOGGING); + BOOL IsCheckChecked = (m_ctlCheck->GetCheck() == 1) ? true : false; + if (m_TegraRcm->LOGGING_CURR != IsCheckChecked) + { + if (IsCheckChecked) m_TegraRcm->SetPreset("LOGGING", "TRUE"); + else m_TegraRcm->SetPreset("LOGGING", "FALSE"); + m_TegraRcm->LOGGING_CURR = IsCheckChecked; + } +} + + void DialogTab03::OnBnClickedInstallDriver() { m_TegraRcm->InstallDriver(); diff --git a/TegraRcmGUI/DialogTab03.h b/TegraRcmGUI/DialogTab03.h index 8b55158..88445c0 100644 --- a/TegraRcmGUI/DialogTab03.h +++ b/TegraRcmGUI/DialogTab03.h @@ -44,6 +44,7 @@ public: afx_msg void OnClickedMinToTray(); afx_msg void OnBnClickedInstallDriver(); afx_msg void OnBnClickedWinstart(); + afx_msg void OnClickedLogging(); void CreateLink(); afx_msg void CleanRegestry(); diff --git a/TegraRcmGUI/TegraRcm.cpp b/TegraRcmGUI/TegraRcm.cpp index ca247ad..99b1e07 100644 --- a/TegraRcmGUI/TegraRcm.cpp +++ b/TegraRcmGUI/TegraRcm.cpp @@ -37,6 +37,7 @@ TegraRcm::TegraRcm(CDialog* pParent /*=NULL*/) { m_Parent = pParent; m_hWnd = AfxGetMainWnd()->GetSafeHwnd(); + this->LOGGING_CURR = GetPreset("LOGGING") == "TRUE"; GetFavorites(); //SendUserMessage("Waiting for device in RCM mode"); } @@ -543,8 +544,7 @@ void TegraRcm::SaveFavorites() void TegraRcm::AppendLog(string message) { - // DISABLED - return; + if (!this->LOGGING_CURR) return; // Get time diff --git a/TegraRcmGUI/TegraRcm.h b/TegraRcmGUI/TegraRcm.h index ec926f9..5bf7e35 100644 --- a/TegraRcmGUI/TegraRcm.h +++ b/TegraRcmGUI/TegraRcm.h @@ -72,6 +72,7 @@ public: BOOL WAITING_RECONNECT = FALSE; BOOL ASK_FOR_DRIVER = FALSE; BOOL MIN_TO_TRAY_CURR = FALSE; + BOOL LOGGING_CURR = FALSE; CString csPath; COLORREF LabelColor = RGB(0, 0, 0); diff --git a/TegraRcmGUI/TegraRcmGUI.rc b/TegraRcmGUI/TegraRcmGUI.rc index 6468d51cbbea70d7df4ce944b572f28524282861..9c2f7dc55fe3f86af4fac567688bd1b70c09966a 100644 GIT binary patch delta 190 zcmbQXo$=ES#tom0CMy|POx|R?Yw{i~j>&o2N|QB=6&MvJyBn)YDlixUp$>xrgE@l% zm^NcD1<{jhjZNKM8S)qs8Il-s7*c^Mav1U%(t$7&D4Nco1Xk_C;LqR=gq{q3KoVq* z5`z;%DMJYm<^$D%RZYHbXf3b6U fCu+=1e|kF0px!*)~-GK#~_& diff --git a/TegraRcmGUI/TegraRcmGUI.vcxproj b/TegraRcmGUI/TegraRcmGUI.vcxproj index adcbfdd..648bb4e 100644 --- a/TegraRcmGUI/TegraRcmGUI.vcxproj +++ b/TegraRcmGUI/TegraRcmGUI.vcxproj @@ -1,289 +1,290 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {2C091C5B-378F-44D0-91F2-53489BA7B83C} - TegraRcmGUI - MFCProj - 10.0.14393.0 - - - - Application - true - v141 - Unicode - Dynamic - - - Application - false - false - Unicode - Dynamic - v141 - - - Application - true - v141 - Unicode - Dynamic - - - Application - false - true - Unicode - Dynamic - v140 - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - Use - Level3 - Disabled - WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions) - true - C:\libusbK-dev-kit\includes;$(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories) - - - Windows - true - Version.lib;libusbK.lib - C:\libusbK-dev-kit\bin\lib\x86;$(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories) - $(OutDir)$(TargetName)$(TargetExt) - - - false - true - _DEBUG;%(PreprocessorDefinitions) - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - _WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - C:\libusbK-dev-kit\includes\;$(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories) - - - Windows - true - $(OutDir)$(TargetName)$(TargetExt) - C:\libusbK-dev-kit\bin\lib\amd64\;$(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories) - - - false - true - _DEBUG;%(PreprocessorDefinitions) - - - 0x0409 - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions) - true - C:\libusbK-dev-kit\includes;$(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories) - - - Windows - true - true - true - C:\libusbK-dev-kit\bin\lib\x86;$(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories) - Version.lib;libusbK.lib;%(AdditionalDependencies) - AsInvoker - true - false - - - false - true - NDEBUG;%(PreprocessorDefinitions) - - - 0x0409 - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Level3 - Use - MaxSpeed - true - true - _WINDOWS;NDEBUG;%(PreprocessorDefinitions) - true - $(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories) - - - Windows - true - true - true - $(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories) - Version.lib;libusbK.lib;%(AdditionalDependencies) - - - false - true - NDEBUG;%(PreprocessorDefinitions) - - - 0x0409 - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + {2C091C5B-378F-44D0-91F2-53489BA7B83C} + TegraRcmGUI + MFCProj + 10.0 + + + + Application + true + v142 + Unicode + Dynamic + + + Application + false + false + Unicode + Dynamic + v142 + + + Application + true + v142 + Unicode + Dynamic + + + Application + false + true + Unicode + Dynamic + v142 + + + + + + + + + + + + + + + + + + + + + true + + + true + + + false + + + false + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions) + true + C:\libusbK-dev-kit\includes;$(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories) + + + Windows + true + Version.lib;libusbK.lib + C:\libusbK-dev-kit\bin\lib\x86;$(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories) + $(OutDir)$(TargetName)$(TargetExt) + + + false + true + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + _WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + C:\libusbK-dev-kit\includes\;$(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories) + + + Windows + true + $(OutDir)$(TargetName)$(TargetExt) + C:\libusbK-dev-kit\bin\lib\amd64\;$(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories) + libusbK.lib + + + false + true + _DEBUG;%(PreprocessorDefinitions) + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions) + true + C:\libusbK-dev-kit\includes;$(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + C:\libusbK-dev-kit\bin\lib\x86;$(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories) + Version.lib;libusbK.lib;%(AdditionalDependencies) + AsInvoker + true + false + + + false + true + NDEBUG;%(PreprocessorDefinitions) + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Level3 + Use + MaxSpeed + true + true + _WINDOWS;NDEBUG;%(PreprocessorDefinitions) + true + $(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + $(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories) + Version.lib;libusbK.lib;%(AdditionalDependencies) + + + false + true + NDEBUG;%(PreprocessorDefinitions) + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/TegraRcmGUI/TegraRcmGUIDlg.cpp b/TegraRcmGUI/TegraRcmGUIDlg.cpp index 5f6321a..8b129a3 100644 --- a/TegraRcmGUI/TegraRcmGUIDlg.cpp +++ b/TegraRcmGUI/TegraRcmGUIDlg.cpp @@ -101,6 +101,10 @@ END_MESSAGE_MAP() // BOOL CTegraRcmGUIDlg::OnInitDialog() { + + m_TegraRcm = new TegraRcm(this); + m_TegraRcm->AppendLog("new TegraRcm()"); + CDialog::OnInitDialog(); // Accessibility @@ -187,9 +191,6 @@ BOOL CTegraRcmGUIDlg::OnInitDialog() SetIcon(m_hIcon, TRUE); // Set big icon SetIcon(m_hIcon, FALSE); // Set small icon - m_TegraRcm = new TegraRcm(this); - m_TegraRcm->AppendLog("new TegraRcm()"); - // Kill other running process of app m_TegraRcm->KillRunningProcess(TEXT("TegraRcmGUI.exe")); diff --git a/TegraRcmGUI/resource.h b/TegraRcmGUI/resource.h index 705144c123641c19ada56360f4a56ef14ce7e819..ba7c72d77463eff1c94d6500e652fda53937d524 100644 GIT binary patch delta 32 ocmdlHu_I!`7V*gf5+3Y64E_x64DOQ)S*$0|l2F;4Bymj`0JuI1kpKVy delta 32 ocmdlHu_I!`7IEefhM>tG1vMu>5SN*}Ks;u$fF#%EB#CRn0N3>lD*ylh From 6c0fb778f40ba20c4da142b63998ce70f10b0fe3 Mon Sep 17 00:00:00 2001 From: Pysis Date: Thu, 23 Sep 2021 02:22:38 -0400 Subject: [PATCH 2/2] Cleaning Made a consolidated output path style that seems reasonable, and ignored it from SCM. Thought the project should build in release mode and found it was over-customized in debug mode. Also had to fix some random security errors. Made the build configurations more consistent, and also simplified them, opting now to only enable the env var method that is more flexible and may have been added automatically by the IDE as a successful recommendation. Simplified README accordingly. --- .gitignore | 2 +- README.md | 5 +---- TegraRcmGUI/DialogTab02.cpp | 8 ++++---- TegraRcmGUI/TegraRcm.cpp | 9 ++++----- TegraRcmGUI/TegraRcmGUI.vcxproj | 22 ++++++++++++---------- 5 files changed, 22 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 51b1137..4012e94 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ .vs -x64 \ No newline at end of file +Output \ No newline at end of file diff --git a/README.md b/README.md index 48a2319..eb16a03 100644 --- a/README.md +++ b/README.md @@ -39,10 +39,7 @@ Please open new [issue](https://github.com/eliboa/TegraRcmGUI/issues) to report ## Development -Install the [libusbk dev kit](https://sourceforge.net/projects/libusbk/) using the setup program. -If not installed in the default `C:\libusbK-dev-kit` location, then create an encironment variable with the other path as the value. -The project seems to survive a target upgrade from the tools in Visual Studio 2017 to 2019. -Make sure with the library's include files path correct, the actual library name still exists in the Project Settings/Properties > Linker > Input > Additional Dependencies list as `libusbK.lib`. +Install the [libusbk dev kit](https://sourceforge.net/projects/libusbk/) using the setup program, then create an environment variable `LIBUSBK_DIR` with the installation path as the value. ## How to backup/restore your Nintendo Switch's NAND ? diff --git a/TegraRcmGUI/DialogTab02.cpp b/TegraRcmGUI/DialogTab02.cpp index 261060b..8e158b5 100644 --- a/TegraRcmGUI/DialogTab02.cpp +++ b/TegraRcmGUI/DialogTab02.cpp @@ -144,16 +144,16 @@ void DialogTab02::OnBnClickedMountSd() switch (pmyComboBox->GetCurSel()) { case 0: - _tcscpy(args, TEXT(".\\tools\\memloader\\memloader_usb.bin -r --dataini=.\\tools\\memloader\\ums_boot0.ini")); + _tcscpy_s(args, 255, TEXT(".\\tools\\memloader\\memloader_usb.bin -r --dataini=.\\tools\\memloader\\ums_boot0.ini")); break; case 1: - _tcscpy(args, TEXT(".\\tools\\memloader\\memloader_usb.bin -r --dataini=.\\tools\\memloader\\ums_boot1.ini")); + _tcscpy_s(args, 255, TEXT(".\\tools\\memloader\\memloader_usb.bin -r --dataini=.\\tools\\memloader\\ums_boot1.ini")); break; case 2: - _tcscpy(args, TEXT(".\\tools\\memloader\\memloader_usb.bin -r --dataini=.\\tools\\memloader\\ums_emmc.ini")); + _tcscpy_s(args, 255, TEXT(".\\tools\\memloader\\memloader_usb.bin -r --dataini=.\\tools\\memloader\\ums_emmc.ini")); break; default: - _tcscpy(args, TEXT(".\\tools\\memloader\\memloader_usb.bin -r --dataini=.\\tools\\memloader\\ums_sd.ini")); + _tcscpy_s(args, 255, TEXT(".\\tools\\memloader\\memloader_usb.bin -r --dataini=.\\tools\\memloader\\ums_sd.ini")); break; } diff --git a/TegraRcmGUI/TegraRcm.cpp b/TegraRcmGUI/TegraRcm.cpp index 99b1e07..8d2e913 100644 --- a/TegraRcmGUI/TegraRcm.cpp +++ b/TegraRcmGUI/TegraRcm.cpp @@ -869,10 +869,9 @@ int TegraRcm::Smasher(TCHAR args[4096], BOOL bInheritHandles) CString csPath2(csPath); csPath.Append(TEXT(".\\TegraRcmSmash.exe ")); TCHAR cmd[4096]; - _tcscpy_s(cmd, csPath); + _tcscpy_s(cmd, 4095, csPath); lstrcat(cmd, args); - SECURITY_ATTRIBUTES sa; sa.nLength = sizeof(sa); sa.lpSecurityDescriptor = NULL; @@ -1126,7 +1125,7 @@ char* TegraRcm::GetRelativeFilename(char *currentDirectory, char *absoluteFilena if (currentDirectory[0] != absoluteFilename[0]) { // not on the same drive, so only absolute filename will do - strcpy(relativeFilename, absoluteFilename); + strcpy_s(relativeFilename, MAX_FILENAME_LEN, absoluteFilename); return relativeFilename; } // they are on the same drive, find out how much of the current directory @@ -1147,7 +1146,7 @@ char* TegraRcm::GetRelativeFilename(char *currentDirectory, char *absoluteFilena // file name should not have a leading one... i++; } - strcpy(relativeFilename, &absoluteFilename[i]); + strcpy_s(relativeFilename, MAX_FILENAME_LEN, &absoluteFilename[i]); return relativeFilename; } // The file is not in a child directory of the current directory, so we @@ -1192,6 +1191,6 @@ char* TegraRcm::GetRelativeFilename(char *currentDirectory, char *absoluteFilena relativeFilename[rfMarker++] = SLASH; } // copy the rest of the filename into the result string - strcpy(&relativeFilename[rfMarker], &absoluteFilename[afMarker]); + strcpy_s(&relativeFilename[rfMarker], MAX_FILENAME_LEN, &absoluteFilename[afMarker]); return relativeFilename; } \ No newline at end of file diff --git a/TegraRcmGUI/TegraRcmGUI.vcxproj b/TegraRcmGUI/TegraRcmGUI.vcxproj index 648bb4e..d7f4de4 100644 --- a/TegraRcmGUI/TegraRcmGUI.vcxproj +++ b/TegraRcmGUI/TegraRcmGUI.vcxproj @@ -78,12 +78,15 @@ true + $(SolutionDir)\Output\$(Platform)\$(Configuration)\ + Output\$(Platform)\$(Configuration)\ false - false + $(SolutionDir)\Output\$(Platform)\$(Configuration)\ + Output\$(Platform)\$(Configuration)\ @@ -92,13 +95,13 @@ Disabled WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions) true - C:\libusbK-dev-kit\includes;$(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories) + $(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories) Windows true - Version.lib;libusbK.lib - C:\libusbK-dev-kit\bin\lib\x86;$(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories) + Version.lib;libusbK.lib;%(AdditionalDependencies) + $(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories) $(OutDir)$(TargetName)$(TargetExt) @@ -119,14 +122,13 @@ Disabled _WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true - C:\libusbK-dev-kit\includes\;$(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories) + $(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories) Windows true - $(OutDir)$(TargetName)$(TargetExt) - C:\libusbK-dev-kit\bin\lib\amd64\;$(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories) - libusbK.lib + $(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories) + Version.lib;libusbK.lib;%(AdditionalDependencies) false @@ -148,14 +150,14 @@ true WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions) true - C:\libusbK-dev-kit\includes;$(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories) + $(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories) Windows true true true - C:\libusbK-dev-kit\bin\lib\x86;$(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories) + $(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories) Version.lib;libusbK.lib;%(AdditionalDependencies) AsInvoker true