Skip to content

GitLab

Commit 1d25bb6a authored by Josh Coalson's avatar Josh Coalson
Browse files

fixes for building static libs (new FLAC__NO_DLL #define)

parent 3a17d3c3
Hide whitespace changes
Inline Side-by-side
include/FLAC++/export.h
View file @ 1d25bb6a
......@@ -20,7 +20,7 @@
#ifndef FLACPP__EXPORT_H
#define FLACPP__EXPORT_H
#if defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
#if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
#define FLACPP_API
#else
......
include/FLAC/export.h
View file @ 1d25bb6a
......@@ -20,7 +20,7 @@
#ifndef FLAC__EXPORT_H
#define FLAC__EXPORT_H
#if defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
#if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
#define FLAC_API
#else
......
include/OggFLAC++/export.h
View file @ 1d25bb6a
......@@ -20,7 +20,7 @@
#ifndef OggFLACPP__EXPORT_H
#define OggFLACPP__EXPORT_H
#if defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
#if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
#define OggFLACPP_API
#else
......
include/OggFLAC/export.h
View file @ 1d25bb6a
......@@ -20,7 +20,7 @@
#ifndef OggFLAC__EXPORT_H
#define OggFLAC__EXPORT_H
#if defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
#if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
#define OggFLAC_API
#else
......
src/libFLAC++/Makefile.vc
View file @ 1d25bb6a
......@@ -22,10 +22,10 @@ SUFFIXES = .cpp
!IFDEF DEBUG
.cpp.obj:
$(cc) /D "_LIB" /GX /GR $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
$(cc) /D "_LIB" -DFLAC__NO_DLL /GX /GR $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
!else
.cpp.obj:
$(cc) /D "_LIB" /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
$(cc) /D "_LIB" -DFLAC__NO_DLL /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
!endif
CPP_FILES= \
......
src/libFLAC/Makefile.vc
View file @ 1d25bb6a
......@@ -22,10 +22,10 @@ NASM=nasmw
!IFDEF DEBUG
.c.obj:
$(cc) /D "_LIB" -DVERSION=\"1.0.4\" -DFLAC__CPU_IA32 -DFLAC__HAS_NASM -DFLAC__OVERFLOW_DETECT /GX $(cdebug) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
$(cc) /D "_LIB" -DVERSION=\"1.0.4\" -DFLAC__NO_DLL -DFLAC__CPU_IA32 -DFLAC__HAS_NASM -DFLAC__OVERFLOW_DETECT /GX $(cdebug) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
!else
.c.obj:
$(cc) /D "_LIB" -DVERSION=\"1.0.4\" -DFLAC__CPU_IA32 -DFLAC__HAS_NASM /O2 $(crelease) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
$(cc) /D "_LIB" -DVERSION=\"1.0.4\" -DFLAC__NO_DLL -DFLAC__CPU_IA32 -DFLAC__HAS_NASM /O2 $(crelease) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
!endif
C_FILES= \
......
src/libOggFLAC++/Makefile.vc
View file @ 1d25bb6a
......@@ -22,10 +22,10 @@ SUFFIXES = .cpp
!IFDEF DEBUG
.cpp.obj:
$(cc) /D "_LIB" /GX /GR $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
$(cc) /D "_LIB" -DFLAC__NO_DLL /GX /GR $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
!else
.cpp.obj:
$(cc) /D "_LIB" /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
$(cc) /D "_LIB" -DFLAC__NO_DLL /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
!endif
CPP_FILES= \
......
src/libOggFLAC/Makefile.vc
View file @ 1d25bb6a
......@@ -20,10 +20,10 @@
!IFDEF DEBUG
.c.obj:
$(cc) /D "_LIB" /GX $(cdebug) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
$(cc) /D "_LIB" -DFLAC__NO_DLL /GX $(cdebug) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
!else
.c.obj:
$(cc) /D "_LIB" /O2 $(crelease) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
$(cc) /D "_LIB" -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
!endif
C_FILES= \
......
src/plugin_common/Makefile.vc
View file @ 1d25bb6a
......@@ -2,10 +2,10 @@
!IFDEF DEBUG
.c.obj:
$(cc) /D "_LIB" /GX $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
$(cc) /D "_LIB" -DFLAC__NO_DLL /GX $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
!else
.c.obj:
$(cc) /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
$(cc) /D "_LIB" -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
!endif
C_FILES= \
......
src/plugin_common/export.h
View file @ 1d25bb6a
......@@ -19,7 +19,7 @@
#ifndef FLAC__PLUGIN_COMMON__EXPORT_H
#define FLAC__PLUGIN_COMMON__EXPORT_H
#if defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
#if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
#define PLUGIN_COMMON_API
#else
......
src/share/Makefile.vc
View file @ 1d25bb6a
......@@ -2,10 +2,10 @@
!IFDEF DEBUG
.c.obj:
$(cc) /D "_LIB" /GX $(cdebug) $(cflags) /I "..\..\include" /I "..\..\include\share" -DSTRICT -YX /Od /D "_DEBUG" $<
$(cc) /D "_LIB" -DFLAC__NO_DLL /GX $(cdebug) $(cflags) /I "..\..\include" /I "..\..\include\share" -DSTRICT -YX /Od /D "_DEBUG" $<
!else
.c.obj:
$(cc) /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" /I "..\..\include\share" -DSTRICT -YX -DNODEBUG $<
$(cc) /D "_LIB" -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\include" /I "..\..\include\share" -DSTRICT -YX -DNODEBUG $<
!endif
C_FILES= \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment