--- a/CMakeLists.txt Wed Nov 18 14:50:14 2009 +0000
+++ b/CMakeLists.txt Fri Nov 20 14:56:43 2009 +0000
@@ -12,8 +12,6 @@
set(CPACK_PACKAGE_VERSION_MINOR "9")
set(CPACK_PACKAGE_VERSION_PATCH "13-dev")
-set(build_type "standard")
-
if(APPLE)
set(CMAKE_FIND_FRAMEWORK "FIRST")
@@ -26,16 +24,14 @@
#build architecture / os version
set(minimum_os $ENV{MACOSX_DEPLOYMENT_TARGET})
if(minimum_os MATCHES "10.4")
- message(STATUS "Target: Mac OS X 10.4 i386")
+ message(STATUS "Target: Mac OS X 10.4 i386/ppc")
set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk/")
- set(CMAKE_OSX_ARCHITECTURES "i386")
- set(build_type "standard")
+ set(CMAKE_OSX_ARCHITECTURES "i386;ppc7400")
endif()
if(minimum_os MATCHES "10.5")
message(STATUS "Target: Mac OS X 10.5 i386/ppc")
set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.5.sdk/")
set(CMAKE_OSX_ARCHITECTURES "i386;ppc7400")
- set(build_type "universal")
endif()
if(minimum_os MATCHES "10.6")
message(STATUS "Target: Mac OS X 10.6 i386/ppc/x86_64")
--- a/hedgewars/CCHandlers.inc Wed Nov 18 14:50:14 2009 +0000
+++ b/hedgewars/CCHandlers.inc Fri Nov 20 14:56:43 2009 +0000
@@ -74,10 +74,6 @@
procedure chAddTeam(var s: shortstring);
var Color: Longword;
ts: shortstring;
-{$IFNDEF ENDIAN_LITTLE}
- tmpA, tmpR, tmpG, tmpB: byte;
- tmpColor: LongWord = 0;
-{$ENDIF}
begin
if isDeveloperMode then
begin
--- a/hedgewars/CMakeLists.txt Wed Nov 18 14:50:14 2009 +0000
+++ b/hedgewars/CMakeLists.txt Fri Nov 20 14:56:43 2009 +0000
@@ -108,16 +108,14 @@
include_directories(${SDL_INCLUDE_DIR})
link_libraries(${SDL_LIBRARY})
- if(universal_build)
- #apparently this variable is not exported here
- set(CMAKE_OSX_ARCHITECTURES "i386;ppc7400")
- endif()
+ #apparently this variable is not exported here
+ set(CMAKE_OSX_ARCHITECTURES "i386;ppc7400")
add_library (SDLmain STATIC SDLMain.m)
set(engine_sources SDLmain ${engine_sources})
ENDIF(APPLE)
-IF(build_type MATCHES "standard")
+IF(NOT APPLE)
#here is the standard command for any system
add_custom_command(OUTPUT "${EXECUTABLE_OUTPUT_PATH}/hwengine${CMAKE_EXECUTABLE_SUFFIX}"
COMMAND "${pascal_compiler}"
Binary file share/hedgewars/Data/Themes/Underwater/Flake-lowres.png has changed
Binary file share/hedgewars/Data/Themes/Underwater/Flake.png has changed