diff options
Diffstat (limited to 'manaplus.patch')
| -rw-r--r-- | manaplus.patch | 137 |
1 files changed, 137 insertions, 0 deletions
diff --git a/manaplus.patch b/manaplus.patch new file mode 100644 index 0000000..e228cb6 --- /dev/null +++ b/manaplus.patch @@ -0,0 +1,137 @@ +diff --git a/build/packwin b/build/packwin +index 4459a5052..01d7fd851 100755 +--- a/build/packwin ++++ b/build/packwin +@@ -8,7 +8,7 @@ cd packaging/windows + ./make-translations.sh + makensis -DDLLDIR=$dir/../libs/dll/ \ + -DPRODUCT_VERSION="1.9.3.23" \ +- -DEXESUFFIX=/src \ ++ -DEXESUFFIX=build/tmp/src \ + -DUPX=true \ + -DBITS=${BITS} \ + -DSEHDLL=${SEHDLL} \ +diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi +index 1c159c7cd..ce3c9f8ff 100644 +--- a/packaging/windows/setup.nsi ++++ b/packaging/windows/setup.nsi +@@ -262,10 +262,11 @@ Section "Core files (required)" SecCore + File "${EXEDIR}\manaplus.exe" + File "${DLLDIR}\SDL.dll" + File "${DLLDIR}\SDL_image.dll" +-; File "${DLLDIR}\SDL_mixer.dll" ++ File "${DLLDIR}\SDL_mixer.dll" + File "${DLLDIR}\SDL_net.dll" + File "${DLLDIR}\SDL_ttf.dll" +- File "${DLLDIR}\libSDL_gfx-15.dll" ++ File "${DLLDIR}\libSDL_gfx-16.dll" ++ File "${DLLDIR}\liblzma-5.dll" + File "${DLLDIR}\libcurl-4.dll" + File "${DLLDIR}\libfreetype-6.dll" + File "${DLLDIR}\${SEHDLL}" +@@ -370,50 +371,50 @@ Section /o "Portable" SecPortable + File "portable.xml" + SectionEnd + +-Section /o "Debugger" SecDebug +- SetOutPath "$INSTDIR" +- File "${DLLDIR}\gdb.exe" +- File "${DLLDIR}\libdl.dll" +- File "${DLLDIR}\libexpat-1.dll" +- File "${DLLDIR}\libreadline6.dll" +- File "${DLLDIR}\libtermcap.dll" +- File "${EXEDIR}\manaplusd.exe" +- ${If} ${SectionIsSelected} ${SecShortcuts} +- CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplusd.exe"' "$INSTDIR\manaplusd.exe" +- CreateShortCut "$DESKTOP\ManaPlus (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplusd.exe"' "$INSTDIR\manaplusd.exe" +- ${EndIf} +-SectionEnd +- +-Section /o "Profiler" SecProfiler +- SetOutPath "$INSTDIR" +- File "${EXEDIR}\manaplusp.exe" +- ${If} ${SectionIsSelected} ${SecShortcuts} +- CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (profiler).lnk" "$INSTDIR\manaplusp.exe" +- CreateShortCut "$DESKTOP\ManaPlus (profiler).lnk" "$INSTDIR\manaplusp.exe" +- ${EndIf} +-SectionEnd ++;Section /o "Debugger" SecDebug ++; SetOutPath "$INSTDIR" ++; File "${DLLDIR}\gdb.exe" ++; File "${DLLDIR}\libdl.dll" ++; File "${DLLDIR}\libexpat-1.dll" ++; File "${DLLDIR}\libreadline6.dll" ++; File "${DLLDIR}\libtermcap.dll" ++; File "${EXEDIR}\manaplusd.exe" ++; ${If} ${SectionIsSelected} ${SecShortcuts} ++; CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplusd.exe"' "$INSTDIR\manaplusd.exe" ++; CreateShortCut "$DESKTOP\ManaPlus (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplusd.exe"' "$INSTDIR\manaplusd.exe" ++; ${EndIf} ++;SectionEnd ++ ++;Section /o "Profiler" SecProfiler ++; SetOutPath "$INSTDIR" ++; File "${EXEDIR}\manaplusp.exe" ++; ${If} ${SectionIsSelected} ${SecShortcuts} ++; CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (profiler).lnk" "$INSTDIR\manaplusp.exe" ++; CreateShortCut "$DESKTOP\ManaPlus (profiler).lnk" "$INSTDIR\manaplusp.exe" ++; ${EndIf} ++;SectionEnd + + ; Section "Tools" SecTools + ; SetOutPath "$INSTDIR" + ; File "${EXEDIR}\dyecmd.exe" + ; SectionEnd + +-Section "Evol Online shortcuts" SecEvol +- SetOutPath "$INSTDIR" +- CreateDirectory "$INSTDIR\data\evol" +- CreateDirectory "$INSTDIR\data\evol\icons" +- CreateDirectory "$INSTDIR\data\evol\images" +- +- SetOutPath "$INSTDIR" +- File "${SRCDIR}\data\evol\evol.manaplus" +- SetOutPath "$INSTDIR\data\evol\images" +- File "${SRCDIR}\data\evol\images\*.png" +- SetOutPath "$INSTDIR\data\evol\icons" +- File "${SRCDIR}\data\evol\icons\*.ico" +- +- CreateShortCut "$SMPROGRAMS\Mana\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1 +- CreateShortCut "$DESKTOP\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1 +-SectionEnd ++;Section "Evol Online shortcuts" SecEvol ++; SetOutPath "$INSTDIR" ++; CreateDirectory "$INSTDIR\data\evol" ++; CreateDirectory "$INSTDIR\data\evol\icons" ++; CreateDirectory "$INSTDIR\data\evol\images" ++; ++; SetOutPath "$INSTDIR" ++; File "${SRCDIR}\data\evol\evol.manaplus" ++; SetOutPath "$INSTDIR\data\evol\images" ++; File "${SRCDIR}\data\evol\images\*.png" ++; SetOutPath "$INSTDIR\data\evol\icons" ++; File "${SRCDIR}\data\evol\icons\*.ico" ++; ++; CreateShortCut "$SMPROGRAMS\Mana\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1 ++; CreateShortCut "$DESKTOP\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1 ++;SectionEnd + + Section "Translations" SecTrans + SetOutPath "$INSTDIR" +@@ -464,12 +465,12 @@ Section Uninstall + + Delete "$SMPROGRAMS\Mana\Uninstall.lnk" + Delete "$DESKTOP\ManaPlus.lnk" +- Delete "$DESKTOP\ManaPlus (debug).lnk" ++; Delete "$DESKTOP\ManaPlus (debug).lnk" + Delete "$DESKTOP\ManaPlus (profiler).lnk" + Delete "$DESKTOP\ManaPlus (tests).lnk" + Delete "$SMPROGRAMS\Mana\ManaPlus.lnk" +- Delete "$SMPROGRAMS\Mana\ManaPlus (debug).lnk" +- Delete "$SMPROGRAMS\Mana\ManaPlus (profiler).lnk" ++; Delete "$SMPROGRAMS\Mana\ManaPlus (debug).lnk" ++; Delete "$SMPROGRAMS\Mana\ManaPlus (profiler).lnk" + Delete "$SMPROGRAMS\Mana\ManaPlus (no opengl).lnk" + Delete "$SMPROGRAMS\Mana\ManaPlus (safemode).lnk" + Delete "$SMPROGRAMS\Mana\ManaPlus (tests).lnk" + |