SGJP / Morfeusz

Commit 90d0ace5b749a8f6fd79ce29104d6c6266a61f81

Authored by Michał Lenart
1 parent 656c4a62

poprawki, coby się kompilowało i budowało na windzie i macosx 

git-svn-id: svn://svn.nlp.ipipan.waw.pl/morfeusz/morfeusz@107 ff4e3ee1-f430-4e82-ade0-24591c43f1fd
Inline Side-by-side
Showing 5 changed files with 11 additions and 8 deletions
CMakeLists.txt
  View file @90d0ace
... ... @@ -18,8 +18,10 @@ elseif ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86")
18 18 set (ARCHITECTURE "i386")
19 19 elseif ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "")
20 20 message (FATAL_ERROR "CMAKE_SYSTEM_PROCESSOR is not set (should be x86 or x86_64)")
  21 +elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
  22 + set (ARCHITECTURE "amd64")
21 23 else ()
22   - set (ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}")
  24 + message (FATAL_ERROR "Invalid architecture: ${CMAKE_SYSTEM_PROCESSOR}")
23 25 endif ()
24 26  
25 27 # PROJECT_VERSION
... ...
buildAll.sh
  View file @90d0ace
... ... @@ -33,8 +33,8 @@ function build {
33 33 cd "$srcDir"
34 34 }
35 35  
36   -#~ build Linux amd64 package package-java package-python package-builder
  36 +build Linux amd64 package package-java package-python package-builder
37 37 LDFLAGS=-m32;CFLAGS=-m32;CXXFLAGS=-m32 build Linux i386 package package-java package-builder
38   -#~ build Windows amd64 package package-java
39   -#~ build Windows i386 package package-java
40   -#~ build Darwin amd64 package package-java package-builder
  38 +build Windows amd64 package package-java
  39 +build Windows i386 package package-java
  40 +build Darwin amd64 package package-builder
... ...
morfeusz/java/CMakeLists.txt
  View file @90d0ace
... ... @@ -39,7 +39,8 @@ set (CMAKE_JAVA_TARGET_OUTPUT_NAME jmorfeusz)
39 39 # build jmorfeusz
40 40 file(GLOB_RECURSE JAVA_SOURCES ${JAVA_SRC_DIR} "*.java")
41 41 add_jar (jmorfeusz
42   - SOURCES "${JAVA_SOURCES}" )
  42 + SOURCES "${JAVA_SOURCES}"
  43 + DEPENDS libjmorfeusz)
43 44  
44 45 add_custom_target(jmorfeusz-copy-readme
45 46 COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/README" "${CMAKE_CURRENT_BINARY_DIR}/README")
... ...
morfeusz/morfeusz_analyzer.cpp
  View file @90d0ace
... ... @@ -25,7 +25,7 @@ int main(int argc, char** argv) {
25 25 morfeusz.setCharset(CP852);
26 26 #endif
27 27 #ifdef _WIN64
28   - morfeusz.ssetCharsetCP852);
  28 + morfeusz.setCharset(CP852);
29 29 #endif
30 30 string line;
31 31 while (getline(cin, line)) {
... ...
morfeusz/morfeusz_generator.cpp
  View file @90d0ace
... ... @@ -25,7 +25,7 @@ int main(int argc, char** argv) {
25 25 morfeusz.setCharset(CP852);
26 26 #endif
27 27 #ifdef _WIN64
28   - morfeusz.ssetCharsetCP852);
  28 + morfeusz.setCharset(CP852);
29 29 #endif
30 30 string line;
31 31 while (getline(cin, line)) {
... ...