Ticket #1: bldprogs.2.diff

File bldprogs.2.diff, 1.3 KB (added by Valery V. Sedletski, 9 years ago)

  • \src\bldprogs/Makefile.kmk 

    diff -urN vbox-trunk-bk\src\bldprogs/Makefile.kmk vbox-trunk\src\bldprogs/Makefile.kmk
    old new  
    5959 VBoxTpG_SOURCES = \
    6060        VBoxTpG.cpp \
    6161        scmstream.cpp
     62 VBoxCPP_LIBS.os2 += \
     63        c_omf386
    6264endif
    6365
    6466ifeq ($(KBUILD_TARGET),win)

  • \src\bldprogs/VBoxTpG.cpp 

    diff -urN vbox-trunk-bk\src\bldprogs/VBoxTpG.cpp vbox-trunk\src\bldprogs/VBoxTpG.cpp
    old new  
    156156static const char           g_szAssemblerFmtVal64[]     = "macho64";
    157157static const char           g_szAssemblerOsDef[]        = "RT_OS_DARWIN";
    158158#elif defined(RT_OS_OS2)
    159 static const char          *pszAssembler                = "nasm.exe";
    160 static const char          *pszAssemblerFmtOpt          = "-f";
     159static const char           *g_pszAssembler                = "nasm.exe";
     160static const char           *g_pszAssemblerFmtOpt          = "-f";
    161161static const char           g_szAssemblerFmtVal32[]     = "obj";
    162162static const char           g_szAssemblerFmtVal64[]     = "elf64";
    163163static const char           g_szAssemblerOsDef[]        = "RT_OS_OS2";