Merge branch 'master' of https://github.com/VARCem/VARCem
# Conflicts: # src/win/VARCem.rpp
This commit is contained in:
@@ -59,11 +59,7 @@ PREAMBLE #include "../resource.h"
|
||||
#define __HEX4(x) 0x ## x
|
||||
#define __INCL(a,b,c) _TEXT_(../../ui/lang/ ## a ## - ## b ## . ## c)
|
||||
#define __DLLNM(a,b,c) _TEXT_(a ## - ## b ## . ## c)
|
||||
#ifdef _MSC_VER
|
||||
# define __BLKNM(id) _TEXT_(id ## 04b0)
|
||||
#else
|
||||
# define __BLKNM(id) _TEXT_(id ## 04e4)
|
||||
#endf
|
||||
#define __BLKNM(id) _TEXT_(id ## 04b0)
|
||||
#define INCLUDE(l) __INCL(VARCem, l, str)
|
||||
#define DLLNAME(l) __DLLNM(VARCem, l, dll)
|
||||
#define BLOCKNAME(l) __BLKNM(l)
|
||||
|
||||
Reference in New Issue
Block a user