Skip to content

Commit 4b9436d

Browse files
tinku99tinku99
committed
Merge tag 'windows-0.41-workspace' of [email protected]:tinku99/ahkmingw into dlopen
2 parents 07679f1 + 5842ac8 commit 4b9436d

File tree

5 files changed

+1227
-749
lines changed

5 files changed

+1227
-749
lines changed

‎INSTALL

+5
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,8 @@ removed mscvr70 dependency: libmsvcr70.a
5454
in util.h, added
5555
#define _strtoi64 strtoll // ahkgcc to remove msvcrt dep
5656
#define _strtoui64 strtoull // ahkgcc to remove msvcrt dep
57+
58+
59+
60+
61+
libcomctl32.a;libwinmm.a;libgdi32.a;libole32.a;liboleaut32.a;libcomdlg32.a;libversion.a;libws2_32.a;libuuid.a;GdiPlus

‎ahkxx3n.cbp

+93-78
Original file line numberDiff line numberDiff line change
@@ -4,76 +4,91 @@
44
<Project>
55
<Option title="ahkxx3n" />
66
<Option pch_mode="2" />
7-
<Option compiler="mingw" />
7+
<Option compiler="gcc" />
88
<Build>
99
<Target title="Debug">
10-
<Option output="bin/Debug/ahkxx3n" prefix_auto="1" extension_auto="1" />
11-
<Option object_output="obj/Debug/" />
10+
<Option output="bin\Debug\ahkxx3n" prefix_auto="1" extension_auto="1" />
11+
<Option object_output="obj\Debug\" />
1212
<Option type="1" />
13-
<Option compiler="mingw" />
13+
<Option compiler="gcc" />
1414
<Compiler>
1515
<Add option="-g" />
1616
</Compiler>
17+
<Linker>
18+
<Add library="libcomctl32.a" />
19+
<Add library="libwinmm.a" />
20+
<Add library="libgdi32.a" />
21+
<Add library="libole32.a" />
22+
<Add library="liboleaut32.a" />
23+
<Add library="libcomdlg32.a" />
24+
<Add library="libversion.a" />
25+
<Add library="libws2_32.a" />
26+
<Add library="libuuid.a" />
27+
<Add library="GdiPlus.lib" />
28+
<Add directory="lib" />
29+
</Linker>
1730
</Target>
1831
<Target title="Release">
19-
<Option output="bin/Release/ahkxx3n" prefix_auto="1" extension_auto="1" />
20-
<Option object_output="obj/Release/" />
32+
<Option output="bin\Release\ahkxx3n" prefix_auto="1" extension_auto="1" />
33+
<Option object_output="obj\Release\" />
2134
<Option type="1" />
22-
<Option compiler="mingw" />
35+
<Option compiler="gcc" />
2336
<Compiler>
2437
<Add option="-O2" />
2538
</Compiler>
2639
<Linker>
2740
<Add option="-s" />
28-
<Add library="/usr/i586-mingw32msvc/lib/libcomctl32.a" />
29-
<Add library="/usr/i586-mingw32msvc/lib/libwinmm.a" />
30-
<Add library="/usr/i586-mingw32msvc/lib/libgdi32.a" />
31-
<Add library="/usr/i586-mingw32msvc/lib/libole32.a" />
32-
<Add library="/usr/i586-mingw32msvc/lib/liboleaut32.a" />
33-
<Add library="/usr/i586-mingw32msvc/lib/libcomdlg32.a" />
34-
<Add library="/usr/i586-mingw32msvc/lib/libversion.a" />
35-
<Add library="/usr/i586-mingw32msvc/lib/libws2_32.a" />
36-
<Add library="/usr/i586-mingw32msvc/lib/libuuid.a" />
37-
<Add library="lib/GdiPlus.lib" />
41+
<Add library="libcomctl32.a" />
42+
<Add library="libwinmm.a" />
43+
<Add library="libgdi32.a" />
44+
<Add library="libole32.a" />
45+
<Add library="liboleaut32.a" />
46+
<Add library="libcomdlg32.a" />
47+
<Add library="libversion.a" />
48+
<Add library="libws2_32.a" />
49+
<Add library="libuuid.a" />
50+
<Add library="GdiPlus" />
51+
<Add directory="C:\user\CodeBlocks\MinGW\lib" />
52+
<Add directory="lib" />
3853
</Linker>
3954
</Target>
4055
</Build>
4156
<Compiler>
4257
<Add option="-Wall" />
4358
</Compiler>
4459
<Unit filename="AutoHotkey.cpp" />
45-
<Unit filename="MSC_HEADERS/GdiPlus.h" />
46-
<Unit filename="MSC_HEADERS/GdiPlusBase.h" />
47-
<Unit filename="MSC_HEADERS/GdiPlusBitmap.h" />
48-
<Unit filename="MSC_HEADERS/GdiPlusBrush.h" />
49-
<Unit filename="MSC_HEADERS/GdiPlusCachedBitmap.h" />
50-
<Unit filename="MSC_HEADERS/GdiPlusColor.h" />
51-
<Unit filename="MSC_HEADERS/GdiPlusColorMatrix.h" />
52-
<Unit filename="MSC_HEADERS/GdiPlusEnums.h" />
53-
<Unit filename="MSC_HEADERS/GdiPlusFlat.h" />
54-
<Unit filename="MSC_HEADERS/GdiPlusFont.h" />
55-
<Unit filename="MSC_HEADERS/GdiPlusFontCollection.h" />
56-
<Unit filename="MSC_HEADERS/GdiPlusFontFamily.h" />
57-
<Unit filename="MSC_HEADERS/GdiPlusGpStubs.h" />
58-
<Unit filename="MSC_HEADERS/GdiPlusGraphics.h" />
59-
<Unit filename="MSC_HEADERS/GdiPlusHeaders.h" />
60-
<Unit filename="MSC_HEADERS/GdiPlusImageCodec.h" />
61-
<Unit filename="MSC_HEADERS/GdiPlusImaging.h" />
62-
<Unit filename="MSC_HEADERS/GdiPlusInit.h" />
63-
<Unit filename="MSC_HEADERS/GdiPlusLineCaps.h" />
64-
<Unit filename="MSC_HEADERS/GdiPlusMatrix.h" />
65-
<Unit filename="MSC_HEADERS/GdiPlusMem.h" />
66-
<Unit filename="MSC_HEADERS/GdiPlusMetaFile.h" />
67-
<Unit filename="MSC_HEADERS/GdiPlusMetaHeader.h" />
68-
<Unit filename="MSC_HEADERS/GdiPlusPath.h" />
69-
<Unit filename="MSC_HEADERS/GdiPlusPen.h" />
70-
<Unit filename="MSC_HEADERS/GdiPlusPixelFormats.h" />
71-
<Unit filename="MSC_HEADERS/GdiPlusRegion.h" />
72-
<Unit filename="MSC_HEADERS/GdiPlusStringFormat.h" />
73-
<Unit filename="MSC_HEADERS/GdiPlusTypes.h" />
74-
<Unit filename="MSC_HEADERS/GdiPlusimageAttributes.h" />
75-
<Unit filename="MSC_HEADERS/PopPack.h" />
76-
<Unit filename="MSC_HEADERS/gdipluseffects.h" />
60+
<Unit filename="MSC_HEADERS\GdiPlus.h" />
61+
<Unit filename="MSC_HEADERS\GdiPlusBase.h" />
62+
<Unit filename="MSC_HEADERS\GdiPlusBitmap.h" />
63+
<Unit filename="MSC_HEADERS\GdiPlusBrush.h" />
64+
<Unit filename="MSC_HEADERS\GdiPlusCachedBitmap.h" />
65+
<Unit filename="MSC_HEADERS\GdiPlusColor.h" />
66+
<Unit filename="MSC_HEADERS\GdiPlusColorMatrix.h" />
67+
<Unit filename="MSC_HEADERS\GdiPlusEnums.h" />
68+
<Unit filename="MSC_HEADERS\GdiPlusFlat.h" />
69+
<Unit filename="MSC_HEADERS\GdiPlusFont.h" />
70+
<Unit filename="MSC_HEADERS\GdiPlusFontCollection.h" />
71+
<Unit filename="MSC_HEADERS\GdiPlusFontFamily.h" />
72+
<Unit filename="MSC_HEADERS\GdiPlusGpStubs.h" />
73+
<Unit filename="MSC_HEADERS\GdiPlusGraphics.h" />
74+
<Unit filename="MSC_HEADERS\GdiPlusHeaders.h" />
75+
<Unit filename="MSC_HEADERS\GdiPlusImageCodec.h" />
76+
<Unit filename="MSC_HEADERS\GdiPlusImaging.h" />
77+
<Unit filename="MSC_HEADERS\GdiPlusInit.h" />
78+
<Unit filename="MSC_HEADERS\GdiPlusLineCaps.h" />
79+
<Unit filename="MSC_HEADERS\GdiPlusMatrix.h" />
80+
<Unit filename="MSC_HEADERS\GdiPlusMem.h" />
81+
<Unit filename="MSC_HEADERS\GdiPlusMetaFile.h" />
82+
<Unit filename="MSC_HEADERS\GdiPlusMetaHeader.h" />
83+
<Unit filename="MSC_HEADERS\GdiPlusPath.h" />
84+
<Unit filename="MSC_HEADERS\GdiPlusPen.h" />
85+
<Unit filename="MSC_HEADERS\GdiPlusPixelFormats.h" />
86+
<Unit filename="MSC_HEADERS\GdiPlusRegion.h" />
87+
<Unit filename="MSC_HEADERS\GdiPlusStringFormat.h" />
88+
<Unit filename="MSC_HEADERS\GdiPlusTypes.h" />
89+
<Unit filename="MSC_HEADERS\GdiPlusimageAttributes.h" />
90+
<Unit filename="MSC_HEADERS\PopPack.h" />
91+
<Unit filename="MSC_HEADERS\gdipluseffects.h" />
7792
<Unit filename="SimpleHeap.cpp" />
7893
<Unit filename="SimpleHeap.h" />
7994
<Unit filename="WinGroup.cpp" />
@@ -91,82 +106,82 @@
91106
<Unit filename="hotkey.h" />
92107
<Unit filename="keyboard_mouse.cpp" />
93108
<Unit filename="keyboard_mouse.h" />
94-
<Unit filename="lib/exearc_read.h" />
95-
<Unit filename="lib_pcre/pcre/config.h" />
96-
<Unit filename="lib_pcre/pcre/pcre.h" />
97-
<Unit filename="lib_pcre/pcre/pcre_chartables.c">
109+
<Unit filename="lib\exearc_read.h" />
110+
<Unit filename="lib_pcre\pcre\config.h" />
111+
<Unit filename="lib_pcre\pcre\pcre.h" />
112+
<Unit filename="lib_pcre\pcre\pcre_chartables.c">
98113
<Option compilerVar="CC" />
99114
</Unit>
100-
<Unit filename="lib_pcre/pcre/pcre_compile.c">
115+
<Unit filename="lib_pcre\pcre\pcre_compile.c">
101116
<Option compilerVar="CC" />
102117
</Unit>
103-
<Unit filename="lib_pcre/pcre/pcre_config.c">
118+
<Unit filename="lib_pcre\pcre\pcre_config.c">
104119
<Option compilerVar="CC" />
105120
</Unit>
106-
<Unit filename="lib_pcre/pcre/pcre_dfa_exec.c">
121+
<Unit filename="lib_pcre\pcre\pcre_dfa_exec.c">
107122
<Option compilerVar="CC" />
108123
</Unit>
109-
<Unit filename="lib_pcre/pcre/pcre_exec.c">
124+
<Unit filename="lib_pcre\pcre\pcre_exec.c">
110125
<Option compilerVar="CC" />
111126
</Unit>
112-
<Unit filename="lib_pcre/pcre/pcre_fullinfo.c">
127+
<Unit filename="lib_pcre\pcre\pcre_fullinfo.c">
113128
<Option compilerVar="CC" />
114129
</Unit>
115-
<Unit filename="lib_pcre/pcre/pcre_get.c">
130+
<Unit filename="lib_pcre\pcre\pcre_get.c">
116131
<Option compilerVar="CC" />
117132
</Unit>
118-
<Unit filename="lib_pcre/pcre/pcre_globals.c">
133+
<Unit filename="lib_pcre\pcre\pcre_globals.c">
119134
<Option compilerVar="CC" />
120135
</Unit>
121-
<Unit filename="lib_pcre/pcre/pcre_info.c">
136+
<Unit filename="lib_pcre\pcre\pcre_info.c">
122137
<Option compilerVar="CC" />
123138
</Unit>
124-
<Unit filename="lib_pcre/pcre/pcre_internal.h" />
125-
<Unit filename="lib_pcre/pcre/pcre_maketables.c">
139+
<Unit filename="lib_pcre\pcre\pcre_internal.h" />
140+
<Unit filename="lib_pcre\pcre\pcre_maketables.c">
126141
<Option compilerVar="CC" />
127142
</Unit>
128-
<Unit filename="lib_pcre/pcre/pcre_newline.c">
143+
<Unit filename="lib_pcre\pcre\pcre_newline.c">
129144
<Option compilerVar="CC" />
130145
</Unit>
131-
<Unit filename="lib_pcre/pcre/pcre_ord2utf8.c">
146+
<Unit filename="lib_pcre\pcre\pcre_ord2utf8.c">
132147
<Option compilerVar="CC" />
133148
</Unit>
134-
<Unit filename="lib_pcre/pcre/pcre_refcount.c">
149+
<Unit filename="lib_pcre\pcre\pcre_refcount.c">
135150
<Option compilerVar="CC" />
136151
</Unit>
137-
<Unit filename="lib_pcre/pcre/pcre_study.c">
152+
<Unit filename="lib_pcre\pcre\pcre_study.c">
138153
<Option compilerVar="CC" />
139154
</Unit>
140-
<Unit filename="lib_pcre/pcre/pcre_tables.c">
155+
<Unit filename="lib_pcre\pcre\pcre_tables.c">
141156
<Option compilerVar="CC" />
142157
</Unit>
143-
<Unit filename="lib_pcre/pcre/pcre_try_flipped.c">
158+
<Unit filename="lib_pcre\pcre\pcre_try_flipped.c">
144159
<Option compilerVar="CC" />
145160
</Unit>
146-
<Unit filename="lib_pcre/pcre/pcre_ucp_searchfuncs.c">
161+
<Unit filename="lib_pcre\pcre\pcre_ucp_searchfuncs.c">
147162
<Option compilerVar="CC" />
148163
</Unit>
149-
<Unit filename="lib_pcre/pcre/pcre_valid_utf8.c">
164+
<Unit filename="lib_pcre\pcre\pcre_valid_utf8.c">
150165
<Option compilerVar="CC" />
151166
</Unit>
152-
<Unit filename="lib_pcre/pcre/pcre_version.c">
167+
<Unit filename="lib_pcre\pcre\pcre_version.c">
153168
<Option compilerVar="CC" />
154169
</Unit>
155-
<Unit filename="lib_pcre/pcre/pcre_xclass.c">
170+
<Unit filename="lib_pcre\pcre\pcre_xclass.c">
156171
<Option compilerVar="CC" />
157172
</Unit>
158-
<Unit filename="lib_pcre/pcre/ucp.h" />
159-
<Unit filename="lib_pcre/pcre/ucpinternal.h" />
160-
<Unit filename="lib_pcre/pcre/ucptable.h" />
173+
<Unit filename="lib_pcre\pcre\ucp.h" />
174+
<Unit filename="lib_pcre\pcre\ucpinternal.h" />
175+
<Unit filename="lib_pcre\pcre\ucptable.h" />
161176
<Unit filename="mt19937ar-cok.cpp" />
162177
<Unit filename="mt19937ar-cok.h" />
163178
<Unit filename="os_version.cpp" />
164179
<Unit filename="os_version.h" />
165180
<Unit filename="qmath.h" />
166-
<Unit filename="resources/AutoHotkey.rc">
181+
<Unit filename="resources\AutoHotkey.rc">
167182
<Option compilerVar="WINDRES" />
168183
</Unit>
169-
<Unit filename="resources/resource.h" />
184+
<Unit filename="resources\resource.h" />
170185
<Unit filename="script.cpp" />
171186
<Unit filename="script.h" />
172187
<Unit filename="script2.cpp" />

0 commit comments

Comments
 (0)