Skip to content

Commit

Permalink
Organize project structure
Browse files Browse the repository at this point in the history
  • Loading branch information
@DanTheMan827
DanTheMan827 committed Nov 11, 2022
1 parent 3b34f9d commit 74707cd
Show file tree
Hide file tree
Showing 2,443 changed files with 2,452 additions and 2,586 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
*.resx text eol=crlf
*.sln text eol=crlf
*.xml text eol=lf
data/moon_hashes/* text eol=lf
hakchi_gui/data/moon_hashes/* text eol=lf
37 changes: 14 additions & 23 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,21 @@
*.vcxproj.user
.vs/
ApiKeys/
Makefile Projects/Debug/
Makefile Projects/Release/
Web Installer/*.exe
basehmods.tar
hakchi_gui/basehmods.tar
bin/
commit.txt
data/desktop_entries.7z
data/desktop_entries.tar
data/libretro_cores.7z
data/libretro_cores.tar
data/licenses.tar
data/original_art.tar
data/romfiles.xml
data/romfiles.xml.gz
downloadedFiles.txt
driver/classic_driver.exe
hakchi_gui/commit.txt
GeneratedFiles/
driver/source/nesmini_driver/Release/
driver/usb_driver/
mods/hmods/hakchi.hmod
hakchi_gui/mods/hmods/hakchi.hmod
obj/
packages/
tag.txt
tools/arm/detached-fallback
tools/putty/puttytel.exe
user_mods/bluetooth.hmod
!user_mods/snes_custom_filters.hmod/usr/bin/
git-commits-since-last-tag.txt
hakchi_gui/tag.txt
hakchi_gui/tools/arm/detached-fallback
hakchi_gui/tools/putty/puttytel.exe
hakchi_gui/user_mods/bluetooth.hmod
!hakchi_gui/user_mods/snes_custom_filters.hmod/usr/bin/
hakchi_gui/git-commits-since-last-tag.txt
GeneratedData/
Installer/**/
Web Installer/**/
ZIP Files/**/
8 changes: 4 additions & 4 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
[submodule "Libraries/LibUsbDotNet"]
path = Libraries/LibUsbDotNet
url = https://github.com/TeamShinkansen/LibUsbDotNet.git
[submodule "driver/source"]
path = driver/source
url = https://github.com/TeamShinkansen/libwdi.git
[submodule "Libraries/FelLib"]
path = Libraries/FelLib
url = https://github.com/TeamShinkansen/FelLib.git
Expand All @@ -22,4 +19,7 @@
url = https://github.com/TeamShinkansen/CueSharp.git
[submodule "Libraries/SpineGen"]
path = Libraries/SpineGen
url=https://github.com/DanTheMan827/SpineGen.git
url = https://github.com/DanTheMan827/SpineGen.git
[submodule "libwdi"]
path = libwdi
url = https://github.com/TeamShinkansen/libwdi.git
32 changes: 13 additions & 19 deletions Makefile Projects/Installer.vcxproj → Installer/Installer.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ResolveNuGetPackages>false</ResolveNuGetPackages>
<VCProjectVersion>15.0</VCProjectVersion>
<ProjectGuid>{15F9D451-9DAF-4904-B2EC-6B485FCA86FD}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
Expand Down Expand Up @@ -64,40 +65,33 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<NMakeBuildCommandLine>msbuild.exe "$(SolutionDir)NSI\nsi-helper\nsi-helper.csproj" /p:Configuration=Release
msbuild.exe "$(SolutionDir)Zipper\Zipper.csproj" /p:Configuration=Release

del /S /Q "$(SolutionDir)bin\Debug\net461"
rmdir /S /Q "$(SolutionDir)bin\Debug\net461"
del /S /Q "$(SolutionDir)hakchi_gui\bin\Debug\net461"
rmdir /S /Q "$(SolutionDir)hakchi_gui\bin\Debug\net461"

msbuild.exe "$(SolutionPath)" /p:Configuration=Debug
msbuild.exe "$(SolutionPath)" /p:Configuration=Debug /target:hakchi_gui

