Disable dlmalloc for dll preloader, too. Comment out test code.
authorMarcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
Tue, 5 Oct 2010 03:58:04 +0000 (05:58 +0200)
committerMarcus Brinkmann <marcus.brinkmann@ruhr-uni-bochum.de>
Tue, 5 Oct 2010 03:58:04 +0000 (05:58 +0200)
loader/CMakeLists.txt

index a2502b0..adf1ac6 100644 (file)
@@ -14,14 +14,15 @@ add_executable(himemce himemce.c
   server_protocol.h server_mapping.c)\r
 install(TARGETS himemce DESTINATION bin)\r
 \r
-add_library(newtest SHARED newtest.cpp newtest.def)\r
-add_executable(newtestex newtestex.cpp)\r
-target_link_libraries(newtestex newtest)\r
-install(TARGETS newtest newtestex DESTINATION bin)\r
+#Example rules how to build a library.\r
+#add_library(newtest SHARED newtest.cpp newtest.def)\r
+#add_executable(newtestex newtestex.cpp)\r
+#target_link_libraries(newtestex newtest)\r
+#install(TARGETS newtest newtestex DESTINATION bin)\r
 \r
 add_executable(himemce-real himemce-real.cpp)\r
 SET_TARGET_PROPERTIES(himemce-real PROPERTIES LINK_FLAGS " /FIXED:NO")\r
-# FIXME: For now...\r
+# Not necessary anymore.\r
 #SET_TARGET_PROPERTIES(himemce-real PROPERTIES LINK_FLAGS " /FILEALIGN:4096")\r
 install(TARGETS himemce-real DESTINATION bin)\r
 \r
@@ -33,7 +34,7 @@ add_executable(himemce-pre himemce-pre.c
   himemce-map.h himemce-map.c\r
   himemce-map-provider.c\r
   wine.h my_winternl.h compat.c\r
-  dlmalloc.h dlmalloc.c\r
+#  dlmalloc.h dlmalloc.c\r
   kernel32_kernel_private.h kernel32_process.c kernel32_module.c\r
   ntdll_error.c ntdll_loader.c ntdll_virtual.c\r
   server_protocol.h server_mapping.c)\r