@@ -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
1718CROSS_OSX = x86_64-apple-darwin17-c++
1819
1920diff.so : diff.o ; $(CXX ) -shared $(CXXFLAGS ) -o $@ $^ $(LDFLAGS )
2021diff.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 )
2223diff-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 )
2425diffosx.so : diff-osx.o
2526 $(CROSS_OSX ) -shared $(CXXFLAGS_OSX ) -undefined dynamic_lookup -o $@ $^
2627
2728diff.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 $@ $^
3030diff-osx.o : diff.cxx ; $(CROSS_OSX ) -c $(CXXFLAGS_OSX ) -I$(ta_lua ) -o $@ $^
3131
3232lua.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 $@
3636lua-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