meson.build fixes to build with MSVC

binr/rabin2/meson.build

@@ -1,8 +1,13 @@
 
 executable('rabin2', 'rabin2.c',
   include_directories: include_directories([
-    '../../libr/include'
+    '../../libr/include',
+	platform_binrinc
   ]),
-  link_with: [r_util, r_cons, r_bin, r_config, r_hash, r_io, r_crypto, r_core],
+  link_with: [r_util, r_cons, r_config, r_hash, r_io, r_crypto, r_core],
+  objects: [
+    r_sdb.extract_all_objects(),
+	r_bin.extract_all_objects()
+  ],    
   install: true
 )

binr/radare2/meson.build

@@ -1,6 +1,7 @@
 executable('radare2', 'radare2.c',
   include_directories: include_directories([
-    '../../libr/include'
+    '../../libr/include',
+	platform_binrinc
   ]),
   link_with: [r_util, r_socket, r_core],
   install: true

binr/ragg2/meson.build

@@ -1,7 +1,8 @@
 
 executable('ragg2', 'ragg2.c',
   include_directories: include_directories([
-    '../../libr/include'
+    '../../libr/include',
+	platform_binrinc
   ]),
   link_with: [r_util, r_egg, r_bin],
   install: true

binr/ragg2/ragg2.c

@@ -96,7 +96,11 @@ static int openfile (const char *f, int x) {
 #if __UNIX__
 	if (x) fchmod (fd, 0755);
 #endif
+#if _MSC_VER
+	_chsize (fd, 0);
+#else
 	ftruncate (fd, 0);
+#endif
 	close (1);
 	dup2 (fd, 1);
 	return fd;

binr/rahash2/meson.build

@@ -1,7 +1,8 @@
 
 executable('rahash2', 'rahash2.c',
   include_directories: include_directories([
-    '../../libr/include'
+    '../../libr/include',
+	platform_binrinc
   ]),
   link_with: [r_util, r_hash, r_io, r_crypto],
   install: true

binr/rarun2/meson.build

@@ -1,6 +1,7 @@
 executable('rarun2', 'rarun2.c',
   include_directories: include_directories([
-    '../../libr/include'
+    '../../libr/include',
+	platform_binrinc
   ]),
   link_with: [r_util, r_socket],
   install: true

binr/rasm2/meson.build

@@ -1,7 +1,9 @@
 
 executable('rasm2', 'rasm2.c',
   include_directories: include_directories([
-    '../../libr/include'
+    '../../libr/include',
+	platform_binrinc
+
   ]),
   link_with: [r_util, r_asm, r_anal],
   install: true

binr/rax2/meson.build

@@ -1,7 +1,8 @@
 
 executable('rax2', 'rax2.c',
   include_directories: include_directories([
-    '../../libr/include'
+    '../../libr/include',
+	platform_binrinc
   ]),
   link_with: [r_util],
   install: true

libr/anal/meson.build

@@ -86,9 +86,15 @@ r_anal = shared_library('r_anal', files,
     '../asm/arch/include/',
     'arch/gb',
     '../../shlr/capstone/include',
-    '../../shlr'
+    '../../shlr',
+	platform_librinc
   ]),
   c_args: ['-DCORELIB'],
-  link_with: [r_util, r_reg, r_syscall, r_search, r_cons, capstone],
+  link_with: [r_util, r_reg, r_syscall, r_search, r_cons],
+  objects: [
+    capstone.extract_all_objects(),
+	r_sdb.extract_all_objects(),
+	spp.extract_all_objects(),
+  ],
   install: true
 )

libr/asm/meson.build

@@ -4,8 +4,12 @@ spp_files=[
 
 spp = static_library('spp', spp_files,
   include_directories: include_directories([
-    '../../shlr/spp/'
-  ]))
+    '../../shlr/spp/',
+	'../../libr/include',
+	platform_librinc
+  ]),
+  c_args: ['-DHAVE_R_UTIL']
+  )
 
 cs_files=[
 '../../shlr/capstone//arch/AArch64/AArch64BaseInfo.c',
@@ -72,7 +76,7 @@ files=[
 'p/asm_arc.c',
 'p/asm_arm_as.c',
 'p/asm_arm_cs.c',
-#'p/asm_arm_gnu.c',
+'p/asm_arm_gnu.c',
 'p/asm_arm_winedbg.c',
 'p/asm_avr.c',
 'p/asm_bf.c',
@@ -89,7 +93,7 @@ files=[
 'p/asm_i8080.c',
 #'p/asm_java.c',
 'p/asm_lanai_gnu.c',
-#'p/asm_lh5801.c',
+'p/asm_lh5801.c',
 'p/asm_lm32.c',
 'p/asm_m68k_cs.c',
 'p/asm_malbolge.c',
@@ -101,7 +105,7 @@ files=[
 'p/asm_pic18c.c',
 'p/asm_ppc_cs.c',
 'p/asm_ppc_gnu.c',
-#'p/asm_propeller.c',
+'p/asm_propeller.c',
 'p/asm_riscv.c',
 'p/asm_rsp.c',
 'p/asm_sh.c',
@@ -110,10 +114,10 @@ files=[
 'p/asm_sparc_gnu.c',
 'p/asm_spc700.c',
 'p/asm_sysz.c',
-#'p/asm_tms320.c',
-#'p/asm_tms320c64x.c',
+'p/asm_tms320.c',
+'p/asm_tms320c64x.c',
 'p/asm_tricore.c',
-#'p/asm_v810.c',
+'p/asm_v810.c',
 'p/asm_v850.c',
 'p/asm_vax.c',
 'p/asm_wasm.c',
@@ -142,10 +146,10 @@ files=[
 'arch//arm/gnu/arm-dis.c',
 'arch//arm/gnu/floatformat.c',
 'arch//arm/winedbg/be_arm.c',
-#'arch//avr/avr_disasm.c',
+'arch//avr/avr_disasm.c',
 #'arch//avr/avr_instructionset.c',
 'arch//avr/disasm.c',
-#'arch//avr/format.c',
+'arch//avr/format.c',
 'arch//cr16/cr16_disas.c',
 'arch//cris/gnu/cris-dis.c',
 'arch//cris/gnu/cris-opc.c',
@@ -219,12 +223,15 @@ r_asm = shared_library('r_asm', files,
     'arch/propeller',
     'arch/ebc',
     'arch/cr16',
-    'arch/8051'
+    'arch/8051',
+	platform_librinc
   ]),
   c_args: ['-DCORELIB'],
-  link_with: [r_util, r_syscall, r_parse, r_lang, spp],
+  link_with: [r_util, r_syscall, r_parse, r_lang, r_flag,r_socket],
   objects: [
-    capstone.extract_all_objects()
+    capstone.extract_all_objects(),
+	r_sdb.extract_all_objects(),
+	spp.extract_all_objects(),
   ],
   install: true
 )

libr/bin/meson.build

@@ -105,8 +105,16 @@ files=[
 ]
 
 r_bin = shared_library('r_bin', files,
-  include_directories: include_directories(['../include','mangling', 'format']),
+  include_directories: include_directories([
+  '../include',
+  'mangling',
+  'format',
+  platform_librinc
+  ]),
   c_args: ['-DCORELIB'],
   link_with: [r_util, r_io, r_socket, r_magic],
+  objects: [
+    r_sdb.extract_all_objects()
+  ],
   install: true
 )

libr/bin/pdb/pdb_downloader.h

@@ -1,6 +1,6 @@
 #ifndef PDB_DOWNLOADER_H
 #define PDB_DOWNLOADER_H
-
+#include <r_types.h>
 #ifdef __cplusplus
 extern "C" {
 #endif

libr/bp/meson.build

@@ -13,7 +13,10 @@ files=[
 ]
 
 r_bp = shared_library('r_bp', files,
-  include_directories: include_directories(['../include']),
+  include_directories: include_directories([
+  '../include'],
+  platform_librinc
+  ),
   c_args: ['-DCORELIB'],
   link_with: [r_util],
   install: true

libr/config/meson.build

@@ -4,7 +4,13 @@ files=[
 ]
 
 r_config = shared_library('r_config', files,
-  include_directories: include_directories(['../include']),
+  include_directories: include_directories([
+  '../include',
+  platform_librinc
+  ]),
   link_with: [r_util],
+  objects: [
+    r_sdb.extract_all_objects()
+  ],
   install: true
 )

libr/cons/meson.build

@@ -19,8 +19,14 @@ files=[
 ]
 
 r_cons = shared_library('r_cons', files,
-  include_directories: include_directories(['../include']),
+  include_directories: include_directories([
+  '../include'],
+  platform_librinc
+  ),
   link_with: [r_util],
+  objects: [
+    r_sdb.extract_all_objects()
+  ],
   install: true
 )
 

libr/core/meson.build

@@ -60,8 +60,15 @@ files=[
 ]
 
 r_core = shared_library('r_core', files,
-  include_directories: include_directories(['../include','../../shlr']),
+  include_directories: include_directories([
+  '../include','../../shlr',
+  platform_librinc
+  ]),
   c_args: ['-DCORELIB'],
   link_with: [r_util, r_reg, r_syscall, r_search, r_cons, r_anal, r_socket, r_io, r_fs, r_lang, r_hash, r_flag, r_parse, r_egg, r_debug, r_magic, r_crypto, r_config, r_bin],
+  objects: [
+    r_sdb.extract_all_objects(),
+	spp.extract_all_objects()
+  ],  
   install: true
 )

libr/crypto/meson.build

@@ -19,7 +19,10 @@ files=[
 ]
 
 r_crypto = shared_library('r_crypto', files,
-  include_directories: include_directories(['../include']),
+  include_directories: include_directories([
+  '../include'],
+  platform_librinc
+  ),
   link_with: [r_util],
   c_args : '-DCORELIB=1',
   install: true

libr/debug/meson.build

@@ -24,7 +24,7 @@ files=[
 #'p/native/drx.c',
 #'p/native/maps/darwin.c',
 #'p/native/maps/windows.c',
-'p/native/procfs.c',
+#'p/native/procfs.c',  # we need check to add this file to non win build
 #'p/native/reg.c',
 #'p/native/w32.c',
 #'p/native/windows/windows_debug.c',
@@ -54,8 +54,15 @@ if host_os == 'darwin'
 endif
 
 r_debug = shared_library('r_debug', files,
-  include_directories: include_directories(['../include', '../bin/format/elf']),
+  include_directories: include_directories([
+  '../include', 
+  '../bin/format/elf',
+  platform_librinc
+  ]),
   c_args: ['-DCORELIB'],
   link_with: [r_util, r_hash, r_reg, r_syscall, r_anal, r_flag, r_io, r_bp, r_search, r_cons, r_lang],
+  objects: [
+    r_sdb.extract_all_objects(),
+  ],
   install: true
 )

libr/egg/meson.build

@@ -15,8 +15,14 @@ files=[
 ]
 
 r_egg = shared_library('r_egg', files,
-  include_directories: include_directories(['../include']),
+  include_directories: include_directories([
+  '../include',
+  platform_librinc
+  ]),
   link_with: [r_util, r_asm],
+  objects: [
+    r_sdb.extract_all_objects(),
+  ],
   install: true
 )
 

libr/flag/meson.build

@@ -7,8 +7,14 @@ files=[
 ]
 
 r_flag = shared_library('r_flag', files,
-  include_directories: include_directories(['../include']),
+  include_directories: include_directories([
+  '../include',
+  platform_librinc
+  ]),
   link_with: [r_util],
+  objects: [
+    r_sdb.extract_all_objects()
+  ],  
   install: true
 )
 

libr/fs/meson.build

@@ -54,7 +54,8 @@ grub = static_library('grub', grub_files,
   include_directories: include_directories([
     '../../libr/include',
     '../../shlr/',
-    '../../shlr/grub/include'
+    '../../shlr/grub/include',
+	platform_librinc
   ])
 )
 
@@ -87,7 +88,8 @@ files=[
 r_fs = shared_library('r_fs', files,
   include_directories: include_directories([
     '../include',
-    '../../shlr/grub/include'
+    '../../shlr/grub/include',
+	platform_librinc
   ]),
   link_with: [r_util, grub],
   install: true

libr/hash/meson.build

@@ -16,7 +16,10 @@ files=[
 ]
 
 r_hash = shared_library('r_hash', files,
-  include_directories: include_directories(['../include']),
+  include_directories: include_directories([
+  '../include'],
+  platform_librinc
+  ),
   dependencies: [mth],
   link_with: [r_util],
   install: true

libr/include/r_types.h

@@ -86,6 +86,7 @@
   #define _X86_
   #define strcasecmp stricmp
   #define strncasecmp strnicmp
+  #define __WINDOWS__ 1
 #endif
 
 #if defined(EMSCRIPTEN) || defined(__linux__) || defined(__APPLE__) || defined(__GNU__) || defined(__ANDROID__) || defined(__QNX__) || defined(__sun)