Merge topic 'watcom_fixes'
3b7da53
Fix for bug 10388, fix various default flags.
This commit is contained in:
commit
02e3f42a6a
|
@ -12,17 +12,29 @@ ELSE(CMAKE_VERBOSE_MAKEFILE)
|
|||
SET(CMAKE_LIB_QUIET "-q")
|
||||
ENDIF(CMAKE_VERBOSE_MAKEFILE)
|
||||
|
||||
set(CMAKE_CREATE_WIN32_EXE "system nt_win" )
|
||||
SET(CMAKE_CREATE_CONSOLE_EXE "system nt" )
|
||||
|
||||
SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "debug all" )
|
||||
SET (CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT "debug all" )
|
||||
SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "debug all" )
|
||||
SET (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT "debug all" )
|
||||
|
||||
set (CMAKE_SHARED_LIBRARY_C_FLAGS "-bd" )
|
||||
|
||||
SET(CMAKE_RC_COMPILER "rc" )
|
||||
|
||||
SET(CMAKE_BUILD_TYPE_INIT Debug)
|
||||
SET (CMAKE_CXX_FLAGS_INIT "-w=3 -xs")
|
||||
SET (CMAKE_CXX_FLAGS_DEBUG_INIT "-br -bm -d2")
|
||||
SET (CMAKE_CXX_FLAGS_DEBUG_INIT "-br -bm -d2")
|
||||
SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-br -bm -os -dNDEBUG")
|
||||
SET (CMAKE_CXX_FLAGS_RELEASE_INIT "-br -bm -ot -dNDEBUG")
|
||||
SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-br -bm -d2 -ot -dNDEBUG")
|
||||
SET (CMAKE_C_FLAGS_INIT "-w=3 ")
|
||||
SET (CMAKE_C_FLAGS_DEBUG_INIT "-br -bm -od")
|
||||
SET (CMAKE_C_FLAGS_DEBUG_INIT "-br -bm -d2 -od")
|
||||
SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "-br -bm -os -dNDEBUG")
|
||||
SET (CMAKE_C_FLAGS_RELEASE_INIT "-br -bm -ot -dNDEBUG")
|
||||
SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-br -bm -ot -dNDEBUG")
|
||||
SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-br -bm -d2 -ot -dNDEBUG")
|
||||
SET (CMAKE_C_STANDARD_LIBRARIES_INIT "library clbrdll.lib library plbrdll.lib library kernel32.lib library user32.lib library gdi32.lib library winspool.lib library comdlg32.lib library advapi32.lib library shell32.lib library ole32.lib library oleaut32.lib library uuid.lib library odbc32.lib library odbccp32.lib")
|
||||
SET (CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}")
|
||||
|
||||
|
@ -33,6 +45,7 @@ SET(CMAKE_CXX_CREATE_IMPORT_LIBRARY ${CMAKE_C_CREATE_IMPORT_LIBRARY})
|
|||
SET(CMAKE_C_LINK_EXECUTABLE
|
||||
"wlink ${CMAKE_START_TEMP_FILE} ${CMAKE_WLINK_QUIET} name '<TARGET_UNQUOTED>' <LINK_FLAGS> option caseexact file {<OBJECTS>} <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
|
||||
|
||||
|
||||
SET(CMAKE_CXX_LINK_EXECUTABLE ${CMAKE_C_LINK_EXECUTABLE})
|
||||
|
||||
# compile a C++ file into an object file
|
||||
|
|
Loading…
Reference in New Issue