diff options
| author | cls%seawood.org <devnull@localhost> | 1999-07-14 07:03:57 +0000 |
|---|---|---|
| committer | cls%seawood.org <devnull@localhost> | 1999-07-14 07:03:57 +0000 |
| commit | 3382c969f118cb495ccef6a00e46918119533c5d (patch) | |
| tree | 92f06814bd4dd5576b02d42961d2143017f1079b | |
| parent | 1b540749d5864ff394b6296982741f0addcfd177 (diff) | |
| download | nspr-hg-3382c969f118cb495ccef6a00e46918119533c5d.tar.gz | |
Added detection for dlltool and windres which are needed to build dlls.
Changed rules.mk so MKSHLIB is now expected to contain the appropriate option to state what the object file is (ie, -o $*.so)
Unhardcoded OBJ_SUFFIX, DLL_SUFFIX, & LIB_SUFFIX.
Successfully compiled and linked a static nspr test program (alarm & fsync) using linux->mingw32 cross-compiler and successfully ran it on a win95 box.
| -rw-r--r-- | config/rules.mk | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/config/rules.mk b/config/rules.mk index f0fdcbe2..44ec0423 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -155,6 +155,14 @@ ifeq ($(OS_TARGET), WIN16) W16DEF = $(notdir $(basename $(SHARED_LIBRARY))).DEF endif +ifdef RES +OBJS += $(RES) +endif + +ifdef RESOBJ +#OBJS += $(RESOBJ) +endif + ifeq ($(OS_ARCH), WINNT) ifneq ($(OS_TARGET), WIN16) ifneq ($(OS_TARGET), OS2) @@ -296,6 +304,9 @@ endif $(SHARED_LIBRARY): $(OBJS) @$(MAKE_OBJDIR) rm -f $@ +ifdef USE_AUTOCONF + $(MKSHLIB) $(OBJS) $(EXTRA_LIBS) $(OS_LIBS) +else ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1) echo "#!" > $(OBJDIR)/lib$(LIBRARY_NAME)_syms nm -B -C -g $(OBJS) \ @@ -340,6 +351,7 @@ else $(MKSHLIB) -o $@ $(OBJS) $(EXTRA_LIBS) $(OS_LIBS) endif endif +endif $(PURE_LIBRARY): rm -f $@ @@ -348,6 +360,10 @@ ifneq ($(OS_ARCH), WINNT) endif $(RANLIB) $@ + +$(RESOBJ): $(RESNAME) + $(RC) -F$(OBJ_SUFFIX) $< $@ + ifeq ($(OS_ARCH), WINNT) $(RES): $(RESNAME) @$(MAKE_OBJDIR) |