Commit 1bffc808 authored by thomas's avatar thomas
Browse files

updated build system

git-svn-id: https://svn.grrrr.org/ext/trunk@917 4d9ac71a-51e6-0310-8455-cad1006bcd31
parent c6e57b92
......@@ -94,10 +94,10 @@ $(TARGET) :: $(OBJS)
cd $(TARGETPATH)
!ifdef BUILDLIB
-del $(<F)
tlib "$(<F)" +$(**: = +)
tlib "$(<F)" +$(OBJS: = +)
cd ..
!else
ilink32 $(LDFLAGS) $(LIBPATH) -L. $** ,$(<F),,$(LIBS),$(NAME).def
ilink32 $(LDFLAGS) $(LIBPATH) -L. $(OBJS) ,$(<F),,$(LIBS),$(NAME).def
!endif
cd ..
......@@ -118,7 +118,7 @@ $(FLEXTPATH):
_install_ :: $(INSTPATH) $(FLEXTPATH)
_install_ :: $(TARGET)
_install_ ::
!ifdef FLEXTBUILD
-copy $(TARGET) $(FLEXTPATH) > nul
@cd $(SRCDIR)
......
......@@ -63,9 +63,9 @@ $(TARGET) :: $(TARGETPATH)
$(TARGET) :: $(COBJS) $(CPPOBJS)
ifdef BUILDLIB
$(AR) rc $@ $^
$(AR) rc $@ $(COBJS) $(CPPOBJS)
else
$(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $^ $(LIBS)
$(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS)
chmod 755 $@
endif
......@@ -86,7 +86,7 @@ _install_:: $(INSTPATH) $(FLEXTPATH)
_install_:: $(TARGET)
ifdef FLEXTBUILD
cp $^ $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTPATH)
cp $(TARGET) $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(FLEXTPATH)
else
install $^ $(INSTPATH)
install $(TARGET) $(INSTPATH)
endif
......@@ -64,9 +64,9 @@ $(TARGET) :: $(TARGETPATH)
$(TARGET) :: $(COBJS) $(CPPOBJS)
ifdef BUILDLIB
$(AR) rc $@ $^
$(AR) rc $@ $(COBJS) $(CPPOBJS)
else
$(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $^ $(LIBS)
$(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS)
endif
##############################################
......@@ -86,8 +86,8 @@ _install_:: $(INSTPATH) $(FLEXTPATH)
_install_:: $(TARGET)
ifdef FLEXTBUILD
copy $(subst /,\,$^ $(FLEXTPATH))
copy $(subst /,\,$(TARGET) $(FLEXTPATH))
-for %%i in ($(subst /,\,$(patsubst %,$(SRCDIR)/%,$(HDRS)))) do @copy %%i $(subst /,\,$(FLEXTPATH)) > nul
else
copy $(subst /,\,$^ $(INSTPATH))
copy $(subst /,\,$(TARGET) $(INSTPATH))
endif
......@@ -67,10 +67,11 @@ $(TARGET):: $(TARGETPATH)
$(TARGET):: $(OBJS)
@cd $(TARGETPATH)
!ifdef BUILDLIB
lib /OUT:$(@F) $**
lib /OUT:$(@F) $(OBJS)
cd ..
!else
link /DLL $(LDFLAGS) $(LIBPATH) $** $(LIBS) /out:$(@F)
echo $**
link /DLL $(LDFLAGS) $(LIBPATH) $(OBJS) $(LIBS) /out:$(@F)
!endif
cd ..
......@@ -92,7 +93,7 @@ $(FLEXTPATH):
_install_:: $(INSTPATH) $(FLEXTPATH)
_install_:: $(TARGET)
_install_::
!ifdef FLEXTBUILD
-copy $(TARGET) $(FLEXTPATH) > nul
@cd $(SRCDIR)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment