Mercurial Mercurial > sheepy-clone / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Put compiled units into more appropriate dir
authorunc0rr
Sat, 09 Mar 2013 21:40:02 +0400
changeset 8705 cd00f0ff224c
parent 8704 4fa9d9be17f3
child 8706 9f5df5dc44a0
- Put compiled units into more appropriate dir - Fix build with .pro file
CMakeLists.txt file | annotate | diff | comparison | revisions
project_files/hedgewars.pro file | annotate | diff | comparison | revisions 
--- 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)
--- 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
sheepy-clone