"$(SolutionDir)NSI\nsi-helper\bin\Release\nsi-helper.exe" "$(SolutionDir)bin\Debug\net461" "$(SolutionDir)NSI\debug-uninstall.nsh"
"$(SolutionDir)NSI\nsi-helper\bin\Release\nsi-helper.exe" "$(SolutionDir)hakchi_gui\bin\Debug\net461" "$(SolutionDir)NSI\debug-uninstall.nsh"

makensis.exe "$(SolutionDir)NSI\Installer.nsi"

del "$(SolutionDir)NSI\debug-uninstall.nsh"</NMakeBuildCommandLine>
<NMakeReBuildCommandLine>msbuild.exe "$(SolutionDir)NSI\nsi-helper\nsi-helper.csproj" /p:Configuration=Release
msbuild.exe "$(SolutionDir)Zipper\Zipper.csproj" /p:Configuration=Release

del /S /Q "$(SolutionDir)bin\Debug\net461"
del /S /Q "$(SolutionDir)bin\Release\net461"
del /S /Q "$(SolutionDir)hakchi_gui\bin\Debug\net461"
rmdir /S /Q "$(SolutionDir)hakchi_gui\bin\Debug\net461"

rmdir /S /Q "$(SolutionDir)bin\Debug\net461"
rmdir /S /Q "$(SolutionDir)bin\Release\net461"
msbuild.exe "$(SolutionPath)" /p:Configuration=Debug /target:hakchi_gui

msbuild.exe "$(SolutionPath)" /t:Clean /p:Configuration=Release
msbuild.exe "$(SolutionPath)" /t:Clean /p:Configuration=Debug

msbuild.exe "$(SolutionPath)" /p:Configuration=Release
msbuild.exe "$(SolutionPath)" /p:Configuration=Debug

"$(SolutionDir)NSI\nsi-helper\bin\Release\nsi-helper.exe" "$(SolutionDir)bin\Release\net461" "$(SolutionDir)NSI\release-uninstall.nsh"
"$(SolutionDir)NSI\nsi-helper\bin\Release\nsi-helper.exe" "$(SolutionDir)bin\Debug\net461" "$(SolutionDir)NSI\debug-uninstall.nsh"
"$(SolutionDir)NSI\nsi-helper\bin\Release\nsi-helper.exe" "$(SolutionDir)hakchi_gui\bin\Debug\net461" "$(SolutionDir)NSI\debug-uninstall.nsh"

makensis.exe "$(SolutionDir)NSI\Installer.nsi"

del "$(SolutionDir)NSI\release-uninstall.nsh"
del "$(SolutionDir)NSI\debug-uninstall.nsh"</NMakeReBuildCommandLine>
<NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<NMakeCleanCommandLine>del "$(SolutionDir)bin\hakchi2-ce-*-installer.exe"</NMakeCleanCommandLine>
<NMakeCleanCommandLine>del "$(SolutionDir)hakchi_gui\bin\hakchi2-ce-*-installer.exe"</NMakeCleanCommandLine>
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);C:\Program Files\NSIS;C:\Program Files (x86)\NSIS;</ExecutablePath>
</PropertyGroup>
<ItemDefinitionGroup>
Expand All @@ -107,4 +101,4 @@ del "$(SolutionDir)NSI\debug-uninstall.nsh"</NMakeReBuildCommandLine>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
100 changes: 0 additions & 100 deletions Makefile Projects/ZIP Files.vcxproj
View file

This file was deleted.

12 changes: 0 additions & 12 deletions Makefile Projects/ce-data/ce-data.csproj
View file

This file was deleted.

28 changes: 14 additions & 14 deletions NSI/Installer.nsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
!include "FileFunc.nsh"

; Display Version
!system '..\bin\Debug\net461\hakchi.exe --versionFormat "!define DisplayVersion {0}" --versionFile version.nsh'
!system '..\hakchi_gui\bin\Debug\net461\hakchi.exe --versionFormat "!define DisplayVersion {0}" --versionFile version.nsh'
!include ".\version.nsh"
!system 'del version.nsh'

