Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2399


Ignore:
Timestamp:
Dec 10, 2008, 9:45:35 PM (15 years ago)
Author:
adrfried
Message:

tolua fixed for mingw, libtolua linked statically

Location:
code/branches/buildsystem
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/buildsystem/CMakeLists.txt

    r2359 r2399  
    3333SET(CMAKE_C_FLAGS   "$ENV{CFLAGS}   -Wall -Wextra -Wno-unused-parameter")
    3434SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -Wall -Wextra -Wno-unused-parameter")
    35 SET(CMAKE_C_FLAGS_DEBUG            "-g -ggdb")
    36 SET(CMAKE_CXX_FLAGS_DEBUG          "-g -ggdb")
    37 SET(CMAKE_C_FLAGS_RELEASE          "-O3 -DNDEBUG")
    38 SET(CMAKE_CXX_FLAGS_RELEASE        "-O3 -DNDEBUG")
    39 SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -DNDEBUG -g -ggdb")
    40 SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -DNDEBUG -g -ggdb")
    41 SET(CMAKE_C_FLAGS_MINSIZEREL       "-Os -DNDEBUG")
    42 SET(CMAKE_CXX_FLAGS_MINSIZEREL     "-Os -DNDEBUG")
     35SET(CMAKE_C_FLAGS_DEBUG            "-g -ggdb -fPIC")
     36SET(CMAKE_CXX_FLAGS_DEBUG          "-g -ggdb -fPIC")
     37SET(CMAKE_C_FLAGS_RELEASE          "-O3 -DNDEBUG -fPIC")
     38SET(CMAKE_CXX_FLAGS_RELEASE        "-O3 -DNDEBUG -fPIC")
     39SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -DNDEBUG -g -ggdb -fPIC")
     40SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -DNDEBUG -g -ggdb -fPIC")
     41SET(CMAKE_C_FLAGS_MINSIZEREL       "-Os -DNDEBUG -fPIC")
     42SET(CMAKE_CXX_FLAGS_MINSIZEREL     "-Os -DNDEBUG -fPIC")
    4343
    4444SET(CMAKE_LD_FLAGS "$ENV{LDFLAGS}")
  • code/branches/buildsystem/cmake/UseTolua.cmake

    r2243 r2399  
    1818SET(_tolua_executable_name toluaexe_orxonox)
    1919GET_TARGET_PROPERTY(TOLUA_EXECUTABLE "${_tolua_executable_name}" LOCATION)
     20IF(MINGW_LIBRARY_DIR)
     21  SET(_tolua_command_wd "WORKING_DIRECTORY;${MINGW_LIBRARY_DIR}/lua-5.1.3/lib")
     22ELSE(MINGW_LIBRARY_DIR)
     23  SET(_tolua_command_wd)
     24ENDIF(MINGW_LIBRARY_DIR)
    2025
    2126MACRO(TOLUA _tolua_package _tolua_srcfiles_varname)
     
    4550    DEPENDS "${_tolua_executable_name}" ${TOLUA_PARSER_DEPENDENCIES}
    4651    IMPLICIT_DEPENDS CXX ${_tolua_inputfiles}
    47     WORKING_DIRECTORY "${LIBRARY_OUTPUT_PATH}"
     52    ${_tolua_command_wd}
    4853  )
    4954ENDMACRO(TOLUA)
  • code/branches/buildsystem/src/tolua/CMakeLists.txt

    r2384 r2399  
    1 SET(TOLUALIB_SRC_FILES
     1ADD_LIBRARY(tolualib_orxonox STATIC
    22  tolua_event.c
    33  tolua_is.c
     
    77)
    88
    9 ADD_LIBRARY          (tolualib_orxonox SHARED ${TOLUALIB_SRC_FILES})
    109TARGET_LINK_LIBRARIES(tolualib_orxonox ${LUA_LIBRARIES})
    11 INSTALL(TARGETS tolualib_orxonox LIBRARY DESTINATION lib)
     10
     11#INSTALL(TARGETS tolualib_orxonox LIBRARY DESTINATION lib)
    1212
    1313SET(TOLUAGEN_SRC_FILES
     
    1515)
    1616
    17 ADD_EXECUTABLE       (toluaexe_orxonox ${TOLUAGEN_SRC_FILES})
     17ADD_EXECUTABLE(toluaexe_orxonox ${TOLUAGEN_SRC_FILES})
    1818TARGET_LINK_LIBRARIES(toluaexe_orxonox tolualib_orxonox ${LUA_LIBRARIES})
    1919
Note: See TracChangeset for help on using the changeset viewer.