no need to build separate xrc lib anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -79,12 +79,8 @@ fi
|
||||
|
||||
|
||||
echo ------------------
|
||||
WXWIN=`cygpath -m $WXWIN`
|
||||
echo cd $WXWIN/build/msw
|
||||
cd $WXWIN/build/msw
|
||||
|
||||
echo mkdir -p $WXWIN/lib/vc_dll/$WXLIBDIR/wx
|
||||
mkdir -p $WXWIN/lib/vc_dll/$WXLIBDIR/wx
|
||||
echo nmake -f .makesetup.mk $WXWIN/lib/vc_dll/$WXLIBDIR/wx/setup.h
|
||||
nmake -f .makesetup.mk $WXWIN/lib/vc_dll/$WXLIBDIR/wx/setup.h
|
||||
|
||||
|
||||
@@ -103,12 +99,12 @@ if [ ! $? = 0 ]; then error; fi
|
||||
cd -
|
||||
|
||||
|
||||
echo ------------------
|
||||
echo cd ../../contrib/build/xrc
|
||||
cd ../../contrib/build/xrc
|
||||
$WXWIN/build/msw/.mymake $BUILD_TYPE $@
|
||||
if [ ! $? = 0 ]; then error; fi
|
||||
cd -
|
||||
# #echo ------------------
|
||||
# echo cd ../../contrib/build/xrc
|
||||
# cd ../../contrib/build/xrc
|
||||
# $WXWIN/build/msw/.mymake $BUILD_TYPE $@
|
||||
# if [ ! $? = 0 ]; then error; fi
|
||||
# cd -
|
||||
|
||||
|
||||
echo ------------------
|
||||
@@ -131,6 +127,9 @@ cd -
|
||||
echo -----------------
|
||||
echo -- SUCCESS! --
|
||||
echo -----------------
|
||||
# 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
|
||||
exit 0
|
||||
|
||||
|
||||
|
@@ -84,12 +84,12 @@ call %WXWIN%\build\msw\.mymake.btm %BUILD_TYPE% %$
|
||||
if %? != 0 goto done
|
||||
cd -
|
||||
|
||||
echo ------------------
|
||||
echo cd ..\..\contrib\build\xrc
|
||||
cd ..\..\contrib\build\xrc
|
||||
call %WXWIN%\build\msw\.mymake.btm %BUILD_TYPE% %$
|
||||
if %? != 0 goto done
|
||||
cd -
|
||||
REM echo ------------------
|
||||
REM echo cd ..\..\contrib\build\xrc
|
||||
REM cd ..\..\contrib\build\xrc
|
||||
REM call %WXWIN%\build\msw\.mymake.btm %BUILD_TYPE% %$
|
||||
REM if %? != 0 goto done
|
||||
REM cd -
|
||||
|
||||
|
||||
echo ------------------
|
||||
|
@@ -1,19 +1,18 @@
|
||||
#!/bin/bash
|
||||
#! /bin/bash
|
||||
|
||||
mkdir -p $WXWIN/lib/vc_lib/msw/wx
|
||||
nmake -f .makesetup.mk $WXWIN/lib/vc_lib/msw/wx/setup.h
|
||||
nmake -f makefile.vc BUILD=release $@
|
||||
|
||||
cd $WXWIN/contrib/build/xrc
|
||||
nmake -f makefile.vc BUILD=release $@
|
||||
|
||||
cd $WXWIN/contrib/utils/wxrc
|
||||
nmake -f makefile.vc BUILD=release $@
|
||||
cp vc_msw/wxrc.exe $WXWIN/lib/vc_dll/wxrc.exe
|
||||
|
||||
|
||||
# cd $WXWIN/utils/tex2rtf/src
|
||||
# cd $WXWIN/contrib/build/xrc
|
||||
# nmake -f makefile.vc BUILD=release $@
|
||||
# cp vc_msw/tex2rtf.exe $WXWIN/lib/vc_dll/tex2rtf.exe
|
||||
|
||||
# cd $WXWIN/utils/wxrc
|
||||
# nmake -f makefile.vc BUILD=release $@
|
||||
# cp vc_msw/wxrc.exe $WXWIN/lib/vc_dll/wxrc.exe
|
||||
|
||||
|
||||
cd $WXWIN/utils/tex2rtf/src
|
||||
echo nmake -f makefile.vc BUILD=release $@
|
||||
echo cp vc_msw/tex2rtf.exe $WXWIN/lib/vc_dll/tex2rtf.exe
|
||||
|
||||
|
||||
|
@@ -1,10 +1,10 @@
|
||||
|
||||
nmake -f makefile.vc BUILD=release %$
|
||||
|
||||
pushd %WXWIN%\contrib\build\xrc
|
||||
nmake -f makefile.vc BUILD=release %$
|
||||
REM pushd %WXWIN%\contrib\build\xrc
|
||||
REM nmake -f makefile.vc BUILD=release %$
|
||||
|
||||
pushd %WXWIN%\contrib\utils\wxrc
|
||||
pushd %WXWIN%\utils\wxrc
|
||||
nmake -f makefile.vc BUILD=release %$
|
||||
copy vc_msw\wxrc.exe %WXWIN%\lib\vc_dll\wxrc.exe
|
||||
|
||||
@@ -15,6 +15,6 @@ copy vc_msw\tex2rtf.exe %WXWIN%\lib\vc_dll\tex2rtf.exe
|
||||
|
||||
popd
|
||||
popd
|
||||
popd
|
||||
|
||||
|
||||
|
||||
|
@@ -1,14 +1,14 @@
|
||||
|
||||
SRC=$(WXWIN)/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 \
|
||||
SRC=$(WXWIN)\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 \
|
||||
\
|
||||
$(DIR)/vc_lib/msw/wx/setup.h \
|
||||
$(DIR)\vc_lib\msw\wx\setup.h \
|
||||
|
||||
|
||||
UNI_SEDCMD=sed "s!wxUSE_UNICODE 0!wxUSE_UNICODE 1!g;s!wxUSE_UNICODE_MSLU 0!wxUSE_UNICODE_MSLU 1!g"
|
||||
@@ -21,37 +21,37 @@ test :
|
||||
|
||||
# debug
|
||||
$(DIR)\vc_dll\mswd\wx\setup.h : $(SRC) .makesetup.mk
|
||||
cat $(SRC) > setup.h.tmp
|
||||
mv setup.h.tmp $@
|
||||
-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
|
||||
cat $(SRC) | $(HYB_SEDCMD) > setup.h.tmp
|
||||
mv setup.h.tmp $@
|
||||
-if not exist $(DIR)\vc_dll\mswh\wx mkdir /s $(DIR)\vc_dll\mswh\wx
|
||||
cat $(SRC) | $(HYB_SEDCMD) > $@
|
||||
|
||||
# release
|
||||
$(DIR)\vc_dll\msw\wx\setup.h : $(SRC) .makesetup.mk
|
||||
cat $(SRC) > setup.h.tmp
|
||||
mv setup.h.tmp $@
|
||||
-if not exist $(DIR)\vc_dll\msw\wx mkdir /s $(DIR)\vc_dll\msw\wx
|
||||
cat $(SRC) > $@
|
||||
|
||||
$(DIR)\vc_lib\msw\wx\setup.h : $(SRC) .makesetup.mk
|
||||
cat $(SRC) > setup.h.tmp
|
||||
mv setup.h.tmp $@
|
||||
-if not exist $(DIR)\vc_lib\msw\wx mkdir /s $(DIR)\vc_lib\msw\wx
|
||||
cat $(SRC) > $@
|
||||
|
||||
# debug-uni
|
||||
$(DIR)\vc_dll\mswud\wx\setup.h : $(SRC) .makesetup.mk
|
||||
cat $(SRC) | $(UNI_SEDCMD) > setup.h.tmp
|
||||
mv setup.h.tmp $@
|
||||
-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
|
||||
cat $(SRC) | $(UNI_SEDCMD) | $(HYB_SEDCMD) > setup.h.tmp
|
||||
mv setup.h.tmp $@
|
||||
-if not exist $(DIR)\vc_dll\mswuh\wx mkdir /s $(DIR)\vc_dll\mswuh\wx
|
||||
cat $(SRC) | $(UNI_SEDCMD) | $(HYB_SEDCMD) > $@
|
||||
|
||||
# release-uni
|
||||
$(DIR)\vc_dll\mswu\wx\setup.h : $(SRC) .makesetup.mk
|
||||
cat $(SRC) | $(UNI_SEDCMD) > setup.h.tmp
|
||||
mv setup.h.tmp $@
|
||||
-if not exist $(DIR)\vc_dll\mswu\wx mkdir /s $(DIR)\vc_dll\mswu\wx
|
||||
cat $(SRC) | $(UNI_SEDCMD) > $@
|
||||
|
||||
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
#!/bin/bash
|
||||
#! /bin/bash
|
||||
|
||||
COMMON_FLAGS="OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1"
|
||||
HYBRID_FLAGS="DEBUG_FLAG=1 CXXFLAGS=/D__NO_VC_CRTDBG__ WXDEBUGFLAG=h"
|
||||
|
Reference in New Issue
Block a user