From 79aba82be3de5b6b571e2f59f7a34ded4b03160f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 15 Jun 2012 18:35:03 +0300 Subject: Add profile build to windows version. Change mingw dirs. --- packaging/windows/evol.nsi | 23 ++++++++++++++++++++--- packaging/windows/setup.nsi | 22 +++++++++++++++++++--- 2 files changed, 39 insertions(+), 6 deletions(-) (limited to 'packaging') diff --git a/packaging/windows/evol.nsi b/packaging/windows/evol.nsi index debdfb296..4469c7b85 100644 --- a/packaging/windows/evol.nsi +++ b/packaging/windows/evol.nsi @@ -253,11 +253,14 @@ Section "Core files (required)" SecCore File "${DLLDIR}\exchndl.dll" File "${DLLDIR}\libcurl-4.dll" File "${DLLDIR}\libgcc_s_sjlj-1.dll" + File "${DLLDIR}\libfreetype-6.dll" File "${DLLDIR}\libiconv-2.dll" File "${DLLDIR}\libintl-8.dll" File "${DLLDIR}\libjpeg-8.dll" File "${DLLDIR}\libogg-0.dll" File "${DLLDIR}\libpng15-15.dll" + File "${DLLDIR}\libSDL_gfx-13.dll" + File "${DLLDIR}\libstdc++-6.dll" File "${DLLDIR}\libvorbis-0.dll" File "${DLLDIR}\libvorbisfile-3.dll" File "${DLLDIR}\libxml2-2.dll" @@ -342,9 +345,20 @@ SectionEnd Section /o "Debugger" SecDebug SetOutPath "$INSTDIR" File "${DLLDIR}\gdb.exe" + File "${EXEDIR}\manaplusd.exe" ${If} ${SectionIsSelected} ${SecShortcuts} - CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplus.exe"' "$INSTDIR\manaplus.exe" 1 - CreateShortCut "$DESKTOP\EvolOnline (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplus.exe"' "$INSTDIR\manaplus.exe" 1 + CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplusd.exe"' "$INSTDIR\manaplusd.exe" 1 + CreateShortCut "$DESKTOP\EvolOnline (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplusd.exe"' "$INSTDIR\manaplusd.exe" 1 + ${EndIf} +SectionEnd + +Section /o "Profiler" SecProfiler + SetOutPath "$INSTDIR" + File "${EXEDIR}\manaplusp.exe" + + ${If} ${SectionIsSelected} ${SecShortcuts} + CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (profiler).lnk" '"$INSTDIR\manaplusp.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1 + CreateShortCut "$DESKTOP\EvolOnline (profiler).lnk" '"$INSTDIR\manaplusp.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1 ${EndIf} SectionEnd @@ -369,7 +383,8 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SecPortable} "Portable client. (If selected client will work as portable client.)" !insertmacro MUI_DESCRIPTION_TEXT ${SecEvolMusic} "Background evol music. (If selected the evol music will be downloaded from the internet.)" !insertmacro MUI_DESCRIPTION_TEXT ${SecTrans} "Translations for the user interface. Uncheck this component to leave it in English." - !insertmacro MUI_DESCRIPTION_TEXT ${SecDebug} "Install debugger for try to find stability problems." + !insertmacro MUI_DESCRIPTION_TEXT ${SecDebug} "Install debugger for try to detect stability issues." + !insertmacro MUI_DESCRIPTION_TEXT ${SecProfiler} "Install profiler build to detect perfomance issues." !insertmacro MUI_FUNCTION_DESCRIPTION_END @@ -407,9 +422,11 @@ Section Uninstall Delete "$SMPROGRAMS\EvolOnline\Uninstall.lnk" Delete "$DESKTOP\EvolOnline.lnk" Delete "$DESKTOP\EvolOnline (debug).lnk" + Delete "$DESKTOP\EvolOnline (profiler).lnk" Delete "$DESKTOP\EvolOnline (tests).lnk" Delete "$SMPROGRAMS\EvolOnline\EvolOnline.lnk" Delete "$SMPROGRAMS\EvolOnline\EvolOnline (debug).lnk" + Delete "$SMPROGRAMS\EvolOnline\EvolOnline (profiler).lnk" Delete "$SMPROGRAMS\EvolOnline\EvolOnline (no opengl).lnk" Delete "$SMPROGRAMS\EvolOnline\EvolOnline (safemode).lnk" Delete "$SMPROGRAMS\EvolOnline\EvolOnline (tests).lnk" diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi index 689165699..4443b6e1f 100644 --- a/packaging/windows/setup.nsi +++ b/packaging/windows/setup.nsi @@ -250,11 +250,14 @@ Section "Core files (required)" SecCore File "${DLLDIR}\exchndl.dll" File "${DLLDIR}\libcurl-4.dll" File "${DLLDIR}\libgcc_s_sjlj-1.dll" + File "${DLLDIR}\libfreetype-6.dll" File "${DLLDIR}\libiconv-2.dll" File "${DLLDIR}\libintl-8.dll" File "${DLLDIR}\libjpeg-8.dll" File "${DLLDIR}\libogg-0.dll" File "${DLLDIR}\libpng15-15.dll" + File "${DLLDIR}\libSDL_gfx-13.dll" + File "${DLLDIR}\libstdc++-6.dll" File "${DLLDIR}\libvorbis-0.dll" File "${DLLDIR}\libvorbisfile-3.dll" File "${DLLDIR}\libxml2-2.dll" @@ -343,9 +346,19 @@ SectionEnd Section /o "Debugger" SecDebug SetOutPath "$INSTDIR" File "${DLLDIR}\gdb.exe" + File "${EXEDIR}\manaplusd.exe" ${If} ${SectionIsSelected} ${SecShortcuts} - CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplus.exe"' "$INSTDIR\manaplus.exe" - CreateShortCut "$DESKTOP\ManaPlus (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplus.exe"' "$INSTDIR\manaplus.exe" + 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 @@ -389,7 +402,8 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SecEvol} "Create shortcuts for Evol Online." !insertmacro MUI_DESCRIPTION_TEXT ${SecEvolMusic} "Background evol music. (If selected the evol music will be downloaded from the internet.)" !insertmacro MUI_DESCRIPTION_TEXT ${SecTrans} "Translations for the user interface. Uncheck this component to leave it in English." - !insertmacro MUI_DESCRIPTION_TEXT ${SecDebug} "Install debugger for try to find stability problems." + !insertmacro MUI_DESCRIPTION_TEXT ${SecDebug} "Install debugger for try to detect stability issues." + !insertmacro MUI_DESCRIPTION_TEXT ${SecProfiler} "Install profiler build to detect perfomance issues." !insertmacro MUI_FUNCTION_DESCRIPTION_END @@ -425,9 +439,11 @@ Section Uninstall Delete "$SMPROGRAMS\Mana\Uninstall.lnk" Delete "$DESKTOP\ManaPlus.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 (no opengl).lnk" Delete "$SMPROGRAMS\Mana\ManaPlus (safemode).lnk" Delete "$SMPROGRAMS\Mana\ManaPlus (tests).lnk" -- cgit v1.2.3-60-g2f50