regenerated after adding DEBUG_ options
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
@@ -20,25 +20,53 @@ BCCDIR = $(MAKEDIR)\..
|
||||
|
||||
### Variables: ###
|
||||
|
||||
LIBDIRNAME = \
|
||||
..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
OBJS = \
|
||||
bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
OGLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
|
||||
OGLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
|
||||
$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
|
||||
$(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include \
|
||||
-I..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \
|
||||
$(__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 \
|
||||
-DwxUSE_DEPRECATED=0 $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_ogldll.csm
|
||||
OGLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGFLAG) \
|
||||
-I..\..\src\ogl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_OGL $(CXXFLAGS) -Hu \
|
||||
-H=$(OBJS)\wxprec_ogldll.csm
|
||||
OGLDLL_OBJECTS = \
|
||||
$(OBJS)\ogldll_dummy.obj \
|
||||
$(OBJS)\ogldll_basic2.obj \
|
||||
$(OBJS)\ogldll_canvas.obj \
|
||||
$(OBJS)\ogldll_divided.obj \
|
||||
$(OBJS)\ogldll_mfutils.obj \
|
||||
$(OBJS)\ogldll_oglmisc.obj \
|
||||
$(OBJS)\ogldll_basic.obj \
|
||||
$(OBJS)\ogldll_composit.obj \
|
||||
$(OBJS)\ogldll_drawn.obj \
|
||||
$(OBJS)\ogldll_bmpshape.obj \
|
||||
$(OBJS)\ogldll_constrnt.obj \
|
||||
$(OBJS)\ogldll_lines.obj \
|
||||
$(OBJS)\ogldll_ogldiag.obj
|
||||
OGLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
|
||||
$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
|
||||
$(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include \
|
||||
-I..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \
|
||||
$(__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) -Hu -H=$(OBJS)\wxprec_ogllib.csm
|
||||
OGLLIB_OBJECTS = \
|
||||
$(OBJS)\ogllib_dummy.obj \
|
||||
$(OBJS)\ogllib_basic2.obj \
|
||||
$(OBJS)\ogllib_canvas.obj \
|
||||
$(OBJS)\ogllib_divided.obj \
|
||||
$(OBJS)\ogllib_mfutils.obj \
|
||||
$(OBJS)\ogllib_oglmisc.obj \
|
||||
$(OBJS)\ogllib_basic.obj \
|
||||
$(OBJS)\ogllib_composit.obj \
|
||||
$(OBJS)\ogllib_drawn.obj \
|
||||
$(OBJS)\ogllib_bmpshape.obj \
|
||||
$(OBJS)\ogllib_constrnt.obj \
|
||||
$(OBJS)\ogllib_lines.obj \
|
||||
$(OBJS)\ogllib_ogldiag.obj
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
@@ -54,7 +82,10 @@ VENDORTAG = _$(VENDOR)
|
||||
!if "$(OFFICIAL_BUILD)" == "1"
|
||||
VENDORTAG =
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug"
|
||||
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
|
||||
WXDEBUGFLAG = d
|
||||
!endif
|
||||
!if "$(DEBUG_FLAG)" == "1"
|
||||
WXDEBUGFLAG = d
|
||||
!endif
|
||||
!if "$(SHARED)" == "1"
|
||||
@@ -66,15 +97,33 @@ WXUNICODEFLAG = u
|
||||
!if "$(WXUNIV)" == "1"
|
||||
WXUNIVNAME = univ
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug"
|
||||
__DEBUGFLAG = -v
|
||||
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
|
||||
__DEBUGINFO = -v
|
||||
!endif
|
||||
!if "$(BUILD)" == "release"
|
||||
__DEBUGFLAG = -v-
|
||||
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
|
||||
__DEBUGINFO = -v-
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug"
|
||||
!if "$(DEBUG_INFO)" == "0"
|
||||
__DEBUGINFO = -v-
|
||||
!endif
|
||||
!if "$(DEBUG_INFO)" == "1"
|
||||
__DEBUGINFO = -v
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
|
||||
__DEBUG_DEFINE_p = -D__WXDEBUG__
|
||||
!endif
|
||||
!if "$(DEBUG_FLAG)" == "1"
|
||||
__DEBUG_DEFINE_p = -D__WXDEBUG__
|
||||
!endif
|
||||
!if "$(USE_GUI)" == "1"
|
||||
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
|
||||
!endif
|
||||
!if "$(USE_GUI)" == "1"
|
||||
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
|
||||
!endif
|
||||
!if "$(USE_GUI)" == "1"
|
||||
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
|
||||
!endif
|
||||
!if "$(BUILD)" == "debug"
|
||||
__OPTIMIZEFLAG = -Od
|
||||
!endif
|
||||
@@ -112,11 +161,11 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
|
||||
!endif
|
||||
!if "$(SHARED)" == "1"
|
||||
__ogldll___depname = \
|
||||
..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll
|
||||
!endif
|
||||
!if "$(SHARED)" == "0"
|
||||
__ogllib___depname = \
|
||||
..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib
|
||||
!endif
|
||||
|
||||
|
||||
@@ -209,22 +258,22 @@ $(OBJS)\ogllib_oglmisc.obj: ../../src/ogl\oglmisc.cpp
|
||||
clean:
|
||||
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
|
||||
-if exist $(OBJS)\*.res del $(OBJS)\*.res
|
||||
-if exist ..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll del ..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll
|
||||
-if exist ..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib del ..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib
|
||||
-if exist ..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib del ..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib
|
||||
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll
|
||||
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib
|
||||
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib
|
||||
|
||||
!if "$(SHARED)" == "1"
|
||||
..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll: $(OBJS)\ogldll_dummy.obj $(OBJS)\ogldll_dummy.obj $(OBJS)\ogldll_basic2.obj $(OBJS)\ogldll_canvas.obj $(OBJS)\ogldll_divided.obj $(OBJS)\ogldll_mfutils.obj $(OBJS)\ogldll_oglmisc.obj $(OBJS)\ogldll_basic.obj $(OBJS)\ogldll_composit.obj $(OBJS)\ogldll_drawn.obj $(OBJS)\ogldll_bmpshape.obj $(OBJS)\ogldll_constrnt.obj $(OBJS)\ogldll_lines.obj $(OBJS)\ogldll_ogldiag.obj
|
||||
ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGFLAG) -L..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @&&|
|
||||
c0d32.obj $(OBJS)\ogldll_dummy.obj $(OBJS)\ogldll_basic2.obj $(OBJS)\ogldll_canvas.obj $(OBJS)\ogldll_divided.obj $(OBJS)\ogldll_mfutils.obj $(OBJS)\ogldll_oglmisc.obj $(OBJS)\ogldll_basic.obj $(OBJS)\ogldll_composit.obj $(OBJS)\ogldll_drawn.obj $(OBJS)\ogldll_bmpshape.obj $(OBJS)\ogldll_constrnt.obj $(OBJS)\ogldll_lines.obj $(OBJS)\ogldll_ogldiag.obj,$@,, $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) cw32mt$(__RUNTIME_LIBS_7).lib,,
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll: $(OGLDLL_OBJECTS) $(OBJS)\ogldll_dummy.obj
|
||||
ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
|
||||
c0d32.obj $(OGLDLL_OBJECTS),$@,, $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) cw32mt$(__RUNTIME_LIBS_7).lib,,
|
||||
|
|
||||
implib -f ..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl $@
|
||||
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl $@
|
||||
!endif
|
||||
|
||||
!if "$(SHARED)" == "0"
|
||||
..\..\src\ogl\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib: $(OBJS)\ogllib_dummy.obj $(OBJS)\ogllib_dummy.obj $(OBJS)\ogllib_basic2.obj $(OBJS)\ogllib_canvas.obj $(OBJS)\ogllib_divided.obj $(OBJS)\ogllib_mfutils.obj $(OBJS)\ogllib_oglmisc.obj $(OBJS)\ogllib_basic.obj $(OBJS)\ogllib_composit.obj $(OBJS)\ogllib_drawn.obj $(OBJS)\ogllib_bmpshape.obj $(OBJS)\ogllib_constrnt.obj $(OBJS)\ogllib_lines.obj $(OBJS)\ogllib_ogldiag.obj
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib: $(OGLLIB_OBJECTS) $(OBJS)\ogllib_dummy.obj
|
||||
if exist $@ del $@
|
||||
tlib /a /p2048 $@ @&&|
|
||||
$(OBJS)\ogllib_dummy.obj $(OBJS)\ogllib_basic2.obj $(OBJS)\ogllib_canvas.obj $(OBJS)\ogllib_divided.obj $(OBJS)\ogllib_mfutils.obj $(OBJS)\ogllib_oglmisc.obj $(OBJS)\ogllib_basic.obj $(OBJS)\ogllib_composit.obj $(OBJS)\ogllib_drawn.obj $(OBJS)\ogllib_bmpshape.obj $(OBJS)\ogllib_constrnt.obj $(OBJS)\ogllib_lines.obj $(OBJS)\ogllib_ogldiag.obj
|
||||
$(OGLLIB_OBJECTS)
|
||||
|
|
||||
!endif
|
||||
|
||||
Reference in New Issue
Block a user