--- a/QTfrontend/CMakeLists.txt	Sat Jan 04 23:55:54 2014 +0400
+++ b/QTfrontend/CMakeLists.txt	Sun Jan 05 00:46:26 2014 +0400
@@ -63,7 +63,7 @@
 include_directories(${SDLMIXER_INCLUDE_DIR})
 include_directories(BEFORE ${PHYSFS_INCLUDE_DIR})
 include_directories(BEFORE ${PHYSLAYER_INCLUDE_DIR})
-
+include_directories(${LUA_INCLUDE_DIR}) #brought by physlayer hwpacksmounter.h
 
 if(UNIX)
     # HACK: in freebsd cannot find iconv.h included via SDL.h
@@ -152,6 +152,11 @@
 
 set(hwfr_rez hedgewars.qrc)
 
+if(${BUILD_ENGINE_LIBRARY})
+    add_definitions(-DHWLIBRARY=1)
+    set(hwlibname "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}hwengine${CMAKE_SHARED_LIBRARY_SUFFIX}")
+    list(APPEND HW_LINK_LIBS ${hwlibname})
+endif()
 
 qt4_add_resources(hwfr_rez_src ${hwfr_rez})
 
@@ -182,11 +187,6 @@
 if(CMAKE_BUILD_TYPE MATCHES "RELEASE")
     set(console_access "WIN32")
 endif(CMAKE_BUILD_TYPE MATCHES "RELEASE")
-if(${BUILD_ENGINE_LIBRARY})
-    add_definitions(-DHWLIBRARY=1)
-    set(hwlibname "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}hwengine${CMAKE_SHARED_LIBRARY_SUFFIX}")
-    list(APPEND HW_LINK_LIBS ${hwlibname})
-endif()
 
 add_executable(hedgewars ${console_access}
     ${hwfr_src}
@@ -219,7 +219,6 @@
     list(APPEND HW_LINK_LIBS stdc++)
 endif()
 
-
 target_link_libraries(hedgewars ${HW_LINK_LIBS})
 
 

--- a/hedgewars/SDLh.pas	Sat Jan 04 23:55:54 2014 +0400
+++ b/hedgewars/SDLh.pas	Sun Jan 05 00:46:26 2014 +0400
@@ -425,6 +425,8 @@
         clip_rect: TSDL_Rect;
         map: Pointer;
         refcount: LongInt;
+{$ELSE}
+        offset: LongInt;
 {$ENDIF}
 {$ENDIF}
         end;

--- a/hedgewars/uScript.pas	Sat Jan 04 23:55:54 2014 +0400
+++ b/hedgewars/uScript.pas	Sun Jan 05 00:46:26 2014 +0400
@@ -84,11 +84,11 @@
     uIO,
     uVisualGearsList,
     uGearsHandlersMess,
-    uPhysFSLayer,
+    uPhysFSLayer
 {$IFDEF PAS2C}
-    hwpacksmounter
-{$ELSE},
-    typinfo
+    , hwpacksmounter
+{$ELSE}
+    , typinfo
 {$ENDIF}
     ;
 

--- a/hedgewars/uWorld.pas	Sat Jan 04 23:55:54 2014 +0400
+++ b/hedgewars/uWorld.pas	Sun Jan 05 00:46:26 2014 +0400
@@ -1377,7 +1377,6 @@
 end;
 
 
->>>>>>> other
 procedure DrawWorldStereo(Lag: LongInt; RM: TRenderMode);
 var i, t: LongInt;
     r: TSDL_Rect;