blob: 54d27aa5c69eabba1e4d415f8710fd2e7ffb4832 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Tue, 10 Oct 2017 13:15:27 +1100
Subject: [PATCH 1/2] fix deprecated WIN32 definition
taken from:
https://github.com/ossimlabs/ossim/issues/153
diff --git a/src/util/ossimBatchTest.cpp b/src/util/ossimBatchTest.cpp
index 1111111..2222222 100644
--- a/src/util/ossimBatchTest.cpp
+++ b/src/util/ossimBatchTest.cpp
@@ -72,7 +72,7 @@ bool ossimBatchTest::initialize(ossimArgumentParser& ap)
}
// Initialize environment:
-#if defined(WIN32) || defined(_MSC_VER) && !defined(__CYGWIN__) && !defined(__MWERKS__)
+#if defined(_WIN32) || defined(_MSC_VER) && !defined(__CYGWIN__) && !defined(__MWERKS__)
_putenv("DEL_CMD=del /Q"); // For backwards compatiblity.
_putenv("DIFF_CMD=fc /W");
_putenv("COPY_CMD=copy /Y");
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Tue, 10 Oct 2017 13:26:49 +1100
Subject: [PATCH 2/2] set windows shared/static defs using cmake options
taken from:
https://github.com/ossimlabs/ossim/issues/153
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1111111..2222222 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -34,7 +34,14 @@ ELSE (OSSIM_HAS_HDF5)
message( STATUS "HDF5 components are being excluded from the build." )
ENDIF (OSSIM_HAS_HDF5)
-ADD_DEFINITIONS("-DOSSIMMAKINGDLL")
+IF (WIN32)
+ IF (BUILD_SHARED)
+ ADD_DEFINITIONS("-DOSSIMMAKINGDLL")
+ ELSE (BUILD_SHARED)
+ ADD_DEFINITIONS("-DOSSIM_STATIC")
+ ENDIF (BUILD_SHARED)
+ENDIF (WIN32)
+
############################### GRAB HEADERS #####################################
FILE(GLOB ossim_HDRS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/../include/ossim/*.h")
FILE(GLOB ossim_base_HDRS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/../include/ossim/base/*.h")
|
