ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-24 05:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated r2 (#280)

Browse Source 
* Updated r2
This commit is contained in:
xarkes 2018-01-23 19:43:49 +01:00 committed by GitHub
parent f71c21ae10
commit 33955f9516
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -26,7 +26,7 @@ environment:
- BITS: 64 - BITS: 64
before_build: before_build:
- cmd: prepare_r2.bat - cmd: prepare_r2.bat %BITS%
# Build config # Build config
build_script: build_script:

23
prepare_r2.bat
View File

@ -2,7 +2,7 @@
SETLOCAL ENABLEDELAYEDEXPANSION SETLOCAL ENABLEDELAYEDEXPANSION
SET BADARG=1 SET BADARG=1
FOR %%i IN ("" "32" "64") DO (IF "%1" == %%i SET BADARG=) FOR %%i IN ("32" "64") DO (IF "%1" == %%i SET BADARG=)
IF DEFINED BADARG ( IF DEFINED BADARG (
ECHO Usage: %0 [32^|64] ECHO Usage: %0 [32^|64]
EXIT /B EXIT /B
@ -32,37 +32,30 @@ IF NOT EXIST ninja.exe (
IF NOT "%BITS%" == "32" ( IF NOT "%BITS%" == "32" (
SET VARSALL=x64 SET VARSALL=x64
SET BI=64
CALL :BUILD CALL :BUILD
IF !ERRORLEVEL! NEQ 0 EXIT /B IF !ERRORLEVEL! NEQ 0 EXIT /B
) )
IF NOT "%BITS%" == "64" ( IF NOT "%BITS%" == "64" (
SET VARSALL=x86 SET VARSALL=x86
SET BI=32
CALL :BUILD CALL :BUILD
IF !ERRORLEVEL! NEQ 0 EXIT /B IF !ERRORLEVEL! NEQ 0 EXIT /B
) )
ECHO Copying relevant files in cutter_win32 ECHO Copying relevant files in cutter_win32
IF "%BITS%" == "64" ( XCOPY /S /Y dist%BITS%\include\libr cutter_win32\radare2\include\libr\
XCOPY /S /Y dist64\include\libr cutter_win32\radare2\include\libr\
) ELSE (
XCOPY /S /Y dist32\include\libr cutter_win32\radare2\include\libr\
)
EXIT /B EXIT /B
:BUILD :BUILD
ECHO Building radare2 (%VARSALL%) ECHO Building radare2 (%VARSALL%)
CD radare2 CD radare2
git clean -xfd git clean -xfd
RMDIR /s /q ..\dist%BI% RMDIR /s /q ..\dist%BITS%
CALL "%VSVARSALLPATH%" %VARSALL% CALL "%VSVARSALLPATH%" %VARSALL%
python sys\meson.py --release --shared --prefix="%CD%" python sys\meson.py --release --prefix="%CD%" --install=..\dist%BITS% --shared --copylib
IF !ERRORLEVEL! NEQ 0 EXIT /B 1 IF !ERRORLEVEL! NEQ 0 EXIT /B 1
CALL sys\meson_install.bat --with-static ..\dist%BI% COPY /Y build\r_userconf.h ..\dist%BITS%\include\libr\
COPY /Y build\r_userconf.h ..\dist%BI%\include\libr\ COPY /Y build\r_version.h ..\dist%BITS%\include\libr\
COPY /Y build\r_version.h ..\dist%BI%\include\libr\ COPY /Y build\shlr\liblibr2sdb.a ..\dist%BITS%\r_sdb.lib
COPY /Y build\shlr\liblibr2sdb.a ..\dist%BI%\r_sdb.lib
CD .. CD ..
COPY /Y dist%BI%\*.lib cutter_win32\radare2\lib%BI%\ COPY /Y dist%BITS%\*.lib cutter_win32\radare2\lib%BITS%\
EXIT /B 0 EXIT /B 0

2
radare2

@ -1 +1 @@
Subproject commit 27f4c38292f7e8e51a1049362d4f01ac7bb0ee73 Subproject commit 788db85562ddcb398ac71a98f02c361f3df5ab04