Got rid of the BIN dir

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-03-18 22:05:24 +00:00
parent b2bacf13e3
commit 312cca179a
7 changed files with 54 additions and 44 deletions

View File

@@ -4,28 +4,28 @@ setlocal
iff "%1" == "both" then
shift
call .make debug %$ & if %? != 0 quit $?
call .make hybrid %$ & if %? != 0 quit $?
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 $?
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 $?
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 $?
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
@@ -113,8 +113,8 @@ cd -
@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
REM copy /U %WXWIN%\lib\vc_dll\*.dll %WXWIN%\BIN
REM copy /U %WXWIN%\lib\vc_dll\*.pdb %WXWIN%\BIN
quit 0

View File

@@ -0,0 +1,20 @@
nmake -f makefile.vc BUILD=release %$
pushd %WXWIN%\contrib\build\xrc
nmake -f makefile.vc BUILD=release %$
pushd %WXWIN%\contrib\utils\wxrc
nmake -f makefile.vc BUILD=release %$
copy vc_msw\wxrc.exe %WXWIN%\lib\vc_dll\wxrc.exe
pushd %WXWIN%\utils\tex2rtf\src
nmake -f makefile.vc BUILD=release %$
copy vc_msw\tex2rtf.exe %WXWIN%\lib\vc_dll\tex2rtf.exe
popd
popd
popd

View File

@@ -1,5 +1,5 @@
SRC=..\..\include\wx\msw\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 \
@@ -26,6 +26,11 @@ $(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) > $@
# 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) > $@
# 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
@@ -36,11 +41,6 @@ $(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