Login
Username:

Password:

Remember me



Lost Password?

Register now!
Main Menu
Who's Online
1 user(s) are online (1 user(s) are browsing Forum)

Members: 0
Guests: 1

more...

Browsing this Thread:   1 Anonymous Users



« 1 2 3 (4) 5 »


Re: Error linking binary - Milkytracker for AROS ABI-v1

Joined:
2010/8/30 7:20
Group:
Member
Posts: 1191
Offline
Quote:

Marlon wrote:
And there's a reason I use premake instead of cmake... Cmake relies in SDL2. I made lots of edits to the source to keep the SDL1.2 compatibility, and CMake does not account for that at all.


not necessarily. look at my cmakelist.txt changes in main directory. you can disable sdl2 check. you jjust need to provide the link liib when necessary. also look at the other cmakelists changes around the source. im definitely including your sdl-1.2 headers and linking against aros sdl 1.2 library. there is no 2.0.

yes i have noticed the ahi code is based on sdl and not ready. im using the sdl of course.

Posted on: 5/11 11:41
Transfer the post to other applications Transfer


Re: Error linking binary - Milkytracker for AROS ABI-v1

Joined:
2016/8/9 0:17
From Sweden
Group:
Member
Posts: 27
Offline
Quote:

wawa wrote:
Quote:

Marlon wrote:
And there's a reason I use premake instead of cmake... Cmake relies in SDL2. I made lots of edits to the source to keep the SDL1.2 compatibility, and CMake does not account for that at all.


not necessarily. look at my cmakelist.txt changes in main directory. you can disable sdl2 check. you jjust need to provide the link liib when necessary. also look at the other cmakelists changes around the source. im definitely including your sdl-1.2 headers and linking against aros sdl 1.2 library. there is no 2.0.

yes i have noticed the ahi code is based on sdl and not ready. im using the sdl of course.


All I'm saying is that I've personally done no changes to CMakeList.txt to accommodate for any of my changes. And even if you compile for AROS you need to define AMIGA (same goes for os4, morphos, warpos etc).

And my premake code accommodates for all that.

Posted on: 5/11 11:44
Transfer the post to other applications Transfer


Re: Error linking binary - Milkytracker for AROS ABI-v1

Joined:
2010/8/30 7:20
Group:
Member
Posts: 1191
Offline
Quote:

Marlon wrote:
All Amiga based fixes in my Milkytracker source falls under the define __AMIGA__ and AMIGA. And I add define AROS and __AROS__ to that for AROS specific code.

One does not exclude the other.


in cmake files its AROS, like in "if(AROS)" otherwise you are right. we can probably simplify joining AROS and AMIGA where possible. i didnt want to change too much at this point. the changes in cmakelists shouldnt affect your way of compiling. but isnt that more convenient to simply use cmake with my changes and have it compile in one go?

Posted on: 5/11 11:46
Transfer the post to other applications Transfer


Re: Error linking binary - Milkytracker for AROS ABI-v1

Joined:
2016/8/9 0:17
From Sweden
Group:
Member
Posts: 27
Offline
Quote:

wawa wrote:
Quote:

Marlon wrote:
All Amiga based fixes in my Milkytracker source falls under the define __AMIGA__ and AMIGA. And I add define AROS and __AROS__ to that for AROS specific code.

One does not exclude the other.


in cmake files its AROS, like in "if(AROS)" otherwise you are right. we can probably simplify joining AROS and AMIGA where possible. i didnt want to change too much at this point. the changes in cmakelists shouldnt affect your way of compiling. but isnt that more convenient to simply use cmake with my changes and have it compile in one go?

My long term plan is to sort out the CMake support for all platforms. My initial fixes on Milkytracker was under the __AMIGA__ define. However as more work was made there's lines of code like:
#if defined(__AMIGA__) && !defined(AROS)

And also nested ones. it'll certainly break for an AROS compile if you don't define AMIGA and __AMIGA__ alongside AROS and __AROS__.

Quote:

configuration "i386-aros"
buildoptions "-O3 -fomit-frame-pointer -fno-exceptions -static-libstdc++ -s"
linkoptions { "-lpthread", "-static-libstdc++" }
includedirs { "/opt/x86-aros/bin/linux-i386/AROS/Extras/Developer/include", "/opt/x86-aros/bin/linux-x86_64/tools/crosstools/lib/gcc/i386-aros/6.3.0/include-fixed", "/opt/aros/sdk/include/SDL", "./src/ppui/osinterface/amiga", "./src/ppui/osinterface/sdl-1.2", "./src/ppui/osinterface/posix" }
libdirs { "" }
defines { "AMIGA", "__AMIGA__", "AROS", "aros", "__AROS__", "__aros__" }


