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

change MSW libs directories so that libraries are shared by builds

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-15 22:08:13 +00:00
parent 3df38e2077
commit 75a0a7b7de
756 changed files with 19931 additions and 21915 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
utils/HelpGen/makefile.bcc
View File

@@ -22,9 +22,8 @@ BCCDIR = $(MAKEDIR)\..
HELPGEN_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \
$(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(LIBDIRNAME) \
-I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \
-I.\..\..\src\regex -I.\..\..\src\expat\lib -I. $(__DLLFLAG_p) $(CXXFLAGS)
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \
-I. $(__DLLFLAG_p) $(CXXFLAGS)
HELPGEN_OBJECTS = \
$(OBJS)\HelpGen_HelpGen.obj \
$(OBJS)\HelpGen_cjparser.obj \
@@ -33,15 +32,20 @@ HELPGEN_OBJECTS = \
$(OBJS)\HelpGen_markup.obj \
$(OBJS)\HelpGen_scriptbinder.obj \
$(OBJS)\HelpGen_sourcepainter.obj \
$(OBJS)\HelpGen_srcparser.obj \
$(OBJS)\HelpGen_wx_extra_imps.obj
LIBDIRNAME = \
.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
$(OBJS)\HelpGen_srcparser.obj
OBJS = \
bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
### Conditionally set variables: ###
!if "$(SHARED)" == "0"
LIBDIRNAME = .\..\..\lib\bcc_lib$(CFG)
!endif
!if "$(SHARED)" == "1"
LIBDIRNAME = .\..\..\lib\bcc_dll$(CFG)
!endif
!if "$(USE_GUI)" == "0"
PORTNAME = base
!endif
@@ -161,9 +165,6 @@ $(OBJS)\HelpGen_sourcepainter.obj: .\src\sourcepainter.cpp
$(OBJS)\HelpGen_srcparser.obj: .\src\srcparser.cpp
$(CXX) -q -c -P -o$@ $(HELPGEN_CXXFLAGS) $**
$(OBJS)\HelpGen_wx_extra_imps.obj: .\src\wx_extra_imps.cpp
$(CXX) -q -c -P -o$@ $(HELPGEN_CXXFLAGS) $**
$(OBJS)\HelpGen.exe: $(HELPGEN_OBJECTS)
ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) -ap @&&|
c0x32.obj $(HELPGEN_OBJECTS),$@,, $(__WXLIB_BASE_p) $(__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 cw32mt$(__RUNTIME_LIBS_7).lib,,