Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jun 1, 2008, 3:54:20 PM (16 years ago)
Author:
rgrieder
Message:
  • @everyone: Do not create a branch until I've added the svn:eol-style property correctly. Otherwise this would cost me another 4 hours or so when we want to merge back.
  • merged network branch back to trunk
  • I had to omit the changes from last evening concerning the line endings
  • might not work yet because of the line endings
  • @beni: script branch is the only branch still open. you probably will have to apply a patch because of inconsistent new lines
File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/CMakeLists.txt

    r1293 r1502  
    4545SET(CMAKE_C_FLAGS "$ENV{CFLAGS} -O0 -Wall -g -ggdb")
    4646SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -O0 -Wall -g -ggdb")
     47#SET(CMAKE_C_FLAGS "$ENV{CFLAGS} -O3")
     48#SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -O3")
     49
    4750SET(CMAKE_LD_FLAGS "$ENV{LDFLAGS}")
    4851SET(CMAKE_EXE_LINKER_FLAGS " --no-undefined")
     
    6568FIND_PACKAGE(ENet)
    6669FIND_PACKAGE(Boost REQUIRED thread)
     70FIND_PACKAGE(Boost REQUIRED filesystem)
    6771FIND_PACKAGE(OpenAL)
    6872FIND_PACKAGE(ALUT)
     
    7175FIND_PACKAGE(Lua)
    7276FIND_PACKAGE(TCL)
     77FIND_PACKAGE(DirectX)
    7378
    7479#Set the search paths for the linking
     
    96101  ${Lua_INCLUDE_DIR}
    97102  ${TCL_INCLUDE_PATH}
     103  ${DirectX_INCLUDE_DIR}
     104  ${ZLIB_INCLUDE_DIR}
    98105)
    99106
Note: See TracChangeset for help on using the changeset viewer.