Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes for contrib build.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2001-12-02 10:07:15 +00:00
parent 961c54c333
commit 2dc5bacc01
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/samples/Makefile.in
View File

@@ -1,6 +1,6 @@
# $Id$ # $Id$
CONTRIB_SAMPLES=mmedia ogl stc gizmos canvas xrc plot applet fl CONTRIB_SAMPLES=canvas fl gizmos mmedia net ogl plot stc xrc #applet
all: all:
@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done @for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done

2
contrib/src/Makefile.in
View File

@@ -1,6 +1,6 @@
# $Id$ # $Id$
CONTRIB_SUBDIRS=ogl mmedia stc xrc plot canvas animate fl #applet CONTRIB_SUBDIRS=canvas fl gizmos mmedia net ogl plot stc xrc #applet
all: all:
@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done

4
src/makelib.env.in
View File

@@ -63,9 +63,9 @@ libtype_so: $(top_builddir)/lib/$(TARGETLIB_SHARED)
libtype_a: $(top_builddir)/lib/$(TARGETLIB_STATIC) libtype_a: $(top_builddir)/lib/$(TARGETLIB_STATIC)
$(top_builddir)/lib/$(TARGETLIB_SHARED): $(OBJECTS) $(top_builddir)/lib/@WX_LIBRARY_NAME_SHARED@ $(top_builddir)/lib/$(TARGETLIB_SHARED): $(OBJECTS)
@$(INSTALL) -d $(top_builddir)/lib @$(INSTALL) -d $(top_builddir)/lib
$(SHARED_LD) $@ $(TARGETLIB_SONAME) $(OBJECTS) -L$(top_builddir)/lib @WXCONFIG_LIBS@ $(EXTRALIBS) $(OPENGLLIBS) $(SHARED_LD) $@ $(TARGETLIB_SONAME) $(OBJECTS)
cd $(top_builddir)/lib \ cd $(top_builddir)/lib \
&& $(RM) $(TARGETLIB_LINK1) $(TARGETLIB_LINK2) \ && $(RM) $(TARGETLIB_LINK1) $(TARGETLIB_LINK2) \
&& $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \ && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \