Cmake: more fixs for C internal libs

(bzr r5358)

4 files changed, 21 insertions, 6 deletions

diff --git a/src/libcola/CMakeLists.txt b/src/libcola/CMakeLists.txt
index 04005fde4..ffc3f481f 100644
--- a/src/libcola/CMakeLists.txt
+++ b/src/libcola/CMakeLists.txt
@@ -14,4 +14,4 @@ shortest_paths.h
 straightener.cpp

 straightener.h

 )

-ADD_LIBRARY(inklibcola STATIC ${libcola_SRC})
\ No newline at end of file
+ADD_LIBRARY(cola STATIC ${libcola_SRC})
diff --git a/src/libgdl/CMakeLists.txt b/src/libgdl/CMakeLists.txt
index a30d0966f..5378e7e1e 100644
--- a/src/libgdl/CMakeLists.txt
+++ b/src/libgdl/CMakeLists.txt
@@ -1,3 +1,9 @@
+IF(WIN32)
+SET(GDL_WIN
+gdl-win32.c

+gdl-win32.h)
+ENDIF(WIN32)
+
 SET(libgdl_SRC

 gdl-dock.c

 gdl-dock.h

@@ -26,13 +32,11 @@ gdl-stock.h
 gdl-stock-icons.h

 gdl-switcher.c

 gdl-switcher.h

-gdl-tools.h

-gdl-win32.c

-gdl-win32.h

-libgdl.h

+gdl-tools.h
libgdl.h

 libgdlmarshal.c

 libgdlmarshal.h

 libgdltypebuiltins.c

 libgdltypebuiltins.h

+${GDL_WIN}
 )

 ADD_LIBRARY(gdl STATIC ${libgdl_SRC})
diff --git a/src/libnrtype/CMakeLists.txt b/src/libnrtype/CMakeLists.txt
index 9d83d28fb..ba5c40ca5 100644
--- a/src/libnrtype/CMakeLists.txt
+++ b/src/libnrtype/CMakeLists.txt
@@ -34,4 +34,4 @@ text-boundary.h
 TextWrapper.cpp

 TextWrapper.h

 )

-ADD_LIBRARY(inklibnrtype STATIC ${libnrtype_SRC})
\ No newline at end of file
+ADD_LIBRARY(nrtype STATIC ${libnrtype_SRC})
diff --git a/src/libvpsc/CMakeLists.txt b/src/libvpsc/CMakeLists.txt
new file mode 100644
index 000000000..23b6f84cd
--- /dev/null
+++ b/src/libvpsc/CMakeLists.txt
@@ -0,0 +1,11 @@
+SET(libvpsc_SRC

+block.cpp
+blocks.cpp
+constraint.cpp
+csolve_VPSC.cpp
+generate-constraints.cpp
+remove_rectangle_overlap.cpp
+solve_VPSC.cpp
+variable.cpp

+)

+ADD_LIBRARY(vpsc STATIC ${libvpsc_SRC})