Changeset 105

Timestamp:

11/08/06 20:53:41 (17 years ago)

Author:

zorg

Message:

Fix cmake compilation on win32 (both for msvc & mingw/cygwin). It's still advised to use custom msvc projects with msvc compilers though

Location:

mppenc/trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• src/CMakeLists.txt (modified) (1 diff)
• src/mppenc.h (modified) (1 diff)
• win32/mppenc.vcproj (modified) (2 diffs)

mppenc/trunk/CMakeLists.txt

@@ -2 +2 @@
 project(mppenc C)
 set(CMAKE_VERBOSE_MAKEFILE false)
-set(CMAKE_C_FLAGS "-fno-strict-aliasing -Os -fomit-frame-pointer -pipe") 
+
+if(NOT MSVC)
+set(CMAKE_C_FLAGS "-fno-strict-aliasing -Os -fomit-frame-pointer -pipe")
+endif(NOT MSVC)
+
 add_subdirectory(src)

mppenc/trunk/src/CMakeLists.txt

@@ -1 +1 @@
 add_definitions(-DMPP_ENCODER -DFAST_MATH -DCVD_FASTLOG)
 add_executable(mppenc analy_filter encode_sv7 huffsv7 profile stderr winmsg ans fastmath keyboard psy tags bitstream fft4g mppenc psy_tab tools cvd fft_routines pipeopen quant wave_in)
+
+if(WIN32)
+target_link_libraries(mppenc winmm)
+endif(WIN32)
+
+if(NOT MSVC)
 target_link_libraries(mppenc m)
+endif(NOT MSVC)
+
 if(CMAKE_SYSTEM_NAME STREQUAL OpenBSD)
 target_link_libraries(mppenc ossaudio)
 endif(CMAKE_SYSTEM_NAME STREQUAL OpenBSD)
+
 install(TARGETS mppenc RUNTIME DESTINATION bin)

mppenc/trunk/src/mppenc.h

@@ -20 +20 @@
 #ifndef MPPENC_MPPENC_H
 #define MPPENC_MPPENC_H
-
-#ifdef _WIN32
-# define CVD_FASTLOG
-# define FAST_MATH
-#endif
 
 #include "mppdec.h"

mppenc/trunk/win32/mppenc.vcproj

@@ -41 +41 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;MPP_ENCODER"
+                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;MPP_ENCODER;CVD_FASTLOG;FAST_MATH"
                                 ExceptionHandling="0"
                                 BasicRuntimeChecks="3"
@@ -123 +123 @@
                         <Tool
                                 Name="VCCLCompilerTool"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;MPP_ENCODER"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;MPP_ENCODER;CVD_FASTLOG;FAST_MATH"
                                 ExceptionHandling="0"
                                 RuntimeLibrary="0"