fixes for building static libs (new FLAC__NO_DLL #define)

This commit is contained in:
Josh Coalson
2002-10-18 05:50:28 +00:00
parent 3a17d3c3c3
commit 1d25bb6a61
11 changed files with 17 additions and 17 deletions

View File

@@ -20,7 +20,7 @@
#ifndef FLACPP__EXPORT_H #ifndef FLACPP__EXPORT_H
#define 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 #define FLACPP_API
#else #else

View File

@@ -20,7 +20,7 @@
#ifndef FLAC__EXPORT_H #ifndef FLAC__EXPORT_H
#define 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 #define FLAC_API
#else #else

View File

@@ -20,7 +20,7 @@
#ifndef OggFLACPP__EXPORT_H #ifndef OggFLACPP__EXPORT_H
#define 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 #define OggFLACPP_API
#else #else

View File

@@ -20,7 +20,7 @@
#ifndef OggFLAC__EXPORT_H #ifndef OggFLAC__EXPORT_H
#define 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 #define OggFLAC_API
#else #else

View File

@@ -22,10 +22,10 @@ SUFFIXES = .cpp
!IFDEF DEBUG !IFDEF DEBUG
.cpp.obj: .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 !else
.cpp.obj: .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 !endif
CPP_FILES= \ CPP_FILES= \

View File

@@ -22,10 +22,10 @@ NASM=nasmw
!IFDEF DEBUG !IFDEF DEBUG
.c.obj: .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 !else
.c.obj: .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 !endif
C_FILES= \ C_FILES= \

View File

@@ -22,10 +22,10 @@ SUFFIXES = .cpp
!IFDEF DEBUG !IFDEF DEBUG
.cpp.obj: .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 !else
.cpp.obj: .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 !endif
CPP_FILES= \ CPP_FILES= \

View File

@@ -20,10 +20,10 @@
!IFDEF DEBUG !IFDEF DEBUG
.c.obj: .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 !else
.c.obj: .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 !endif
C_FILES= \ C_FILES= \

View File

@@ -2,10 +2,10 @@
!IFDEF DEBUG !IFDEF DEBUG
.c.obj: .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 !else
.c.obj: .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 !endif
C_FILES= \ C_FILES= \

View File

@@ -19,7 +19,7 @@
#ifndef FLAC__PLUGIN_COMMON__EXPORT_H #ifndef FLAC__PLUGIN_COMMON__EXPORT_H
#define 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 #define PLUGIN_COMMON_API
#else #else

View File

@@ -2,10 +2,10 @@
!IFDEF DEBUG !IFDEF DEBUG
.c.obj: .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 !else
.c.obj: .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 !endif
C_FILES= \ C_FILES= \