Use Wine import libraries for Programs

Dmitry Timoshkov dmitry at baikal.ru
Wed Jul 9 08:59:25 CDT 2003


Hello,

MinGW and Cygwin have no some import libs, or those libs are incomplete.

Changelog:
    .exe modules in the Programs directory should be linked using
    Wine import libraries.

diff -u cvs/hq/wine/programs/Makeprog.rules.in wine/programs/Makeprog.rules.in
--- cvs/hq/wine/programs/Makeprog.rules.in	Sat Jun 14 15:30:32 2003
+++ wine/programs/Makeprog.rules.in	Wed Jul  9 22:29:40 2003
@@ -37,7 +37,7 @@ $(BASEMODULE): $(WINEWRAPPER)
 # Rules for .exe main module
 
 $(MODULE): $(ALL_OBJS) $(RCOBJS) Makefile.in
-	$(CC) $(ALL_OBJS) $(RCOBJS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(ALL_LIBS)
+	$(CC) $(ALL_OBJS) $(RCOBJS) -o $@ -L$(DLLDIR) $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(ALL_LIBS)
 
 # Rules for testing
 
diff -u cvs/hq/wine/programs/avitools/Makefile.in wine/programs/avitools/Makefile.in
--- cvs/hq/wine/programs/avitools/Makefile.in	Sat Jun 14 15:30:32 2003
+++ wine/programs/avitools/Makefile.in	Wed Jul  9 22:29:40 2003
@@ -36,13 +36,13 @@ icinfo.exe.so: icinfo.o icinfo.exe.spec.
 	$(LDSHARED) $(LDDLLFLAGS) -o $@ icinfo.o icinfo.exe.spec.o $(ALL_LIBS) -lc
 
 aviinfo.exe: aviinfo.o
-	$(CC) -o $@ aviinfo.o -lkernel32 $(ALL_LIBS)
+	$(CC) -o $@ aviinfo.o -L$(DLLDIR) -lkernel32 $(ALL_LIBS)
 
 aviplay.exe: aviplay.o
-	$(CC) -o $@ aviplay.o -lddraw -lkernel32 $(ALL_LIBS)
+	$(CC) -o $@ aviplay.o -L$(DLLDIR) -lddraw -lkernel32 $(ALL_LIBS)
 
 icinfo.exe: icinfo.o
-	$(CC) -o $@ icinfo.o -lmsvfw32 -lkernel32 $(ALL_LIBS)
+	$(CC) -o $@ icinfo.o -L$(DLLDIR) -lmsvfw32 -lkernel32 $(ALL_LIBS)
 
 $(PROGRAMS:.exe=): $(WINEWRAPPER)
 	$(RM) $@ && $(LN_S) $(WINEWRAPPER) $@






More information about the wine-patches mailing list