Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build improvements and fixes for MSVC #456

Merged
merged 8 commits into from
Jan 21, 2014
Merged

Conversation

QbProg
Copy link
Collaborator

@QbProg QbProg commented Jan 11, 2014

This branch fixes various issues with MSVC compilation, with static libraries, TK, PDB files, bundle and source bundle.
The TKService w/o font support setting was removed as no more working.
I re-tested with MSVC2010, 2012, and 2013. 2013 should compile but the build system seems to be very much flawed and I was not able to complete a build.

This branch MAY break mingw support when OCE_USE_BUNDLE_SOURCE is active, as it used a very inconvenient setting about the ARCHIVE_OUTPUT_DIRECTORY.

@dbarbier
Copy link
Collaborator

@QbProg I was about to add a note to 531b049 saying to use OCE_REQUIRES_FREETYPE, but then saw your last commit. It would be much clearer if you move it before 531b049. You could then remove OCE_REQUIRES_FREETYPE, and replace if(OCE_REQUIRES_FREETYPE) by if(OCE_VISU_DEP).
BTW you can also replace if(OCE_VISUALISATION OR OCE_VISU_DEP) by if(OCE_VISU_DEP).

@dbarbier
Copy link
Collaborator

BTW2: When using OCE_USE_BUNDLE_SOURCE, maybe OCE_WITH_GL2PS and OCE_WITH_FREEIMAGE should always be set?

DrawText ends up to be defined as DrawTextA, and causes
compilation failures.
@QbProg
Copy link
Collaborator Author

QbProg commented Jan 12, 2014

Reviewed things like you suggested ( + lowercased commands)

I still can't get tabs propertly, what was our convention anyway?

About the BTW2: yes, it was the case but I recently added options in the bundle to disable FreeImage and GL2PS. (yep , that's something I effectively require :)

@ghost
Copy link

ghost commented Jan 13, 2014

Hi Qb, I've only taken the quickest glance at what you've changed, but for all your conditionals, could you please make sure they're as specific as possible? Meaning, if it's something for MSVC only, use the macro _MSC_VER instead of WNT, or some other MSVC specific macro. Many previous changes for MSVC had to be re-changed to make sure they only applied to MSVC and not MinGW. Thanks!

@ghost
Copy link

ghost commented Jan 13, 2014

GitHub mangled my message, meant _MSC_VER

@QbProg
Copy link
Collaborator Author

QbProg commented Jan 13, 2014

Hello jacob,
I did not add any compiler specific change in the sources, it was only a
matter of Cmake, expect the DrawText define, which could happen in any
winddows compiler that uses <windows.h> , so WNT was appropriate.

Qb

2014/1/13 Jacob Abel [email protected]

GitHub mangled my message, meant _MSC_VER


Reply to this email directly or view it on GitHubhttps://github.com//pull/456#issuecomment-32177764
.

It is no more possible/simple to build TKService without
freetype, as other classes (AIS_Dimension,etc...) depend on the font package.
Added autoinstall support for static library version of bundle
@ghost
Copy link

ghost commented Jan 13, 2014

Good deal then, thanks.
On Jan 13, 2014 10:54 AM, "QbProg" [email protected] wrote:

Hello jacob,
I did not add any compiler specific change in the sources, it was only a
matter of Cmake, expect the DrawText define, which could happen in any
winddows compiler that uses <windows.h> , so WNT was appropriate.

Qb

2014/1/13 Jacob Abel [email protected]

GitHub mangled my message, meant _MSC_VER


Reply to this email directly or view it on GitHub<
https://github.com/tpaviot/oce/pull/456#issuecomment-32177764>
.


Reply to this email directly or view it on GitHubhttps://github.com//pull/456#issuecomment-32198734
.

@dbarbier
Copy link
Collaborator

+1

Hello @QbProg, I reviewed your changes and they look good. However, is it possible to move the last commit into a separate build request? I am afraid that we are playing ping pong here, and it will be easier to discuss this issue in a separate pull request.

dbarbier added a commit that referenced this pull request Jan 21, 2014
Build improvements and fixes for MSVC
@dbarbier dbarbier merged commit 8ee7b55 into master Jan 21, 2014
@dbarbier dbarbier deleted the qb/build-improvements branch January 21, 2014 20:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants