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.gcc
View File

@@ -14,9 +14,8 @@ include ../../build/msw/config.gcc
HELPGEN_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
-DHAVE_W32API_H -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)
$(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \
$(CXXFLAGS)
HELPGEN_OBJECTS = \
$(OBJS)\HelpGen_HelpGen.o \
$(OBJS)\HelpGen_cjparser.o \
@@ -25,18 +24,23 @@ HELPGEN_OBJECTS = \
$(OBJS)\HelpGen_markup.o \
$(OBJS)\HelpGen_scriptbinder.o \
$(OBJS)\HelpGen_sourcepainter.o \
$(OBJS)\HelpGen_srcparser.o \
$(OBJS)\HelpGen_wx_extra_imps.o
LIBDIRNAME = \
.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
$(OBJS)\HelpGen_srcparser.o
OBJS = \
gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
### Conditionally set variables: ###
ifeq ($(GCC_VERSION),2.95)
GCCFLAGS = -fvtable-thunks
endif
ifeq ($(SHARED),0)
LIBDIRNAME = .\..\..\lib\gcc_lib$(CFG)
endif
ifeq ($(SHARED),1)
LIBDIRNAME = .\..\..\lib\gcc_dll$(CFG)
endif
ifeq ($(USE_GUI),0)
PORTNAME = base
endif
@@ -152,9 +156,6 @@ $(OBJS)\HelpGen_sourcepainter.o: .\src\sourcepainter.cpp
$(OBJS)\HelpGen_srcparser.o: .\src\srcparser.cpp
$(CXX) -c -o $@ $(HELPGEN_CXXFLAGS) $<
$(OBJS)\HelpGen_wx_extra_imps.o: .\src\wx_extra_imps.cpp
$(CXX) -c -o $@ $(HELPGEN_CXXFLAGS) $<
$(OBJS)\HelpGen.exe: $(HELPGEN_OBJECTS)
$(CXX) -o $@ $(HELPGEN_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32