Merged the wxPy_newswig branch into the HEAD branch (main trunk)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-11-12 21:34:20 +00:00
parent eb6a4098a0
commit d14a1e2856
987 changed files with 671143 additions and 783083 deletions

View File

@@ -0,0 +1,126 @@
@echo off
setlocal
iff "%1" == "both" then
shift
call .make debug %$ & if %? != 0 quit $?
call .make hybrid %$ & if %? != 0 quit $?
quit
elseiff "%1" == "both-uni" then
shift
call .make debug-uni %$ & if %? != 0 quit $?
call .make hybrid-uni %$ & if %? != 0 quit $?
quit
elseiff "%1" == "both-hybrid" then
shift
call .make hybrid %$ & if %? != 0 quit $?
call .make hybrid-uni %$ & if %? != 0 quit $?
quit
elseiff "%1" == "all" then
shift
call .make debug %$ & if %? != 0 quit $?
call .make hybrid %$ & if %? != 0 quit $?
call .make debug-uni %$ & if %? != 0 quit $?
call .make hybrid-uni %$ & if %? != 0 quit $?
quit
elseiff "%1" == "debug" then
set BUILD_TYPE=%1
set WXLIBDIR=mswd
shift
elseiff "%1" == "hybrid" then
set BUILD_TYPE=%1
set WXLIBDIR=mswh
shift
elseiff "%1" == "release" then
set BUILD_TYPE=%1
set WXLIBDIR=msw
shift
elseiff "%1" == "debug-uni" then
set BUILD_TYPE=%1
set WXLIBDIR=mswud
shift
elseiff "%1" == "hybrid-uni" then
set BUILD_TYPE=%1
set WXLIBDIR=mswuh
shift
elseiff "%1" == "release-uni" then
set BUILD_TYPE=%1
set WXLIBDIR=mswu
shift
else
echo Invalid build type: "%1"
quit 1
endiff
echo ------------------
echo cd %WXWIN%\build\msw
cd %WXWIN%\build\msw
nmake -f .makesetup.mk %WXWIN%\lib\vc_dll\%WXLIBDIR%\wx\setup.h
echo ------------------
echo cd %WXWIN%\build\msw
cd %WXWIN%\build\msw
call %WXWIN%\build\msw\.mymake %BUILD_TYPE% %$
if %? != 0 goto done
echo ------------------
echo cd ..\..\contrib\build\gizmos
cd ..\..\contrib\build\gizmos
call %WXWIN%\build\msw\.mymake %BUILD_TYPE% %$
if %? != 0 goto done
cd -
echo ------------------
echo cd ..\..\contrib\build\xrc
cd ..\..\contrib\build\xrc
call %WXWIN%\build\msw\.mymake %BUILD_TYPE% %$
if %? != 0 goto done
cd -
echo ------------------
echo cd ..\..\contrib\build\stc
cd ..\..\contrib\build\stc
call %WXWIN%\build\msw\.mymake %BUILD_TYPE% %$
if %? != 0 goto done
cd -
echo ------------------
echo cd ..\..\contrib\build\ogl
cd ..\..\contrib\build\ogl
call %WXWIN%\build\msw\.mymake %BUILD_TYPE% CXX="cl -DwxUSE_DEPRECATED=0" %$
if %? != 0 goto done
cd -
@echo -----------------
@echo -- SUCCESS! --
@echo -----------------
REM copy DLLs to a dir on the PATH
copy /U %WXWIN%\lib\vc_dll\*.dll %WXWIN%\BIN
copy /U %WXWIN%\lib\vc_dll\*.pdb %WXWIN%\BIN
quit 0
:done
@echo -----------------
@echo -- ERROR! --
@echo -----------------
quit %?

View File

