From c176163b664e82a552089309047782033ec5d239 Mon Sep 17 00:00:00 2001 From: HanzZ Date: Fri, 21 Oct 2011 10:27:00 +0200 Subject: [PATCH 1/3] fixed dfrotz on windows --- backends/frotz/dfrotz/dumb/dumb_input.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backends/frotz/dfrotz/dumb/dumb_input.c b/backends/frotz/dfrotz/dumb/dumb_input.c index 9fcfb78c..55d464d7 100644 --- a/backends/frotz/dfrotz/dumb/dumb_input.c +++ b/backends/frotz/dfrotz/dumb/dumb_input.c @@ -81,9 +81,10 @@ static int xgetchar(void) * other places where I'm not so careful). */ static void getline_(char *s) { - fflush(stdout); int c; - char *p = s; + char *p; + fflush(stdout); + p = s; while (p < s + INPUT_BUFFER_SIZE - 1) if ((*p++ = xgetchar()) == '\n') { *p = '\0'; From 9d0af6d4e280614b86abc2e932335d2390daeb87 Mon Sep 17 00:00:00 2001 From: HanzZ Date: Fri, 21 Oct 2011 10:29:23 +0200 Subject: [PATCH 2/3] match LIBPATH instead of libpath --- cmake_modules/SwiftenConfig.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake_modules/SwiftenConfig.cmake b/cmake_modules/SwiftenConfig.cmake index 9181b09a..278594aa 100644 --- a/cmake_modules/SwiftenConfig.cmake +++ b/cmake_modules/SwiftenConfig.cmake @@ -14,10 +14,10 @@ if( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR ) set(SWIFTEN_LIBRARY "") foreach(f ${SWIFTEN_LIB}) STRING(SUBSTRING ${f} 0 2 f_out) - STRING(COMPARE EQUAL ${f_out} "/l" IS_PATH) + STRING(COMPARE EQUAL ${f_out} "/L" IS_PATH) if(${IS_PATH}) message(${f}) - string(REGEX REPLACE "/libpath:" "" f_replaced ${f}) + string(REGEX REPLACE "/LIBPATH:" "" f_replaced ${f}) link_directories(${f_replaced}) else() list(APPEND SWIFTEN_LIBRARY ${f}) From bb938d33f7518b1009edffa837882e95f85b9766 Mon Sep 17 00:00:00 2001 From: HanzZ Date: Fri, 21 Oct 2011 10:40:22 +0200 Subject: [PATCH 3/3] Do not compile dfrotz on Windows --- backends/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backends/CMakeLists.txt b/backends/CMakeLists.txt index 8b91a1ff..5a758c95 100644 --- a/backends/CMakeLists.txt +++ b/backends/CMakeLists.txt @@ -7,6 +7,8 @@ if (PROTOBUF_FOUND) ADD_SUBDIRECTORY(libircclient-qt) endif() +if (NOT WIN32) ADD_SUBDIRECTORY(frotz) +endif() endif()