change MSW libs directories so that libraries are shared by builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -22,13 +22,7 @@ BCCDIR = $(MAKEDIR)\..
|
||||
|
||||
ANIMATEDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
|
||||
$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
|
||||
$(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include -I$(LIBDIRNAME) \
|
||||
-I..\..\src\animate\..\..\..\src\tiff \
|
||||
-I..\..\src\animate\..\..\..\src\jpeg \
|
||||
-I..\..\src\animate\..\..\..\src\png \
|
||||
-I..\..\src\animate\..\..\..\src\zlib \
|
||||
-I..\..\src\animate\..\..\..\src\regex \
|
||||
-I..\..\src\animate\..\..\..\src\expat\lib \
|
||||
$(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include -I$(SETUPHDIR) \
|
||||
-I..\..\src\animate\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_ANIMATE \
|
||||
$(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_animatedll.csm
|
||||
ANIMATEDLL_OBJECTS = \
|
||||
@@ -36,25 +30,25 @@ ANIMATEDLL_OBJECTS = \
|
||||
$(OBJS)\animatedll_animate.obj
|
||||
ANIMATELIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
|
||||
$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
|
||||
$(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include -I$(LIBDIRNAME) \
|
||||
-I..\..\src\animate\..\..\..\src\tiff \
|
||||
-I..\..\src\animate\..\..\..\src\jpeg \
|
||||
-I..\..\src\animate\..\..\..\src\png \
|
||||
-I..\..\src\animate\..\..\..\src\zlib \
|
||||
-I..\..\src\animate\..\..\..\src\regex \
|
||||
-I..\..\src\animate\..\..\..\src\expat\lib \
|
||||
$(__UNICODE_DEFINE_p) -I..\..\src\animate\..\..\..\include -I$(SETUPHDIR) \
|
||||
-I..\..\src\animate\..\..\include $(CXXFLAGS) -Hu \
|
||||
-H=$(OBJS)\wxprec_animatelib.csm
|
||||
ANIMATELIB_OBJECTS = \
|
||||
$(OBJS)\animatelib_dummy.obj \
|
||||
$(OBJS)\animatelib_animate.obj
|
||||
LIBDIRNAME = \
|
||||
..\..\src\animate\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
OBJS = \
|
||||
bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
SETUPHDIR = \
|
||||
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
!if "$(SHARED)" == "0"
|
||||
LIBDIRNAME = ..\..\src\animate\..\..\..\lib\bcc_lib$(CFG)
|
||||
!endif
|
||||
!if "$(SHARED)" == "1"
|
||||
LIBDIRNAME = ..\..\src\animate\..\..\..\lib\bcc_dll$(CFG)
|
||||
!endif
|
||||
!if "$(USE_GUI)" == "0"
|
||||
PORTNAME = base
|
||||
!endif
|
||||
@@ -178,7 +172,7 @@ $(OBJS)\animatelib_dummy.obj: ../../src/animate\..\..\..\src\msw\dummy.cpp
|
||||
$(CXX) -q -c -P -o$@ $(ANIMATELIB_CXXFLAGS) -H $**
|
||||
|
||||
!if "$(SHARED)" == "1"
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll: $(ANIMATEDLL_OBJECTS) $(OBJS)\animatedll_dummy.obj
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate_bcc$(VENDORTAG).dll: $(OBJS)\animatedll_dummy.obj $(ANIMATEDLL_OBJECTS)
|
||||
ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
|
||||
c0d32.obj $(ANIMATEDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
|
||||
|
|
||||
@@ -186,7 +180,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animat
|
||||
!endif
|
||||
|
||||
!if "$(SHARED)" == "0"
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib: $(ANIMATELIB_OBJECTS) $(OBJS)\animatelib_dummy.obj
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib: $(OBJS)\animatelib_dummy.obj $(ANIMATELIB_OBJECTS)
|
||||
if exist $@ del $@
|
||||
tlib /a /p2048 $@ @&&|
|
||||
$(ANIMATELIB_OBJECTS)
|
||||
|
Reference in New Issue
Block a user