Skip to content

Commit

Permalink
Merge pull request zeromq#741 from PSG-Luna/patch-2
Browse files Browse the repository at this point in the history
Fix mingw makefile
  • Loading branch information
hintjens committed Oct 13, 2014
2 parents 9c792ad + 6ce3bcc commit 9c24aea
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions builds/mingw32/Makefile.mingw32
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ CFLAGS=-Wall -Os -g -DLIBCZMQ_EXPORTS $(INCDIR)

OBJS = zactor.o zauth.o zbeacon.o zcert.o zcertstore.o zchunk.o zclock.o zconfig.o zdigest.o zdir.o zdir_patch.o zfile.o zframe.o zhash.o zgossip.o ziflist.o zlist.o zloop.o zmonitor.o zmsg.o zpoller.o zproxy.o zrex.o zring.o zsock.o zsock_option.o zstr.o zsys.o zuuid.o zgossip_msg.o zauth_v2.o zbeacon_v2.o zctx.o zmonitor_v2.o zmutex.o zproxy_v2.o zsocket.o zsockopt.o zthread.o
%.o: ../../src/%.c
$(CC) -c -o $@ $< $(CFLAGS)
$(CC) -c -o $@ $< $(CFLAGS)

all: libczmq.dll czmq_selftest.exe

libczmq.dll: $(OBJS)
gcc -shared -o $@ $(OBJS) -Wl,--out-implib,$@.a $(LIBDIR) -lzmq -lws2_32 -liphlpapi
$(CC) -shared -o $@ $(OBJS) -Wl,--out-implib,$@.a $(LIBDIR) -lzmq -lws2_32 -liphlpapi -lrpcrt4

# the test functions are not exported into the DLL
czmq_selftest.exe: czmq_selftest.o $(OBJS)
gcc -o $@ $^ $(LIBDIR) -lzmq -lws2_32 -liphlpapi
$(CC) -o $@ $^ $(LIBDIR) -lzmq -lws2_32 -liphlpapi -lrpcrt4

clean:
del *.o *.a *.dll *.exe
del *.o *.a *.dll *.exe

#################################################################
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY #
Expand Down
8 changes: 4 additions & 4 deletions model/build-mingw32.gsl
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@ OBJS =\
.endfor

%.o: ../../src/%.c
$\(CC) -c -o $@ $< $\(CFLAGS)
$\(CC) -c -o $@ $< $\(CFLAGS)

all: lib$(project.name).dll $(project.name)_selftest.exe

lib$(project.name).dll: $\(OBJS)
gcc -shared -o $@ $\(OBJS) -Wl,--out-implib,$@.a $\(LIBDIR) -lzmq -lws2_32 -liphlpapi
$\(CC) -shared -o $@ $\(OBJS) -Wl,--out-implib,$@.a $\(LIBDIR) -lzmq -lws2_32 -liphlpapi -lrpcrt4

# the test functions are not exported into the DLL
$(project.name)_selftest.exe: $(project.name)_selftest.o $\(OBJS)
gcc -o $@ $^ $\(LIBDIR) -lzmq -lws2_32 -liphlpapi
$\(CC) -o $@ $^ $\(LIBDIR) -lzmq -lws2_32 -liphlpapi -lrpcrt4

clean:
del *.o *.a *.dll *.exe
del *.o *.a *.dll *.exe

#################################################################
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY #
Expand Down

0 comments on commit 9c24aea

Please sign in to comment.