@@ -0,0 +1,50 @@
SRC=..\..\include\wx\msw\setup.h
DIR=$(WXWIN)\lib
FILES= $(DIR)\vc_dll\mswd\wx\setup.h \
$(DIR)\vc_dll\mswh\wx\setup.h \
$(DIR)\vc_dll\mswud\wx\setup.h \
$(DIR)\vc_dll\mswuh\wx\setup.h \
$(DIR)\vc_dll\msw\wx\setup.h \
$(DIR)\vc_dll\mswu\wx\setup.h \
UNI_SEDCMD=sed "s!wxUSE_UNICODE 0!wxUSE_UNICODE 1!g;s!wxUSE_UNICODE_MSLU 0!wxUSE_UNICODE_MSLU 1!g"
HYB_SEDCMD=sed "s!wxUSE_MEMORY_TRACING 1!wxUSE_MEMORY_TRACING 0!g;s!wxUSE_DEBUG_CONTEXT 1!wxUSE_DEBUG_CONTEXT 0!g"
all : $(FILES)
# debug
$(DIR)\vc_dll\mswd\wx\setup.h : $(SRC) .makesetup.mk
-if not exist $(DIR)\vc_dll\mswd\wx mkdir /s $(DIR)\vc_dll\mswd\wx
cat $(SRC) > $@
# hybrid
$(DIR)\vc_dll\mswh\wx\setup.h : $(SRC) .makesetup.mk
-if not exist $(DIR)\vc_dll\mswh\wx mkdir /s $(DIR)\vc_dll\mswh\wx
cat $(SRC) | $(HYB_SEDCMD) > $@
# debug-uni
$(DIR)\vc_dll\mswud\wx\setup.h : $(SRC) .makesetup.mk
-if not exist $(DIR)\vc_dll\mswud\wx mkdir /s $(DIR)\vc_dll\mswud\wx
cat $(SRC) | $(UNI_SEDCMD) > $@
# hybrid-uni
$(DIR)\vc_dll\mswuh\wx\setup.h : $(SRC) .makesetup.mk
-if not exist $(DIR)\vc_dll\mswuh\wx mkdir /s $(DIR)\vc_dll\mswuh\wx
cat $(SRC) | $(UNI_SEDCMD) | $(HYB_SEDCMD) > $@
# release
$(DIR)\vc_dll\msw\wx\setup.h : $(SRC) .makesetup.mk
-if not exist $(DIR)\vc_dll\msw\wx mkdir /s $(DIR)\vc_dll\msw\wx
cat $(SRC) > $@
# release-uni
$(DIR)\vc_dll\mswu\wx\setup.h : $(SRC) .makesetup.mk
-if not exist $(DIR)\vc_dll\mswu\wx mkdir /s $(DIR)\vc_dll\mswu\wx
cat $(SRC) | $(UNI_SEDCMD) > $@

View File

@@ -0,0 +1,53 @@
@echo off
setlocal
set COMMON_FLAGS=OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1
set HYBRID_FLAGS=DEBUG_FLAG=1 CXXFLAGS=/D__NO_VC_CRTDBG__ WXDEBUGFLAG=h
set MAKE_FLAGS=%COMMON_FLAGS%
REM set flags based on build type if given
iff "%1" == "debug" then
set MAKE_FLAGS=%COMMON_FLAGS% BUILD=debug UNICODE=0 MSLU=0
shift
elseiff "%1" == "hybrid" then
set MAKE_FLAGS=%COMMON_FLAGS% BUILD=release %HYBRID_FLAGS% UNICODE=0 MSLU=0
shift
elseiff "%1" == "release" then
set MAKE_FLAGS=%COMMON_FLAGS% BUILD=release UNICODE=0 MSLU=0
shift
elseiff "%1" == "debug-uni" then
set MAKE_FLAGS=%COMMON_FLAGS% BUILD=debug UNICODE=1 MSLU=1
shift
elseiff "%1" == "hybrid-uni" then
set MAKE_FLAGS=%COMMON_FLAGS% BUILD=release %HYBRID_FLAGS% UNICODE=1 MSLU=1
shift
elseiff "%1" == "release-uni" then
set MAKE_FLAGS=%COMMON_FLAGS% BUILD=release UNICODE=1 MSLU=1
shift
else
echo "----------------------------------------------"
echo " Build type not specified"
echo " debug"
echo " hybrid"
echo " release"
echo " debug-uni"
echo " hybrid-uni"
echo " release-uni"
echo "----------------------------------------------"
endiff
REM now run nmake, echoing the command-line first
echo nmake -f makefile.vc %MAKE_FLAGS% %$
nmake -f makefile.vc %MAKE_FLAGS% %$
REM quit with nmake's exit code
@quit %?