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:
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

View File

@@ -27,6 +27,13 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
### Conditionally set variables: ###
LIBDIRNAME =
!ifeq SHARED 0
LIBDIRNAME = ..\..\src\ogl\..\..\..\lib\wat_lib$(CFG)
!endif
!ifeq SHARED 1
LIBDIRNAME = ..\..\src\ogl\..\..\..\lib\wat_dll$(CFG)
!endif
PORTNAME =
!ifeq USE_GUI 0
PORTNAME = base
@@ -166,18 +173,13 @@ __ogllib___depname = &
### Variables: ###
LIBDIRNAME = &
..\..\src\ogl\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
OBJS = &
wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
OGLDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__UNICODE_DEFINE_p) -i=..\..\src\ogl\..\..\..\include -i=$(LIBDIRNAME) &
-i=..\..\src\ogl\..\..\..\src\tiff -i=..\..\src\ogl\..\..\..\src\jpeg &
-i=..\..\src\ogl\..\..\..\src\png -i=..\..\src\ogl\..\..\..\src\zlib &
-i=..\..\src\ogl\..\..\..\src\regex &
-i=..\..\src\ogl\..\..\..\src\expat\lib -i=..\..\src\ogl\..\..\include &
-dWXUSINGDLL -dWXMAKINGDLL_OGL $(CXXFLAGS) /fh=$(OBJS)\wxprec_ogldll.pch
$(__UNICODE_DEFINE_p) -i=..\..\src\ogl\..\..\..\include -i=$(SETUPHDIR) &
-i=..\..\src\ogl\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_OGL $(CXXFLAGS) &
/fh=$(OBJS)\wxprec_ogldll.pch
OGLDLL_OBJECTS = &
$(OBJS)\ogldll_dummy.obj &
$(OBJS)\ogldll_basic2.obj &
@@ -194,12 +196,8 @@ OGLDLL_OBJECTS = &
$(OBJS)\ogldll_ogldiag.obj
OGLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__UNICODE_DEFINE_p) -i=..\..\src\ogl\..\..\..\include -i=$(LIBDIRNAME) &
-i=..\..\src\ogl\..\..\..\src\tiff -i=..\..\src\ogl\..\..\..\src\jpeg &
-i=..\..\src\ogl\..\..\..\src\png -i=..\..\src\ogl\..\..\..\src\zlib &
-i=..\..\src\ogl\..\..\..\src\regex &
-i=..\..\src\ogl\..\..\..\src\expat\lib -i=..\..\src\ogl\..\..\include &
$(CXXFLAGS) /fh=$(OBJS)\wxprec_ogllib.pch
$(__UNICODE_DEFINE_p) -i=..\..\src\ogl\..\..\..\include -i=$(SETUPHDIR) &
-i=..\..\src\ogl\..\..\include $(CXXFLAGS) /fh=$(OBJS)\wxprec_ogllib.pch
OGLLIB_OBJECTS = &
$(OBJS)\ogllib_dummy.obj &
$(OBJS)\ogllib_basic2.obj &
@@ -214,6 +212,8 @@ OGLLIB_OBJECTS = &
$(OBJS)\ogllib_constrnt.obj &
$(OBJS)\ogllib_lines.obj &
$(OBJS)\ogllib_ogldiag.obj
SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
all : $(OBJS)
@@ -316,7 +316,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_wa
@%create $(OBJS)\ogldll.lbc
@%append $(OBJS)\ogldll.lbc option quiet
@%append $(OBJS)\ogldll.lbc name $^@
@%append $(OBJS)\ogldll.lbc option incremental
@%append $(OBJS)\ogldll.lbc option caseexact
@%append $(OBJS)\ogldll.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME)
@for %i in ($(OGLDLL_OBJECTS)) do @%append $(OBJS)\ogldll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\ogldll.lbc library %i