Skip to content

Instantly share code, notes, and snippets.

@iRi-E
Created July 15, 2012 18:42
Show Gist options
  • Save iRi-E/3118098 to your computer and use it in GitHub Desktop.
Save iRi-E/3118098 to your computer and use it in GitHub Desktop.
TestGUIをUbuntu 12.04 amd64でビルドするパッチ
diff -ur StandProject.orig/StandConverter.pro StandProject/StandConverter.pro
--- StandProject.orig/StandConverter.pro 2012-07-16 00:07:16.000000000 +0900
+++ StandProject/StandConverter.pro 2012-07-16 03:15:20.753276875 +0900
@@ -1,16 +1,22 @@
-QT += core
+QT += core
QT += gui
-QT += multimedia
+CONFIG += mobility
+MOBILITY = multimedia
TARGET = StandConverter
TEMPLATE = app
+INCLUDEPATH += \
+ gui \
+ gui/analyzer \
+ gui/model \
+ gui/window
+
LIBS += \
-lfftw3 \
- -lQtMultimedia4 \
- -logg_static \
- -lvorbis_static \
- -lvorbisfile_static
+ -logg \
+ -lvorbis \
+ -lvorbisfile
SOURCES += \
main.cpp \
diff -ur StandProject.orig/io/RiffFile.cpp StandProject/io/RiffFile.cpp
--- StandProject.orig/io/RiffFile.cpp 2012-04-17 17:20:40.000000000 +0900
+++ StandProject/io/RiffFile.cpp 2012-07-16 02:13:20.421286153 +0900
@@ -2,6 +2,7 @@
#include <stdio.h>
#include <stdint.h>
+#include <string.h>
#include <QtGlobal>
diff -ur StandProject.orig/io/UtauLibrary.cpp StandProject/io/UtauLibrary.cpp
--- StandProject.orig/io/UtauLibrary.cpp 2012-07-14 00:00:30.000000000 +0900
+++ StandProject/io/UtauLibrary.cpp 2012-07-16 02:07:08.417287081 +0900
@@ -188,7 +188,7 @@
// 開けない.
if(!file.open(QIODevice::WriteOnly | QIODevice::Text))
{
- qDebug("UtauLibrary::write; File Open Error :%s", filename);
+ qDebug("UtauLibrary::write; File Open Error :%s", filename.toUtf8().data());
return false;
}
diff -ur StandProject.orig/io/midi/MidiFile.cpp StandProject/io/midi/MidiFile.cpp
--- StandProject.orig/io/midi/MidiFile.cpp 2012-06-24 04:16:00.000000000 +0900
+++ StandProject/io/midi/MidiFile.cpp 2012-07-16 03:22:45.685275765 +0900
@@ -122,7 +122,7 @@
{
const char *p = chunk->data();
int tick = 0;
- while((int)(p) - (int)(chunk->data()) < chunk->length() - 2)
+ while((long)(p) - (long)(chunk->data()) < (long)(chunk->length()) - 2)
{
int diff;
p = getDeltaTime(diff, p);
diff -ur StandProject.orig/math/Pca.cpp StandProject/math/Pca.cpp
--- StandProject.orig/math/Pca.cpp 2010-11-25 21:06:42.000000000 +0900
+++ StandProject/math/Pca.cpp 2012-07-16 02:31:55.893283371 +0900
@@ -1,4 +1,4 @@
-#include "pca.h"
+#include "Pca.h"
void pc_analysis(double **dst, double *lambda, double *avr, double *deviation, double **src, int N, int num_sam)
{
diff -ur StandProject.orig/synthesis/ConverterElement.cpp StandProject/synthesis/ConverterElement.cpp
--- StandProject.orig/synthesis/ConverterElement.cpp 2012-06-17 11:12:12.000000000 +0900
+++ StandProject/synthesis/ConverterElement.cpp 2012-07-16 02:17:56.865285463 +0900
@@ -104,7 +104,7 @@
QFileInfo info(outFileName);
if(info.exists() && setting.overwrite == false)
{
- qDebug(" File already exists; %s", outFileName);
+ qDebug(" File already exists; %s", outFileName.toUtf8().data());
return;
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment