regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -4,7 +4,12 @@
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
.autodepend
|
||||
|
||||
!ifndef BCCDIR
|
||||
!ifndef MAKEDIR
|
||||
!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
|
||||
!endif
|
||||
BCCDIR = $(MAKEDIR)\..
|
||||
!endif
|
||||
|
||||
@@ -14,19 +19,15 @@ BCCDIR = $(MAKEDIR)\..
|
||||
# Do not modify the rest of this file!
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
!if "$(BCCDIR)" == "\.."
|
||||
!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
|
||||
!endif
|
||||
|
||||
### Variables: ###
|
||||
|
||||
OBJS = \
|
||||
bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
OGLDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
|
||||
$(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include \
|
||||
-I$(SETUPHDIR) -I..\..\src\ogl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_OGL \
|
||||
$(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_ogldll.csm
|
||||
OGLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
|
||||
$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
|
||||
$(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I$(SETUPHDIR) \
|
||||
-I..\..\src\ogl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_OGL -Hu \
|
||||
-H=$(OBJS)\wxprec_ogldll.csm $(CPPFLAGS) $(CXXFLAGS)
|
||||
OGLDLL_OBJECTS = \
|
||||
$(OBJS)\ogldll_dummy.obj \
|
||||
$(OBJS)\ogldll_basic2.obj \
|
||||
@@ -41,11 +42,11 @@ OGLDLL_OBJECTS = \
|
||||
$(OBJS)\ogldll_constrnt.obj \
|
||||
$(OBJS)\ogldll_lines.obj \
|
||||
$(OBJS)\ogldll_ogldiag.obj
|
||||
OGLLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) -I$(BCCDIR)\include \
|
||||
$(__DEBUGINFO) $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include \
|
||||
-I$(SETUPHDIR) -I..\..\src\ogl\..\..\include $(CXXFLAGS) -Hu \
|
||||
-H=$(OBJS)\wxprec_ogllib.csm
|
||||
OGLLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
|
||||
$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
|
||||
$(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I$(SETUPHDIR) \
|
||||
-I..\..\src\ogl\..\..\include -Hu -H=$(OBJS)\wxprec_ogllib.csm $(CPPFLAGS) \
|
||||
$(CXXFLAGS)
|
||||
OGLLIB_OBJECTS = \
|
||||
$(OBJS)\ogllib_dummy.obj \
|
||||
$(OBJS)\ogllib_basic2.obj \
|
||||
@@ -273,7 +274,7 @@ clean:
|
||||
|
||||
!if "$(SHARED)" == "1"
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bcc$(VENDORTAG).dll: $(OBJS)\ogldll_dummy.obj $(OGLDLL_OBJECTS)
|
||||
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
|
||||
ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__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 $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
|
||||
|
|
||||
implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl $@
|
||||
@@ -282,7 +283,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_bc
|
||||
!if "$(SHARED)" == "0"
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib: $(OBJS)\ogllib_dummy.obj $(OGLLIB_OBJECTS)
|
||||
if exist $@ del $@
|
||||
tlib /a /p2048 $@ @&&|
|
||||
tlib /a /p4096 $@ @&&|
|
||||
$(OGLLIB_OBJECTS)
|
||||
|
|
||||
!endif
|
||||
|
@@ -14,11 +14,11 @@ include ../../../build/msw/config.gcc
|
||||
|
||||
OBJS = \
|
||||
gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
OGLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
|
||||
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
|
||||
$(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I$(SETUPHDIR) -Wall \
|
||||
-I..\..\src\ogl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_OGL $(CXXFLAGS) \
|
||||
$(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0)
|
||||
OGLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
|
||||
-D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
|
||||
-I..\..\src\ogl\..\..\..\include -I$(SETUPHDIR) -Wall \
|
||||
-I..\..\src\ogl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_OGL \
|
||||
$(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
|
||||
OGLDLL_OBJECTS = \
|
||||
$(OBJS)\ogldll_dummy.o \
|
||||
$(OBJS)\ogldll_basic2.o \
|
||||
@@ -33,11 +33,11 @@ OGLDLL_OBJECTS = \
|
||||
$(OBJS)\ogldll_constrnt.o \
|
||||
$(OBJS)\ogldll_lines.o \
|
||||
$(OBJS)\ogldll_ogldiag.o
|
||||
OGLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
|
||||
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
|
||||
$(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I$(SETUPHDIR) -Wall \
|
||||
-I..\..\src\ogl\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG) \
|
||||
$(__EXCEPTIONSFLAG_0)
|
||||
OGLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
|
||||
-D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
|
||||
-I..\..\src\ogl\..\..\..\include -I$(SETUPHDIR) -Wall \
|
||||
-I..\..\src\ogl\..\..\include $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \
|
||||
$(CPPFLAGS) $(CXXFLAGS)
|
||||
OGLLIB_OBJECTS = \
|
||||
$(OBJS)\ogllib_dummy.o \
|
||||
$(OBJS)\ogllib_basic2.o \
|
||||
|
@@ -14,15 +14,15 @@
|
||||
|
||||
OBJS = \
|
||||
vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
OGLDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \
|
||||
OGLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \
|
||||
$(__DEBUGINFO_2) \
|
||||
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_vc$(VENDORTAG).pdb \
|
||||
$(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
|
||||
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
|
||||
/I..\..\src\ogl\..\..\..\include /I$(SETUPHDIR) /W4 \
|
||||
/I..\..\src\ogl\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_OGL $(CXXFLAGS) \
|
||||
/I..\..\src\ogl\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_OGL \
|
||||
$(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" \
|
||||
/Fp"$(OBJS)\wxprec_ogldll.pch"
|
||||
/Fp"$(OBJS)\wxprec_ogldll.pch" $(CPPFLAGS) $(CXXFLAGS)
|
||||
OGLDLL_OBJECTS = \
|
||||
$(OBJS)\ogldll_dummy.obj \
|
||||
$(OBJS)\ogldll_basic2.obj \
|
||||
@@ -37,14 +37,14 @@ OGLDLL_OBJECTS = \
|
||||
$(OBJS)\ogldll_constrnt.obj \
|
||||
$(OBJS)\ogldll_lines.obj \
|
||||
$(OBJS)\ogldll_ogldiag.obj
|
||||
OGLLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 \
|
||||
OGLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_15) /DWIN32 \
|
||||
$(__DEBUGINFO_2) \
|
||||
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.pdb \
|
||||
$(____DEBUGRUNTIME_14_p) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
|
||||
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
|
||||
/I..\..\src\ogl\..\..\..\include /I$(SETUPHDIR) /W4 \
|
||||
/I..\..\src\ogl\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG) \
|
||||
$(__EXCEPTIONSFLAG_0) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_ogllib.pch"
|
||||
/I..\..\src\ogl\..\..\include $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \
|
||||
/Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_ogllib.pch" $(CPPFLAGS) $(CXXFLAGS)
|
||||
OGLLIB_OBJECTS = \
|
||||
$(OBJS)\ogllib_dummy.obj \
|
||||
$(OBJS)\ogllib_basic2.obj \
|
||||
|
@@ -182,11 +182,11 @@ __ogllib___depname = &
|
||||
|
||||
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=$(SETUPHDIR) &
|
||||
-i=..\..\src\ogl\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_OGL $(CXXFLAGS) &
|
||||
/fh=$(OBJS)\wxprec_ogldll.pch $(__EXCEPTIONSFLAG)
|
||||
OGLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
|
||||
-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
|
||||
-i=..\..\src\ogl\..\..\..\include -i=$(SETUPHDIR) &
|
||||
-i=..\..\src\ogl\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_OGL &
|
||||
/fh=$(OBJS)\wxprec_ogldll.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
|
||||
OGLDLL_OBJECTS = &
|
||||
$(OBJS)\ogldll_dummy.obj &
|
||||
$(OBJS)\ogldll_basic2.obj &
|
||||
@@ -201,11 +201,11 @@ OGLDLL_OBJECTS = &
|
||||
$(OBJS)\ogldll_constrnt.obj &
|
||||
$(OBJS)\ogldll_lines.obj &
|
||||
$(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=$(SETUPHDIR) &
|
||||
-i=..\..\src\ogl\..\..\include $(CXXFLAGS) /fh=$(OBJS)\wxprec_ogllib.pch &
|
||||
$(__EXCEPTIONSFLAG)
|
||||
OGLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
|
||||
-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
|
||||
-i=..\..\src\ogl\..\..\..\include -i=$(SETUPHDIR) &
|
||||
-i=..\..\src\ogl\..\..\include /fh=$(OBJS)\wxprec_ogllib.pch &
|
||||
$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
|
||||
OGLLIB_OBJECTS = &
|
||||
$(OBJS)\ogllib_dummy.obj &
|
||||
$(OBJS)\ogllib_basic2.obj &
|
||||
@@ -338,5 +338,5 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_wa
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib : $(OGLLIB_OBJECTS)
|
||||
@%create $(OBJS)\ogllib.lbc
|
||||
@for %i in ($(OGLLIB_OBJECTS)) do @%append $(OBJS)\ogllib.lbc +%i
|
||||
wlib -q -p2048 -n -b $^@ @$(OBJS)\ogllib.lbc
|
||||
wlib -q -p4096 -n -b $^@ @$(OBJS)\ogllib.lbc
|
||||
!endif
|
||||
|
Reference in New Issue
Block a user