*patch by arrom: fix installation of fort images
*patch by arrom: remove the need of qm translation files
*ifrontend: don't use spaces
--- a/hedgewars/options.inc Fri Sep 03 01:41:51 2010 +0200
+++ b/hedgewars/options.inc Fri Sep 03 01:54:29 2010 +0200
@@ -32,7 +32,6 @@
{$DEFINE SDL_MIXER_NEWER}
{$DEFINE SDL_IMAGE_NEWER}
{$DEFINE HWLIBRARY}
- {$DEFINE NOCONSOLE}
{$DEFINE GLunit:=gles11}
{$ENDIF}
--- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Fri Sep 03 01:41:51 2010 +0200
+++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Fri Sep 03 01:54:29 2010 +0200
@@ -2027,7 +2027,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "#copy new stuff over old stuff\nrm -rf ${PROJECT_DIR}/Data\ncp -R ${PROJECT_DIR}/../../share/hedgewars/Data ${PROJECT_DIR}/Data\n\n#copy some files from QTfrontend/res\nmkdir ${PROJECT_DIR}/Data/Graphics/Btn\ncp ${PROJECT_DIR}/../../QTfrontend/res/btn*.png ${PROJECT_DIR}/Data/Graphics/Btn\ncp ${PROJECT_DIR}/../../QTfrontend/res/ammopic.png ${PROJECT_DIR}/Data/Graphics/Btn/iconAmmo.png\ncp ${PROJECT_DIR}/../../QTfrontend/res/icon*.png ${PROJECT_DIR}/Data/Graphics/Btn\ncp -R ${PROJECT_DIR}/../../QTfrontend/res/botlevels ${PROJECT_DIR}/Data/Graphics/Hedgehog/botlevels\n\n#delete all CMakeLists.txt and image source files\nfind ${PROJECT_DIR}/Data -name CMakeLists.txt -delete\nfind ${PROJECT_DIR}/Data -name *.svg -delete\nfind ${PROJECT_DIR}/Data -name *.sifz -delete\nfind ${PROJECT_DIR}/Data -name *.xcf -delete\n\n#delete desktop frontend translation\nrm -rf ${PROJECT_DIR}/Data/Locale/hedgewars_*\n\n#delete dummy maps and hats\nrm -rf ${PROJECT_DIR}/Data/Maps/{test*,KnockBall,Ruler,BasketBall}\nrm -rf ${PROJECT_DIR}/Data/Hats/{TeamCap,TeamHeadband,TeamHair}\n\n\n#the following ones must be removed when their support is implemented\nrm -rf ${PROJECT_DIR}/Data/Maps/{Cheese,FlightJoust}\nrm -rf ${PROJECT_DIR}/Data/Themes/{City,Island}\n\n#delete some voices\nrm -rf ${PROJECT_DIR}/Data/Sounds/voices/Classic\n#rm -rf ${PROJECT_DIR}/Data/Sounds/voices/{Classic,British,Mobster,Pirate,Robot,Russian,Singer,Surfer}\n\n#delete all names, missions, reserved hats\nrm -rf ${PROJECT_DIR}/Data/Names/\nrm -rf ${PROJECT_DIR}/Data/Missions/\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/Reserved/\n";
+ shellScript = "#copy new stuff over old stuff\nrm -rf ${PROJECT_DIR}/Data\ncp -R ${PROJECT_DIR}/../../share/hedgewars/Data ${PROJECT_DIR}/Data\n\n#copy some files from QTfrontend/res\nmkdir ${PROJECT_DIR}/Data/Graphics/Btn\ncp ${PROJECT_DIR}/../../QTfrontend/res/btn*.png ${PROJECT_DIR}/Data/Graphics/Btn\ncp ${PROJECT_DIR}/../../QTfrontend/res/ammopic.png ${PROJECT_DIR}/Data/Graphics/Btn/iconAmmo.png\ncp ${PROJECT_DIR}/../../QTfrontend/res/icon*.png ${PROJECT_DIR}/Data/Graphics/Btn\ncp -R ${PROJECT_DIR}/../../QTfrontend/res/botlevels ${PROJECT_DIR}/Data/Graphics/Hedgehog/botlevels\n\n#delete all CMakeLists.txt and image source files\nfind ${PROJECT_DIR}/Data -name CMakeLists.txt -delete\nfind ${PROJECT_DIR}/Data -name *.svg -delete\nfind ${PROJECT_DIR}/Data -name *.sifz -delete\nfind ${PROJECT_DIR}/Data -name *.xcf -delete\n\n#delete desktop frontend translation\nrm -rf ${PROJECT_DIR}/Data/Locale/hedgewars_*\n\n#delete dummy maps and hats\nrm -rf ${PROJECT_DIR}/Data/Maps/{test*,KnockBall,Ruler,BasketBall}\nrm -rf ${PROJECT_DIR}/Data/Hats/{TeamCap,TeamHeadband,TeamHair}\n\n\n#the following ones must be removed when their support is implemented\nrm -rf ${PROJECT_DIR}/Data/Maps/{Cheese,FlightJoust}\nrm -rf ${PROJECT_DIR}/Data/Themes/{City,Island}\n\ncp -R ${PROJECT_DIR}/audio/ ${PROJECT_DIR}/Data/\n\n#delete some voices\nrm -rf ${PROJECT_DIR}/Data/Sounds/voices/Classic\n#rm -rf ${PROJECT_DIR}/Data/Sounds/voices/{Classic,British,Mobster,Pirate,Robot,Russian,Singer,Surfer}\n\n#delete all names, missions, reserved hats\nrm -rf ${PROJECT_DIR}/Data/Names/\nrm -rf ${PROJECT_DIR}/Data/Missions/\nrm -rf ${PROJECT_DIR}/Data/Graphics/Hats/Reserved/\n";
showEnvVarsInLog = 0;
};
9283011B0F10CB2D00CC5A3C /* Build libfpc.a */ = {
@@ -2198,7 +2198,7 @@
};
name = Release;
};
- 61022D7C12305A2800B08935 /* Distribution AppStore */ = {
+ 61022D7C12305A2800B08935 /* DistributionAppStore */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
@@ -2208,7 +2208,7 @@
FPC_COMPILER_BINARY_DIR = /usr/local/lib/fpc/2.5.1;
FPC_MAIN_FILE = "$(PROJECT_DIR)/../../hedgewars/hwLibrary.pas";
FPC_RTL_UNITS_BASE = /usr/local/lib/fpc;
- FPC_SPECIFIC_OPTIONS = "-Ci- -Cr- -Co- -O-2 -Xs -Cfvfpv2";
+ FPC_SPECIFIC_OPTIONS = "-Ci- -Cr- -Co- -O-2 -Xs -Cfvfpv2 -dNOCONSOLE";
FPC_UNITS_PATH = "-Fu\"$(PROJECT_DIR)\"";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_DEBUGGING_SYMBOLS = default;
@@ -2241,9 +2241,9 @@
VALIDATE_PRODUCT = NO;
VALID_ARCHS = "armv7 armv6";
};
- name = "Distribution AppStore";
+ name = DistributionAppStore;
};
- 61022D7D12305A2800B08935 /* Distribution AppStore */ = {
+ 61022D7D12305A2800B08935 /* DistributionAppStore */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
@@ -2264,9 +2264,9 @@
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
TARGETED_DEVICE_FAMILY = "1,2";
};
- name = "Distribution AppStore";
+ name = DistributionAppStore;
};
- 61022D7E12305A2800B08935 /* Distribution AppStore */ = {
+ 61022D7E12305A2800B08935 /* DistributionAppStore */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
@@ -2277,9 +2277,9 @@
PRODUCT_NAME = fpc;
ZERO_LINK = NO;
};
- name = "Distribution AppStore";
+ name = DistributionAppStore;
};
- 61022D7F12305A2800B08935 /* Distribution AppStore */ = {
+ 61022D7F12305A2800B08935 /* DistributionAppStore */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = YES;
@@ -2288,9 +2288,9 @@
PRODUCT_NAME = UpdateDataFolder;
ZERO_LINK = NO;
};
- name = "Distribution AppStore";
+ name = DistributionAppStore;
};
- 6137064B117B1CB3004EE44A /* Distribution AdHoc */ = {
+ 6137064B117B1CB3004EE44A /* DistributionAdHoc */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
@@ -2334,9 +2334,9 @@
VALIDATE_PRODUCT = NO;
VALID_ARCHS = "armv7 armv6";
};
- name = "Distribution AdHoc";
+ name = DistributionAdHoc;
};
- 6137064C117B1CB3004EE44A /* Distribution AdHoc */ = {
+ 6137064C117B1CB3004EE44A /* DistributionAdHoc */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
@@ -2355,9 +2355,9 @@
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
TARGETED_DEVICE_FAMILY = "1,2";
};
- name = "Distribution AdHoc";
+ name = DistributionAdHoc;
};
- 6137064D117B1CB3004EE44A /* Distribution AdHoc */ = {
+ 6137064D117B1CB3004EE44A /* DistributionAdHoc */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
@@ -2368,9 +2368,9 @@
PRODUCT_NAME = fpc;
ZERO_LINK = NO;
};
- name = "Distribution AdHoc";
+ name = DistributionAdHoc;
};
- 6137064F117B1CB3004EE44A /* Distribution AdHoc */ = {
+ 6137064F117B1CB3004EE44A /* DistributionAdHoc */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = YES;
@@ -2379,7 +2379,7 @@
PRODUCT_NAME = UpdateDataFolder;
ZERO_LINK = NO;
};
- name = "Distribution AdHoc";
+ name = DistributionAdHoc;
};
6164429D11B5CDE500B9A6F3 /* Valgrind */ = {
isa = XCBuildConfiguration;
@@ -2576,7 +2576,7 @@
GCC_DEBUGGING_SYMBOLS = default;
GCC_FAST_MATH = YES;
GCC_OPTIMIZATION_LEVEL = 2;
- GCC_PREPROCESSOR_DEFINITIONS = "";
+ GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
GCC_STRICT_ALIASING = YES;
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
@@ -2613,8 +2613,8 @@
buildConfigurations = (
1D6058940D05DD3E006BFB54 /* Debug */,
1D6058950D05DD3E006BFB54 /* Release */,
- 6137064C117B1CB3004EE44A /* Distribution AdHoc */,
- 61022D7D12305A2800B08935 /* Distribution AppStore */,
+ 6137064C117B1CB3004EE44A /* DistributionAdHoc */,
+ 61022D7D12305A2800B08935 /* DistributionAppStore */,
6164429E11B5CDE500B9A6F3 /* Valgrind */,
);
defaultConfigurationIsVisible = 0;
@@ -2625,8 +2625,8 @@
buildConfigurations = (
6179928C114AE0C800BA94A9 /* Debug */,
6179928D114AE0C800BA94A9 /* Release */,
- 6137064F117B1CB3004EE44A /* Distribution AdHoc */,
- 61022D7F12305A2800B08935 /* Distribution AppStore */,
+ 6137064F117B1CB3004EE44A /* DistributionAdHoc */,
+ 61022D7F12305A2800B08935 /* DistributionAppStore */,
616442A111B5CDE500B9A6F3 /* Valgrind */,
);
defaultConfigurationIsVisible = 0;
@@ -2637,8 +2637,8 @@
buildConfigurations = (
928301180F10CAFD00CC5A3C /* Debug */,
928301190F10CAFD00CC5A3C /* Release */,
- 6137064D117B1CB3004EE44A /* Distribution AdHoc */,
- 61022D7E12305A2800B08935 /* Distribution AppStore */,
+ 6137064D117B1CB3004EE44A /* DistributionAdHoc */,
+ 61022D7E12305A2800B08935 /* DistributionAppStore */,
6164429F11B5CDE500B9A6F3 /* Valgrind */,
);
defaultConfigurationIsVisible = 0;
@@ -2649,8 +2649,8 @@
buildConfigurations = (
C01FCF4F08A954540054247B /* Debug */,
C01FCF5008A954540054247B /* Release */,
- 6137064B117B1CB3004EE44A /* Distribution AdHoc */,
- 61022D7C12305A2800B08935 /* Distribution AppStore */,
+ 6137064B117B1CB3004EE44A /* DistributionAdHoc */,
+ 61022D7C12305A2800B08935 /* DistributionAppStore */,
6164429D11B5CDE500B9A6F3 /* Valgrind */,
);
defaultConfigurationIsVisible = 0;
--- a/share/hedgewars/Data/Forts/CMakeLists.txt Fri Sep 03 01:41:51 2010 +0200
+++ b/share/hedgewars/Data/Forts/CMakeLists.txt Fri Sep 03 01:54:29 2010 +0200
@@ -1,4 +1,4 @@
-file(GLOB FortSprites *{L,R}.png)
+file(GLOB FortSprites *L.png *R.png)
install(FILES
${FortSprites}
--- a/share/hedgewars/Data/Locale/CMakeLists.txt Fri Sep 03 01:41:51 2010 +0200
+++ b/share/hedgewars/Data/Locale/CMakeLists.txt Fri Sep 03 01:54:29 2010 +0200
@@ -1,9 +1,18 @@
file(GLOB txttrans2 ??.txt)
file(GLOB txttrans5 ?????.txt)
-file(GLOB qmtrans hedgewars_*.qm)
+file(GLOB tsfiles *.ts)
+
+QT4_ADD_TRANSLATION(QM ${tsfiles})
+
+add_custom_target (release-translation ALL
+ DEPENDS ${QM}
+ COMMENT "Compiling ts files"
+)
install(FILES
${txttrans2}
${txttrans5}
- ${qmtrans}
- DESTINATION ${SHAREPATH}Data/Locale)
+ ${QM}
+ DESTINATION ${SHAREPATH}Data/Locale
+)
+
Binary file share/hedgewars/Data/Locale/hedgewars_bg.qm has changed
Binary file share/hedgewars/Data/Locale/hedgewars_cs.qm has changed
Binary file share/hedgewars/Data/Locale/hedgewars_de.qm has changed
Binary file share/hedgewars/Data/Locale/hedgewars_en.qm has changed
Binary file share/hedgewars/Data/Locale/hedgewars_es.qm has changed
Binary file share/hedgewars/Data/Locale/hedgewars_fi.qm has changed
Binary file share/hedgewars/Data/Locale/hedgewars_fr.qm has changed
Binary file share/hedgewars/Data/Locale/hedgewars_it.qm has changed
Binary file share/hedgewars/Data/Locale/hedgewars_ja.qm has changed
Binary file share/hedgewars/Data/Locale/hedgewars_pl.qm has changed
Binary file share/hedgewars/Data/Locale/hedgewars_pt_BR.qm has changed
Binary file share/hedgewars/Data/Locale/hedgewars_pt_PT.qm has changed
Binary file share/hedgewars/Data/Locale/hedgewars_ru.qm has changed
Binary file share/hedgewars/Data/Locale/hedgewars_sk.qm has changed
Binary file share/hedgewars/Data/Locale/hedgewars_sv.qm has changed
Binary file share/hedgewars/Data/Locale/hedgewars_tr_TR.qm has changed
Binary file share/hedgewars/Data/Locale/hedgewars_uk.qm has changed
Binary file share/hedgewars/Data/Locale/hedgewars_zh_CN.qm has changed
Binary file share/hedgewars/Data/Locale/hedgewars_zh_TW.qm has changed