Commit 3e5c9f93609e82887c9032289b90f522c8cd6f33

Authored by Cédric RICARD
1 parent 8be5fe23

Updated CMake files for linux

CMakeLists.txt
... ... @@ -4,7 +4,7 @@
4 4 cmake_minimum_required (VERSION 2.6)
5 5 project (ANUBIS)
6 6  
7   -set (CMAKE_USE_RELATIVE_PATHS ON)
  7 +#set (CMAKE_USE_RELATIVE_PATHS ON)
8 8  
9 9  
10 10 set( ANUBIS_DEV ${CMAKE_CURRENT_SOURCE_DIR}/anubis_dev )
... ...
anubis_dev/compiler/src/CMakeLists.txt
... ... @@ -5,7 +5,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL Windows)
5 5 set(host win32)
6 6 elseif(${CMAKE_SYSTEM_NAME} STREQUAL Linux)
7 7 set(host linux)
8   - add_definitions( -m32 )
  8 + add_definitions( -D_LINUX_ -O2 -c -Wall -m32 )
9 9 elseif(${CMAKE_SYSTEM_NAME} STREQUAL Darwin)
10 10 set(host osx)
11 11 add_definitions( -m32 )
... ... @@ -13,7 +13,7 @@ elseif(${CYGWIN})
13 13 set(host win32)
14 14 else()
15 15 set(host ${CMAKE_SYSTEM_NAME})
16   -endif()
  16 +endif(${CMAKE_SYSTEM_NAME} STREQUAL Windows)
17 17  
18 18  
19 19 set(MainSrc
... ... @@ -95,7 +95,7 @@ set (LanguageSrc
95 95 )
96 96 set(PredefAuxSrc
97 97 ${CMAKE_CURRENT_SOURCE_DIR}/predef_npd.aux
98   - ${CMAKE_CURRENT_SOURCE_DIR}/predef.aux
  98 +# ${CMAKE_CURRENT_SOURCE_DIR}/predef.aux
99 99 )
100 100 if(${CMAKE_SYSTEM_NAME} STREQUAL Windows)
101 101 set(MainSrc ${MainSrc}
... ...
anubis_dev/vm/src/CMakeLists.txt
... ... @@ -3,6 +3,7 @@ set(GUI 1)
3 3  
4 4 include_directories (${ANUBIS_DEV}/include)
5 5 include_directories (${THIRD_DEV}/sqlite3)
  6 +include_directories (${CMAKE_CURRENT_SOURCE_DIR})
6 7  
7 8 #add_subdirectory (${ANUBIS_DEV}/../third_dev/sqlite3 ${ANUBIS_BINARY_DIR}/sqlite3)
8 9  
... ... @@ -13,10 +14,10 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL Windows)
13 14 include_directories (${THIRD_DEV}/libjpeg/include)
14 15 elseif(${CMAKE_SYSTEM_NAME} STREQUAL Linux)
15 16 set(host linux)
16   - add_definitions( -m32 )
  17 + add_definitions( -D_LINUX_ -O3 -c -m32 )
17 18 elseif(${CMAKE_SYSTEM_NAME} STREQUAL Darwin)
18 19 set(host osx)
19   - add_definitions( -m32 )
  20 + add_definitions( -D_LINUX_ -m32 )
20 21 set(GUI 0)
21 22 elseif(${CYGWIN})
22 23 set(host win32)
... ...