OrgLion-ML
/
darknet
mirror of https://github.com/AlexeyAB/darknet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix compilation for Windows with MinGW

This commit is contained in:
Mosè Giordano 2019-11-24 00:17:32 +00:00
parent 3abbd85808
commit 55a6479ea2
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -73,6 +73,10 @@ endif
CFLAGS+=$(OPTS)
ifneq (,$(findstring MSYS_NT,$(OS)))
LDFLAGS+=-lws2_32
endif
ifeq ($(OPENCV), 1)
COMMON+= -DOPENCV
CFLAGS+= -DOPENCV

2
src/darkunistd.h
View File

@ -7,7 +7,7 @@
* Please add functionality as needed
*/
#include <Winsock2.h>
#include <winsock2.h>
#include <direct.h> /* for _getcwd() and _chdir() */
#include "getopt.h"
#include <io.h>

2
src/gemm.c
View File

@ -512,7 +512,7 @@ static inline int popcnt_32(uint32_t val32) {
//----------------------------
#if (defined(__AVX__) && defined(__x86_64__)) || defined(_WIN64)
#if (defined(__AVX__) && defined(__x86_64__)) || (defined(_WIN64) && !defined(__MINGW32__))
#ifdef _WIN64
#include <intrin.h>

6
src/getopt.h
View File

@ -67,7 +67,7 @@
#include <stdlib.h>
#include <string.h>
#define WIN32_LEAN_AND_MEAN
#include <Windows.h>
#include <windows.h>
#ifdef __cplusplus
extern "C" {
@ -190,13 +190,13 @@ extern "C" {
* Parse long options in argc/argv argument vector.
* Returns -1 if short_too is set and the option does not match long_options.
*/
static int parse_long_options(char* const* nargv, const char* options, const struct option* long_options, int* idx, int short_too);
/* static int parse_long_options(char* const* nargv, const char* options, const struct option* long_options, int* idx, int short_too); */
/*
* getopt_internal --
* Parse argc/argv argument vector. Called by user level routines.
*/
static int getopt_internal(int nargc, char* const* nargv, const char* options, const struct option* long_options, int* idx, int flags);
/* static int getopt_internal(int nargc, char* const* nargv, const char* options, const struct option* long_options, int* idx, int flags); */
/*
* getopt_long --

6
src/gettimeofday.h
View File

@ -1,9 +1,9 @@
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <Windows.h>
#include <Winsock2.h>
#include <windows.h>
#include <winsock2.h>
#include <stdint.h>
#include < time.h >
#include <time.h>
#include "darknet.h"
#define CLOCK_REALTIME (1)