; Create zip files
!system '..\Zipper\bin\Debug\Zipper.exe ..\bin\Debug\net461 ..\bin\hakchi2-ce-${DisplayVersion}-portable.zip'
!system '..\Zipper\bin\Release\Zipper.exe ..\hakchi_gui\bin\Debug\net461 ..\hakchi_gui\bin\hakchi2-ce-${DisplayVersion}-portable.zip'

; The icon of the installer
Icon "..\icon_app.ico"
Icon "..\hakchi_gui\icon_app.ico"

; The file to write
OutFile "..\bin\hakchi2-ce-${DisplayVersion}-installer.exe"
OutFile "..\hakchi_gui\bin\hakchi2-ce-${DisplayVersion}-installer.exe"

; The default installation directory
Var defaultInstDir
Expand All @@ -26,7 +26,7 @@ var launchArgs
; The name of the installer
Name "Hakchi2 CE ${DisplayVersion}"

; Registry key to check for directory (so if you install again, it will
; Registry key to check for directory (so if you install again, it will
; overwrite the old one automatically)
InstallDirRegKey HKLM "Software\Team Shinkansen\Hakchi2 CE" "Install_Dir"

Expand Down Expand Up @@ -73,7 +73,7 @@ SectionEnd
Section "Hakchi2 CE ${DisplayVersion} (required)" section_main
SectionIn RO
SetOutPath $INSTDIR
File /r "..\bin\Debug\net461\*"
File /r "..\hakchi_gui\bin\Debug\net461\*"
AccessControl::GrantOnFile "$INSTDIR\" "(BU)" "GenericRead + GenericWrite"
SectionEnd

Expand All @@ -86,10 +86,10 @@ Section "" section_install
; Create nonportable.flag
FileOpen $9 "nonportable.flag" w
FileClose $9

; Write the installation path into the registry
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Hakchi2 CE" "InstallLocation" "$INSTDIR"

; Write the uninstall keys for Windows
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Hakchi2 CE" "DisplayName" "Hakchi2 CE"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Hakchi2 CE" "DisplayVersion" "${DisplayVersion}"
Expand Down Expand Up @@ -120,7 +120,7 @@ SectionEnd
Section "" section_launch
${GetOptions} $CMDLINE "-LAUNCH=" $launchExe
${GetOptions} $CMDLINE "-LAUNCH_ARGS=" $launchArgs

${If} $launchExe != ""
SetAutoClose true
SetOutPath "$INSTDIR"
Expand All @@ -138,7 +138,7 @@ Section "Uninstall"
Delete "$DESKTOP\Hakchi2 CE.lnk"
RMDir /r "$SMPROGRAMS\Team Shinkansen\Hakchi2 CE"
RMDir "$SMPROGRAMS\Team Shinkansen"

!include "debug-uninstall.nsh"

Delete "$INSTDIR\nonportable.flag"
Expand All @@ -157,23 +157,23 @@ FunctionEnd
Function .onSelChange
${If} ${SectionIsSelected} ${section_portable}
StrCpy $InstDir "$EXEDIR\hakchi2-ce-${DisplayVersion}"

!insertmacro UnselectSection ${section_install}
!insertmacro UnselectSection ${section_startmenu}
!insertmacro UnselectSection ${section_desktop}
SectionSetFlags ${section_startmenu} ${SF_RO}
SectionSetFlags ${section_desktop} ${SF_RO}
${Else}
StrCpy $InstDir $defaultInstDir

SectionGetFlags ${section_startmenu} $0
IntOp $0 $0 & ${SF_SELECTED}
SectionSetFlags ${section_startmenu} $0

SectionGetFlags ${section_desktop} $0
IntOp $0 $0 & ${SF_SELECTED}
SectionSetFlags ${section_desktop} $0

!insertmacro SelectSection ${section_install}
${EndIf}

Expand Down
Loading

0 comments on commit 74707cd

Please sign in to comment.