Skip to content
Snippets Groups Projects
Commit 6938f4b2 authored by Luigi Rizzo's avatar Luigi Rizzo
Browse files

Fix building of modules under cygwin.

After this commit we can actually load modules under windows,
and we can start debugging more interesting problems related
to the load order and functionality of modules.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89454 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent f5e5a443
No related branches found
No related tags found
No related merge requests found
...@@ -66,9 +66,8 @@ _all: $(LOADABLE_MODS:%=%.so) ...@@ -66,9 +66,8 @@ _all: $(LOADABLE_MODS:%=%.so)
ifneq ($(findstring $(OSARCH), mingw32 cygwin ),) ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
# linker options and extra libraries for cygwin # linker options and extra libraries for cygwin
SOLINK=-Wl,--out-implib=lib$@.a -shared SOLINK=-Wl,--out-implib=lib$@.a -shared
LIBS+=-L../main -lasterisk -L../res LIBS+=-L../main -lasterisk -L../res $($@_LIBS)
# additional libraries in res/ # additional libraries in res/
LIBS_RES:= -lres_monitor -lres_adsi -lres_features
endif endif
endif endif
......
...@@ -39,3 +39,9 @@ endif ...@@ -39,3 +39,9 @@ endif
all: _all all: _all
include $(ASTTOPDIR)/Makefile.moddir_rules include $(ASTTOPDIR)/Makefile.moddir_rules
ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
LIBS+= -lres_features.so -lres_ael_share.so -lres_monitor.so -lres_speech.so
LIBS+= -lres_smdi.so
endif
...@@ -64,6 +64,10 @@ all: _all ...@@ -64,6 +64,10 @@ all: _all
include $(ASTTOPDIR)/Makefile.moddir_rules include $(ASTTOPDIR)/Makefile.moddir_rules
ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
LIBS+= -lres_monitor.so -lres_features.so
endif
clean:: clean::
rm -f gentone rm -f gentone
$(MAKE) -C misdn clean $(MAKE) -C misdn clean
......
...@@ -25,6 +25,10 @@ all: _all ...@@ -25,6 +25,10 @@ all: _all
include $(ASTTOPDIR)/Makefile.moddir_rules include $(ASTTOPDIR)/Makefile.moddir_rules
ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
LIBS+= -lres_ael_share.so -lres_monitor.so
endif
clean:: clean::
rm -f ael/*.o rm -f ael/*.o
......
...@@ -25,6 +25,13 @@ all: _all ...@@ -25,6 +25,13 @@ all: _all
include $(ASTTOPDIR)/Makefile.moddir_rules include $(ASTTOPDIR)/Makefile.moddir_rules
ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
# order-only dependency: build res_monitor before res_features
res_features.so: | res_monitor.so
# res_features uses some functions from res_monitor
res_features.so_LIBS:= -lres_monitor.so
endif
ael/ael_lex.o: ael/ael_lex.c ../include/asterisk/ael_structs.h ael/ael.tab.h ael/ael_lex.o: ael/ael_lex.c ../include/asterisk/ael_structs.h ael/ael.tab.h
ael/ael_lex.o: ASTCFLAGS+=-I. -Iael ael/ael_lex.o: ASTCFLAGS+=-I. -Iael
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment