@@ -33,6 +33,8 @@
#end bin_target
#begin bin_target
+ // Temporarily commented out until we can bring this to new scene graph.
+ #define BUILD_TARGET
#define TARGET stitch-viewer
#define LOCAL_LIBS \
stitchviewer stitchbase
@@ -6,7 +6,7 @@
#define LOCAL_LIBS pandaappbase
#define OTHER_LIBS \
progbase \
- putil:c express:c mathutil:c linmath:c pnmimage:c pnm:c panda:m
+ putil:c express:c mathutil:c linmath:c pnmimage:c panda:m
#define UNIX_SYS_LIBS \
m
@@ -25,6 +25,8 @@
#include "rotate_to.h"
#include "executionEnvironment.h"
+#include <stdio.h> // for sprintf()
+
StitchImage::
StitchImage(const string &name, const string &filename,
StitchLens *lens, const LVecBase2d &size_pixels,
@@ -20,8 +20,9 @@
#include "stitchImage.h"
#include "stitchPoint.h"
-#include <rotate_to.h>
-#include <compose_matrix.h>
+#include "rotate_to.h"
+#include "compose_matrix.h"
+#include <algorithm>
Stitcher::MatchingPoint::
@@ -1,3 +1,7 @@
+// This directory is temporarily commented out until it can be brought
+// into the new scene graph.
+#define BUILD_DIRECTORY
#begin ss_lib_target
#define TARGET stitchviewer
#define LOCAL_LIBS stitchbase