1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
|
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/build/win_make b/build/win_make
index 6e7adb83c..dd5a92e41 100755
--- a/build/win_make
+++ b/build/win_make
@@ -11,6 +11,6 @@ autoreconf -i || exit 1
cd build/tmp
../../configure \
--host=${CROSS} \
---enable-werror || exit 1
+--enable-werror $* || exit 1
make -j16 2>../make2.log || exit 1
diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index 1c159c7cd..4a22a0155 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}"
@@ -375,7 +375,7 @@ Section /o "Debugger" SecDebug
File "${DLLDIR}\gdb.exe"
File "${DLLDIR}\libdl.dll"
File "${DLLDIR}\libexpat-1.dll"
- File "${DLLDIR}\libreadline6.dll"
+ File "${DLLDIR}\libreadline8.dll"
File "${DLLDIR}\libtermcap.dll"
File "${EXEDIR}\manaplusd.exe"
${If} ${SectionIsSelected} ${SecShortcuts}
@@ -384,36 +385,36 @@ Section /o "Debugger" SecDebug
${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 "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"
@@ -428,8 +429,8 @@ SectionEnd
!insertmacro MUI_DESCRIPTION_TEXT ${SecEvol} "Create shortcuts for Evol Online."
!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 detect stability issues."
- !insertmacro MUI_DESCRIPTION_TEXT ${SecProfiler} "Install profiler build to detect perfomance issues."
-; !insertmacro MUI_DESCRIPTION_TEXT ${SecTools} "Install tools like dyecmd."
+; !insertmacro MUI_DESCRIPTION_TEXT ${SecProfiler} "Install profiler build to detect perfomance issues."
+; !insertmacro MUI_DESCRIPTION_TEXT ${SecTools} "Install tools like dyecmd."
!insertmacro MUI_FUNCTION_DESCRIPTION_END
|
