@@ -13,30 +13,30 @@ clean: ; rm -f *.o *.so *.dll
13
13
14
14
# Platform objects.
15
15
16
- CROSS_WIN = i686-w64-mingw32-
16
+ CROSS_WIN = x86_64-w64-mingw32-g++-posix
17
+ DLLTOOL = x86_64-w64-mingw32-dlltool
17
18
CROSS_OSX = x86_64-apple-darwin17-c++
18
19
19
20
diff.so : diff.o ; $(CXX ) -shared $(CXXFLAGS ) -o $@ $^ $(LDFLAGS )
20
21
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 )
22
23
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 )
24
25
diffosx.so : diff-osx.o
25
26
$(CROSS_OSX ) -shared $(CXXFLAGS_OSX ) -undefined dynamic_lookup -o $@ $^
26
27
27
28
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 $@ $^
30
30
diff-osx.o : diff.cxx ; $(CROSS_OSX ) -c $(CXXFLAGS_OSX ) -I$(ta_lua ) -o $@ $^
31
31
32
32
lua.def :
33
33
echo LIBRARY \" textadept.exe\" > $@ && echo EXPORTS >> $@
34
34
grep -v " ^#" $(ta_src ) /lua.sym >> $@
35
- lua.la : lua.def ; $(CROSS_WIN ) dlltool -d $< -l $@
35
+ lua.la : lua.def ; $(DLLTOOL ) -d $< -l $@
36
36
lua-curses.def :
37
37
echo LIBRARY \" textadept-curses.exe\" > $@ && echo EXPORTS >> $@
38
38
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 $@
40
40
41
41
# Documentation.
42
42
0 commit comments