summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Tony Wasserka2015-07-14 00:53:34 +0200
committerGravatar Tony Wasserka2015-07-14 00:53:34 +0200
commitecdfd0643a02ab9855f5674fee7475a7c15a0085 (patch)
tree51c4cf8dafb98f53b78a821ffd2522f4ee942eda
parentMerge pull request #924 from aroulin/qt-disassembly-step (diff)
parentgetopt: Fix macro redefinition warning (diff)
downloadyuzu-ecdfd0643a02ab9855f5674fee7475a7c15a0085.tar.gz
yuzu-ecdfd0643a02ab9855f5674fee7475a7c15a0085.tar.xz
yuzu-ecdfd0643a02ab9855f5674fee7475a7c15a0085.zip
Merge pull request #927 from yuriks/getopt-fix
getopt: Fix compilation settings.
Diffstat (limited to '')
-rw-r--r--externals/getopt/CMakeLists.txt4
-rw-r--r--externals/getopt/getopt.c1
2 files changed, 2 insertions, 3 deletions
diff --git a/externals/getopt/CMakeLists.txt b/externals/getopt/CMakeLists.txt
index b4709a506..c8b745d55 100644
--- a/externals/getopt/CMakeLists.txt
+++ b/externals/getopt/CMakeLists.txt
@@ -7,5 +7,5 @@ set(HEADERS
7 7
8create_directory_groups(${SRCS} ${HEADERS}) 8create_directory_groups(${SRCS} ${HEADERS})
9add_library(getopt ${SRCS} ${HEADERS}) 9add_library(getopt ${SRCS} ${HEADERS})
10target_compile_definitions(getopt INTERFACE STATIC_GETOPT) 10target_compile_definitions(getopt PUBLIC STATIC_GETOPT)
11target_include_directories(getopt INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) \ No newline at end of file 11target_include_directories(getopt INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/externals/getopt/getopt.c b/externals/getopt/getopt.c
index faf84089f..948d42683 100644
--- a/externals/getopt/getopt.c
+++ b/externals/getopt/getopt.c
@@ -35,7 +35,6 @@ PROFITS, BUSINESS INTERRUPTION, LOSS OF PROGRAMS OR OTHER DATA ON
35YOUR INFORMATION HANDLING SYSTEM OR OTHERWISE, EVEN If WE ARE 35YOUR INFORMATION HANDLING SYSTEM OR OTHERWISE, EVEN If WE ARE
36EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 36EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
37*/ 37*/
38#define _CRT_SECURE_NO_WARNINGS
39#include <stdlib.h> 38#include <stdlib.h>
40#include <stdio.h> 39#include <stdio.h>
41#ifdef _MSC_VER 40#ifdef _MSC_VER