Merge lp:~haw/s25rttr/HAW into lp:~flosoft/s25rttr/trunk

Proposed by Till
Status: Rejected
Rejected by: FloSoft
Proposed branch: lp:~haw/s25rttr/HAW
Merge into: lp:~flosoft/s25rttr/trunk
Diff against target: 163 lines (+45/-24)
7 files modified
CMakeLists.txt (+9/-2)
build/cmake.sh (+11/-1)
driver/src/AudioInterface.h (+11/-9)
driver/src/VideoInterface.h (+11/-9)
s-c/resample-1.8.1/src/CMakeLists.txt (+1/-1)
s-c/src/CMakeLists.txt (+1/-1)
s25update/src/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~haw/s25rttr/HAW
Reviewer Review Type Date Requested Status
FloSoft Needs Fixing
Review via email: mp+24558@code.launchpad.net

This proposal supersedes a proposal from 2010-04-28.

Description of the change

Neues Addon hinzugefügt: Keine Münzen nach Fertigstellung eines Militärgebäudes annehmen.

CMake angepasst für XCode-Projekt Generierung (allgemein sollte es auch für andere IDE funktionieren,
wurde aber noch nicht getestet)

( außerdem wurde das -Werror rausgenommen, da es sonst nicht kompilieren wollte... sollte evtl.
  geprüft werden. )

Viele Grüße aus Hamburg && Cooles Projekt ;)

PS.: Wir hoffen dass ihr unsere Erweiterungen gebrauchen könnt und wenn ihr nichts dagegen habt, dann
werden wir uns auch in Zukunft ein wenig am Projekt beteiligen.

To post a comment you must log in.
Revision history for this message
FloSoft (flosoft) wrote : Posted in a previous version of this proposal

okay:

der XCode Teil schaut schon ganz okay aus, evtl wärs einfacher das so zu lösen:

# add slash
IF(CMAKE_GENERATOR STREQUAL "Xcode")
   SET(CONFIGURATION "$(CONFIGURATION)/")
ELSE(CMAKE_GENERATOR STREQUAL "Xcode")
   SET(CONFIGURATION "")
ENDIF(CMAKE_GENERATOR STREQUAL "Xcode")

und dann immer an den entsprechenden Stellen (z.B...)

ADD_CUSTOM_COMMAND(TARGET s-c_resample POST_BUILD COMMAND cp -v $(CONFIGURATION)s-c_resample ../../../RTTR/s-c_resample)

so das man im prinzip nichts weiter an den stellen mit ifdef unterscheiden muss

Das Addon ist schon okay, evtl der "Author" des Addons noch oben in die Liste in src/const_addons.h eintragen,

dann kann ich den diff ins SVN übernehmen.

review: Needs Fixing
Revision history for this message
FloSoft (flosoft) wrote : Posted in a previous version of this proposal

okay hab das Addon hinzugefügt, hoffe der Name des Autors ist okay, sonst änder ich das noch.

Revision history for this message
Till (steinbach-till) wrote :

Habe die Vorschläge bezüglich des Generators umgesetzt. Ansonsten sollte es nun auch mit -Werror kompilieren. Das Problem war eine Redefinition.

lp:~haw/s25rttr/HAW updated
6367. By Johann-Nikolaus Andreae <johann@t500>

merge with trunk

6368. By Johann-Nikolaus Andreae <johann@t500>

merge with trunk
-KI-Event für gefällte Bäume
-fix for #575596
-Hafenflaggenreichweite halbiert

6369. By Johann-Nikolaus Andreae <johann@t500>

merge with trunk
-Turbo-Replays standardmäßig deaktiviert
-Fix: KI hat versucht Militärsettings zu hoch zu setzen...
-Team >= 3 Bug behoben

Revision history for this message
FloSoft (flosoft) wrote :

please remerge and rerequest merge request (add comment with resubmit)

review: Needs Fixing

Unmerged revisions

6369. By Johann-Nikolaus Andreae <johann@t500>

merge with trunk
-Turbo-Replays standardmäßig deaktiviert
-Fix: KI hat versucht Militärsettings zu hoch zu setzen...
-Team >= 3 Bug behoben

6368. By Johann-Nikolaus Andreae <johann@t500>

merge with trunk
-KI-Event für gefällte Bäume
-fix for #575596
-Hafenflaggenreichweite halbiert

6367. By Johann-Nikolaus Andreae <johann@t500>

merge with trunk

6366. By Till Steinbach <email address hidden>

- Redefinition of DRIVERDLLAPI (AudioInterface.h/VideoInterface.h) removed. Now compiles with -Werror in Xcode
- Removed some linefeeds