I suggest you make a fork of the code, push it to your repo and do a pull request to the AmigaPorts repo. It's more work using the patch-files.

Posted on: 5/11 11:55
Transfer the post to other applications Transfer


Re: Error linking binary - Milkytracker for AROS ABI-v1

Joined:
2010/8/30 7:20
Group:
Member
Posts: 1191
Offline
Quote:

Marlon wrote:
All I'm saying is that I've personally done no changes to CMakeList.txt to accommodate for any of my changes.


yes. i noticed. im not discarding your changes, im building upon that. again, the changes to cmakefiles are very slight and should affect only AROS so far. however you can make them affect amiga if you add AMIGA to the if sections "if(AROS OR AMIGA)". all ths is rather easy.

Quote:

And even if you compile for AROS you need to define AMIGA (same goes for os4, morphos, warpos etc).

And my premake code accommodates for all that.


i expect that. AROS build system defineds AMIGA as well i think. you do not need to do that explicitely, no problem here.

you can continue to use premake, but i have no idea of it and i frear it will not cope with building with aros build system and meta makefiles. therefore i added changes to lists. imho its easier, but take it or leave it. you could simply review my diff. or apply it locally to test, you can always revert.

Posted on: 5/11 11:56
Transfer the post to other applications Transfer


Re: Error linking binary - Milkytracker for AROS ABI-v1

Joined:
2010/8/30 7:20
Group:
Member
Posts: 1191
Offline
Quote:

Marlon wrote:

And also nested ones. it'll certainly break for an AROS compile if you don't define AMIGA and __AMIGA__ alongside AROS and __AROS__.

oh man, have you red my post? no problem here. i have not added AROS ifdefs to any of your source files. (yes i ifdeffed some pragmas for gcc, as proposal) and the very few changes i did to the source itself was in order to avoid some errors. it is all just a proposal on my part, for your review.

Quote:

I suggest you make a fork of the code, push it to your repo and do a pull request to the AmigaPorts repo. It's more work using the patch-files.


why using the patch files? why forking if you can just merge it in? why not use cmake if it is used upstream? it adds up to maintenance effort.

you asked me to write an aros makefile for the source and i did. whats wrong now?

Posted on: 5/11 12:04
Transfer the post to other applications Transfer


Re: Error linking binary - Milkytracker for AROS ABI-v1

Joined:
2010/8/30 7:20
Group:
Member
Posts: 1191
Offline
after all why not. i might fork the repo. there might be better ways of cooperation and keeping it all in sync but whatever.

Posted on: 5/11 13:04
Transfer the post to other applications Transfer


Re: Error linking binary - Milkytracker for AROS ABI-v1

Joined:
2016/8/16 0:09
Group:
Member
Posts: 329
Offline
@wawa:
nothing special there as it is the way to cooperate using git. see also this gist.

Please don't confuse a git fork with svn forking. They are named the same but are different things in practice.

Posted on: 5/11 15:37
Transfer the post to other applications Transfer


Re: Error linking binary - Milkytracker for AROS ABI-v1

Joined:
2010/8/30 7:20
Group:
Member
Posts: 1191
Offline
what i mean is that a better option is if forks are not spread all around the world for users to investigate and thereore would be best to keep it common where possible. but thx. looking into it.

Posted on: 5/12 1:37
Transfer the post to other applications Transfer


Re: Error linking binary - Milkytracker for AROS ABI-v1

Joined:
2016/8/9 0:17
From Sweden
Group:
Member
Posts: 27
Offline
Quote:

wawa wrote:
what i mean is that a better option is if forks are not spread all around the world for users to investigate and thereore would be best to keep it common where possible. but thx. looking into it.

That's what pull requests are for.

Posted on: 5/12 6:42
Transfer the post to other applications Transfer



« 1 2 3 (4) 5 »



You can view topic.
You cannot start a new topic.
You cannot reply to posts.
You cannot edit your posts.
You cannot delete your posts.
You cannot add new polls.
You cannot vote in polls.
You cannot attach files to posts.
You cannot post without approval.

[Advanced Search]


Search
Top Posters
1 paolone
paolone
4426
2 magorium
magorium
4095
3 nikolaos
nikolaos
4009
4 phoenixkonsole
phoenixkonsole
3920
5 deadwood
deadwood
2917
6 ncafferkey
ncafferkey
2794
7 mazze
mazze
2221
8 clusteruk
clusteruk
2112
9 damocles
damocles
1789
10 BSzili
BSzili
1511
© 2004-2018 AROS Exec