Add proper support for Borland compilers (Borland needs section names to be prefixed with an underscore, and it needs OMF object files.)
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@1328 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
@@ -3,12 +3,15 @@ if(NOT DEFINED NASM)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(SIMD_X86_64)
|
if(SIMD_X86_64)
|
||||||
set(NAFLAGS -fwin64 -DWIN64 -D__x86_64__ -I${CMAKE_SOURCE_DIR}/win/
|
set(NAFLAGS -fwin64 -DWIN64 -D__x86_64__)
|
||||||
-I${CMAKE_CURRENT_SOURCE_DIR}/)
|
|
||||||
else()
|
else()
|
||||||
set(NAFLAGS -fwin32 -DWIN32 -I${CMAKE_SOURCE_DIR}/win/
|
if(BORLAND)
|
||||||
-I${CMAKE_CURRENT_SOURCE_DIR}/)
|
set(NAFLAGS -fobj -DOBJ32)
|
||||||
|
else()
|
||||||
|
set(NAFLAGS -fwin32 -DWIN32)
|
||||||
endif()
|
endif()
|
||||||
|
endif()
|
||||||
|
set(NAFLAGS ${NAFLAGS} -I${CMAKE_SOURCE_DIR}/win/ -I${CMAKE_CURRENT_SOURCE_DIR}/)
|
||||||
|
|
||||||
# This only works if building from the command line. There is currently no way
|
# This only works if building from the command line. There is currently no way
|
||||||
# to set a variable's value based on the build type when using the MSVC IDE.
|
# to set a variable's value based on the build type when using the MSVC IDE.
|
||||||
|
|||||||
@@ -65,8 +65,8 @@
|
|||||||
|
|
||||||
; -- segment definition --
|
; -- segment definition --
|
||||||
;
|
;
|
||||||
%define SEG_TEXT .text align=16 public use32 class=CODE
|
%define SEG_TEXT _text align=16 public use32 class=CODE
|
||||||
%define SEG_CONST .data align=16 public use32 class=DATA
|
%define SEG_CONST _data align=16 public use32 class=DATA
|
||||||
|
|
||||||
%elifdef ELF ; ----(nasm -felf[64] -DELF ...)------------
|
%elifdef ELF ; ----(nasm -felf[64] -DELF ...)------------
|
||||||
; * Linux
|
; * Linux
|
||||||
|
|||||||
Reference in New Issue
Block a user