6365. By Till Steinbach <email address hidden>

Changed XCode Generator fixes as suggested by FloSoft

6364. By Till Steinbach <email address hidden>

Merging current version of main tree into branch

6363. By Johann-Nikolaus Andreae <johann@t500>

Merge Katapult fix und andere von OLiver

6362. By Johann-Nikolaus Andreae <johann@t500>

merge with lp:s25rttr

6361. By Florian Bartols <email address hidden>

test

6360. By Florian Bartols <email address hidden>

added new functionallity so we can use the generator function of cmake.
new paramter -g --g -generator --generator=<GENERATOR>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2010-04-30 22:01:18 +0000
3+++ CMakeLists.txt 2010-05-10 09:44:26 +0000
4@@ -20,6 +20,12 @@
5 PROJECT(s25client)
6
7 ################################################################################
8+#This is necessary to generate a proper XCode Project, since Xcode places its binaries in a build dependent folder
9+IF(CMAKE_GENERATOR STREQUAL "Xcode")
10+ SET(CONFIGURATION "$(CONFIGURATION)/")
11+ELSE(CMAKE_GENERATOR STREQUAL "Xcode")
12+ SET(CONFIGURATION "")
13+ENDIF(CMAKE_GENERATOR STREQUAL "Xcode")
14
15 SET(PREFIX ${PREFIX} CACHE STRING "Path prefix")
16 SET(BINDIR ${BINDIR} CACHE STRING "Directory for the binaries")
17@@ -90,11 +96,12 @@
18 ADD_SUBDIRECTORY(version)
19
20 ADD_CUSTOM_TARGET(updateversion ALL
21- COMMAND "${CMAKE_BINARY_DIR}/version/src/version" "${CMAKE_SOURCE_DIR}"
22+ COMMAND ${CMAKE_BINARY_DIR}/version/src/${CONFIGURATION}version
23 DEPENDS version
24- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
25+ WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
26 )
27
28+
29 ADD_CUSTOM_TARGET(mrproper
30 COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/build/cleanup.sh"
31 WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
32
33=== modified file 'build/cmake.sh'
34--- build/cmake.sh 2010-04-29 18:16:00 +0000
35+++ build/cmake.sh 2010-05-10 09:44:26 +0000
36@@ -154,6 +154,10 @@
37 fi
38 eval disable_$ac_feature=\$ac_optarg
39 ;;
40+ --g | -g | -generator | --generator)
41+ $ac_shift
42+ GENERATOR=1
43+ ;;
44 *)
45 echo "Unknown option: $ac_option"
46 exit 1
47@@ -187,7 +191,13 @@
48
49 ###############################################################################
50
51-PARAMS=""
52+if [ $GENERATOR -eq 1 ] ; then
53+ echo "Setting Generator to \"$ac_optarg\""
54+ PARAMS="-G $ac_optarg"
55+else
56+ PARAMS=""
57+fi
58+
59
60 echo "Setting Path-Prefix to \"$PREFIX\""
61 PARAMS="$PARAMS -DPREFIX=$PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX"
62
63=== modified file 'driver/src/AudioInterface.h'
64--- driver/src/AudioInterface.h 2010-03-01 20:10:51 +0000
65+++ driver/src/AudioInterface.h 2010-05-10 09:44:26 +0000
66@@ -24,16 +24,18 @@
67
68 ///////////////////////////////////////////////////////////////////////////////
69 // Makros / Defines
70-#ifdef _WIN32
71-# if defined _USRDLL || defined _LIB || defined BUILD_DLL
72-# define DRIVERDLLAPI extern "C" __declspec(dllexport)
73-# define class class __declspec(dllexport)
74+#ifndef DRIVERDLLAPI
75+# ifdef _WIN32
76+# if defined _USRDLL || defined _LIB || defined BUILD_DLL
77+# define DRIVERDLLAPI extern "C" __declspec(dllexport)
78+# define class class __declspec(dllexport)
79+# else
80+# define DRIVERDLLAPI extern "C" __declspec(dllimport)
81+# endif // !_USRDLL
82 # else
83-# define DRIVERDLLAPI extern "C" __declspec(dllimport)
84-# endif // !_USRDLL
85-#else
86-# define DRIVERDLLAPI extern "C"
87-#endif // !_WIN32
88+# define DRIVERDLLAPI extern "C"
89+# endif // !_WIN32
90+#endif //!DRIVERDLLAPI
91
92 /// Instanzierungsfunktion der Treiber.
93 DRIVERDLLAPI AudioDriver *CreateAudioInstance(AudioDriverLoaderInterface * CallBack, void * device_dependent);
94
95=== modified file 'driver/src/VideoInterface.h'
96--- driver/src/VideoInterface.h 2010-03-01 20:10:51 +0000
97+++ driver/src/VideoInterface.h 2010-05-10 09:44:26 +0000
98@@ -25,16 +25,18 @@
99
100 ///////////////////////////////////////////////////////////////////////////////
101 // Makros / Defines
102-#ifdef _WIN32
103-# if defined _USRDLL || defined _LIB || defined BUILD_DLL
104-# define DRIVERDLLAPI extern "C" __declspec(dllexport)
105-# define class class __declspec(dllexport)
106+#ifndef DRIVERDLLAPI
107+# ifdef _WIN32
108+# if defined _USRDLL || defined _LIB || defined BUILD_DLL
109+# define DRIVERDLLAPI extern "C" __declspec(dllexport)
110+# define class class __declspec(dllexport)
111+# else
112+# define DRIVERDLLAPI extern "C" __declspec(dllimport)
113+# endif // !_USRDLL
114 # else
115-# define DRIVERDLLAPI extern "C" __declspec(dllimport)
116-# endif // !_USRDLL
117-#else
118-# define DRIVERDLLAPI extern "C"
119-#endif // !_WIN32
120+# define DRIVERDLLAPI extern "C"
121+# endif // !_WIN32
122+#endif //!DRIVERDLLAPI
123
124 /// Instanzierungsfunktion der Treiber.
125 DRIVERDLLAPI VideoDriver *CreateVideoInstance(VideoDriverLoaderInterface * CallBack);
126
127=== modified file 's-c/resample-1.8.1/src/CMakeLists.txt'
128--- s-c/resample-1.8.1/src/CMakeLists.txt 2010-03-01 20:10:51 +0000
129+++ s-c/resample-1.8.1/src/CMakeLists.txt 2010-05-10 09:44:26 +0000
130@@ -10,7 +10,7 @@
131 ADD_CUSTOM_COMMAND(TARGET s-c_resample POST_BUILD COMMAND if [ -f s-c_resample.exe ] \; then cp -v s-c_resample.exe s-c_resample \; fi)
132 ENDIF ( "${COMPILEFOR}" STREQUAL "windows")
133
134-ADD_CUSTOM_COMMAND(TARGET s-c_resample POST_BUILD COMMAND cp -v s-c_resample ../../../RTTR/s-c_resample)
135+ADD_CUSTOM_COMMAND(TARGET s-c_resample POST_BUILD COMMAND cp -v ${CONFIGURATION}s-c_resample ../../../RTTR/s-c_resample)
136
137 INSTALL(TARGETS s-c_resample DESTINATION ${DATADIR}/RTTR)
138
139
140=== modified file 's-c/src/CMakeLists.txt'
141--- s-c/src/CMakeLists.txt 2010-03-01 20:10:51 +0000
142+++ s-c/src/CMakeLists.txt 2010-05-10 09:44:26 +0000
143@@ -10,7 +10,7 @@
144 ADD_CUSTOM_COMMAND(TARGET sound-convert POST_BUILD COMMAND if [ -f sound-convert.exe ] \; then cp -v sound-convert.exe sound-convert \; fi)
145 ENDIF ( "${COMPILEFOR}" STREQUAL "windows")
146
147-ADD_CUSTOM_COMMAND(TARGET sound-convert POST_BUILD COMMAND cp -v sound-convert ../../RTTR/sound-convert)
148+ADD_CUSTOM_COMMAND(TARGET sound-convert POST_BUILD COMMAND cp -v ${CONFIGURATION}sound-convert ../../RTTR/sound-convert)
149
150 INSTALL(TARGETS sound-convert DESTINATION ${DATADIR}/RTTR)
151
152
153=== modified file 's25update/src/CMakeLists.txt'
154--- s25update/src/CMakeLists.txt 2010-03-01 20:10:51 +0000
155+++ s25update/src/CMakeLists.txt 2010-05-10 09:44:26 +0000
156@@ -54,6 +54,6 @@
157 ADD_CUSTOM_COMMAND(TARGET s25update POST_BUILD COMMAND if [ -f s25update.exe ] \; then cp -v s25update.exe s25update \; fi)
158 ENDIF ( "${COMPILEFOR}" STREQUAL "windows")
159
160-ADD_CUSTOM_COMMAND(TARGET s25update POST_BUILD COMMAND cp -v s25update ../../RTTR/)
161+ADD_CUSTOM_COMMAND(TARGET s25update POST_BUILD COMMAND cp -v ${CONFIGURATION}s25update ../../RTTR/)
162
163 ################################################################################

Subscribers

People subscribed via source and target branches

to status/vote changes: