# HG changeset patch # User unc0rr # Date 1362850802 -14400 # Node ID cd00f0ff224cef96eab08f63dcbe4708583ada8e # Parent 4fa9d9be17f3022c6a52ed7122964aeb57cbf3eb - Put compiled units into more appropriate dir - Fix build with .pro file diff -r 4fa9d9be17f3 -r cd00f0ff224c CMakeLists.txt --- a/CMakeLists.txt Sat Mar 09 01:22:45 2013 +0100 +++ b/CMakeLists.txt Sat Mar 09 21:40:02 2013 +0400 @@ -252,6 +252,7 @@ "-vm4079,4080,4081" # fpc output format "-B" # compile all units "-FE${PROJECT_BINARY_DIR}/bin" # fpc output directory + "-FE${PROJECT_BINARY_DIR}/hedgewars" # fpc units output directory "-Fl${PROJECT_BINARY_DIR}/bin" # fpc linking directory (win/unix) "-Fi${PROJECT_BINARY_DIR}/hedgewars" # fpc .inc path (out of source builds) "-k-L${PROJECT_BINARY_DIR}/bin" # ld linking directory (unix/osx) diff -r 4fa9d9be17f3 -r cd00f0ff224c project_files/hedgewars.pro --- a/project_files/hedgewars.pro Sat Mar 09 01:22:45 2013 +0100 +++ b/project_files/hedgewars.pro Sat Mar 09 21:40:02 2013 +0400 @@ -10,8 +10,8 @@ INCLUDEPATH += ../QTfrontend/net INCLUDEPATH += ../QTfrontend/util INCLUDEPATH += ../QTfrontend/util/platform -INCLUDEPATH += ../misc/physfs/src -INCLUDEPATH += ../misc/physfs/extras +INCLUDEPATH += ../misc/libphysfs +INCLUDEPATH += ../misc/libphyslayer DESTDIR = ../bin