Skip to content

Commit 0246f26

Browse files
committed
Updated GitHub build container.
Windows DLLs are now 64-bit. New builds will only work with Textadept > 11.3.
1 parent 3e18d4b commit 0246f26

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
jobs:
77
build:
88
runs-on: ubuntu-latest
9-
container: ghcr.io/orbitalquark/textadept-build:v1.0
9+
container: ghcr.io/orbitalquark/textadept-build:v2.0
1010
steps:
1111
- name: Checkout textadept
1212
uses: actions/checkout@v2

Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,30 @@ clean: ; rm -f *.o *.so *.dll
1313

1414
# Platform objects.
1515

16-
CROSS_WIN = i686-w64-mingw32-
16+
CROSS_WIN = x86_64-w64-mingw32-g++-posix
17+
DLLTOOL = x86_64-w64-mingw32-dlltool
1718
CROSS_OSX = x86_64-apple-darwin17-c++
1819

1920
diff.so: diff.o ; $(CXX) -shared $(CXXFLAGS) -o $@ $^ $(LDFLAGS)
2021
diff.dll: diff-win.o lua.la
21-
$(CROSS_WIN)$(CXX) -shared -static-libgcc -static-libstdc++ $(CXXFLAGS) -o $@ $^ $(LDFLAGS)
22+
$(CROSS_WIN) -shared -static-libgcc -static-libstdc++ $(CXXFLAGS) -o $@ $^ $(LDFLAGS)
2223
diff-curses.dll: diff-win.o lua-curses.la
23-
$(CROSS_WIN)$(CXX) -shared -static-libgcc -static-libstdc++ $(CXXFLAGS) -o $@ $^ $(LDFLAGS)
24+
$(CROSS_WIN) -shared -static-libgcc -static-libstdc++ $(CXXFLAGS) -o $@ $^ $(LDFLAGS)
2425
diffosx.so: diff-osx.o
2526
$(CROSS_OSX) -shared $(CXXFLAGS_OSX) -undefined dynamic_lookup -o $@ $^
2627

2728
diff.o: diff.cxx ; $(CXX) -c $(CXXFLAGS) -I$(ta_lua) -o $@ $^
28-
diff-win.o: diff.cxx
29-
$(CROSS_WIN)$(CXX) -c $(CXXFLAGS) -DLUA_BUILD_AS_DLL -DLUA_LIB -I$(ta_lua) -o $@ $^
29+
diff-win.o: diff.cxx ; $(CROSS_WIN) -c $(CXXFLAGS) -DLUA_BUILD_AS_DLL -DLUA_LIB -I$(ta_lua) -o $@ $^
3030
diff-osx.o: diff.cxx ; $(CROSS_OSX) -c $(CXXFLAGS_OSX) -I$(ta_lua) -o $@ $^
3131

3232
lua.def:
3333
echo LIBRARY \"textadept.exe\" > $@ && echo EXPORTS >> $@
3434
grep -v "^#" $(ta_src)/lua.sym >> $@
35-
lua.la: lua.def ; $(CROSS_WIN)dlltool -d $< -l $@
35+
lua.la: lua.def ; $(DLLTOOL) -d $< -l $@
3636
lua-curses.def:
3737
echo LIBRARY \"textadept-curses.exe\" > $@ && echo EXPORTS >> $@
3838
grep -v "^#" $(ta_src)/lua.sym >> $@
39-
lua-curses.la: lua-curses.def ; $(CROSS_WIN)dlltool -d $< -l $@
39+
lua-curses.la: lua-curses.def ; $(DLLTOOL) -d $< -l $@
4040

4141
# Documentation.
4242

0 commit comments

Comments
 (0)